Merge pull request #11 from pyahmed/dev

v0.18

Author: pyahmed

README.rst

@@ -12,9 +12,10 @@ A script extract data from .res (results) files generated by UNICORN Chromatogra
 
 News
 ----
-v0.17 released:
+v0.18 released:
 
-- Added experimental support for extracting and plotting UNICORN6 zip bundles
+- FIXED: xmin being ignored when 0
+- FIXED: Files with capitalised name ending are not loaded
 
 
 Installation

examplescripts/pycorn-bin.py

@@ -4,8 +4,9 @@
 PyCORN - script to extract data from .res (results) files generated
 by UNICORN Chromatography software supplied with ÄKTA Systems
 (c)2014-2016 - Yasar L. Ahmed
-v0.17
+v0.18
 '''
+
 import argparse
 from pycorn import pc_res3
 from pycorn import pc_uni6
@@ -163,7 +164,7 @@ def smartscale(inp):
     except:
         KeyError
         frac_data = None
-    if args.xmin:
+    if args.xmin != None:
         plot_x_min = args.xmin
     else:
         if frac_data:
@@ -362,12 +363,12 @@ def main2():
     for fname in args.inp_res:
         if args.inject == None:
             args.inject = -1
-        if fname[-3:] == "zip":
+        if (fname[-3:]).lower() == "zip":
             fdata = pc_uni6(fname)
             fdata.load()
             fdata.xml_parse()
             fdata.clean_up()
-        if fname[-3:] == "res":
+        if (fname[-3:]).lower() == "res":
             fdata = pc_res3(fname, reduce = args.reduce, inj_sel=args.inject)
             fdata.load()
         if args.extract == 'csv':
@@ -386,4 +387,4 @@ def main2():
         if args.plot and plotting:
             plotterX(fdata, fname)
 
-main2()
+main2()

pycorn/docs/CHANGES.txt

@@ -1,3 +1,8 @@
+v0.18
+======
+- FIXED: xmin being ignored when 0
+- FIXED: Files with capitalised name ending are not loaded
+
 v0.17
 ======
 - Added experimental support for extracting and plotting UNICORN6 zip bundles
@@ -50,4 +55,4 @@ v0.11
 
 v0.1
 ======
-- Initial release
+- Initial release

pycorn/pycorn.py

@@ -3,7 +3,7 @@
 PyCORN - script to extract data from .res (results) files generated
 by UNICORN Chromatography software supplied with ÄKTA Systems
 (c)2014-2016 - Yasar L. Ahmed
-v0.17
+v0.18
 '''
 
 from __future__ import print_function

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='pycorn',
-    version='0.17',
+    version='0.18',
     author='Yasar L. Ahmed',
     packages=['pycorn'],
     extras_require = {'plotting':  ["matplotlib"], 'xlsx-output': ['xlsxwriter']},