Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #16

Merged
merged 4 commits into from
Nov 17, 2017
Merged

Dev #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ae6b45
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
pyahmed Feb 28, 2016
dcb350c
Fixed multiple injections
pyahmed Oct 11, 2016
2410efd
Update README.rst
pyahmed Nov 17, 2017
b5f7b99
Merge branch 'master' into dev
pyahmed Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ PyCORN is now available as a web-service. Just drop your res/zip file, get a pre

visit: http:https://pycornweb.appspot.com

=======

v0.19 released:

v0.18 released:

- FIXED: xmin being ignored when 0
- FIXED: Files with capitalised name ending are not loaded
- FIXED: Injection points not recognized properly (see https://github.com/pyahmed/PyCORN/issues/12)


Installation
Expand Down
12 changes: 7 additions & 5 deletions pycorn/pycorn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.18
v0.18b
'''

from __future__ import print_function
Expand Down Expand Up @@ -235,14 +235,16 @@ def inject_det(self, show=False):
'''
Finds injection points - required for adjusting retention volume
'''
inject_ids = [self.Inject_id, self.Inject_id2]
injections = []
if self.injection_points == None:
self.injection_points = [0.0]
inject_ids = [self.Inject_id, self.Inject_id2]
for i in self.values():
if i['magic_id'] in inject_ids:
injection = self.meta1_read(i, show=show, do_it_for_inj_det=True)[0][0]
if injection != 0.0:
self.injection_points.append(injection)
injections = self.meta1_read(i, show=show, do_it_for_inj_det=True)
for i in injections:
if i[0] != 0.0:
self.injection_points.append(i[0])
if show:
print(" ---- \n Injection points: \n # \t ml")
for x, y in enumerate(self.injection_points):
Expand Down