Author: bugman
Date: Tue Dec 10 12:27:52 2013
New Revision: 21933
URL: http://svn.gna.org/viewcvs/relax?rev=21933&view=rev
Log:
Python 3 fixes for the relax_disp.r2eff_read_spin user function.
The check for the dispersion point column now only runs if that argument is
set. In addition, the
offset column is now also being checked.
Modified:
trunk/specific_analyses/relax_disp/disp_data.py
Modified: trunk/specific_analyses/relax_disp/disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/disp_data.py?rev=21933&r1=21932&r2=21933&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Tue Dec 10 12:27:52 2013
@@ -2076,8 +2076,11 @@
new_ids = []
for line in file_data:
# Invalid columns.
- if disp_point_col > len(line):
+ if disp_point_col != None and disp_point_col > len(line):
warn(RelaxWarning("The data %s is invalid, no dispersion point
column can be found." % line))
+ continue
+ if offset_col != None and offset_col > len(line):
+ warn(RelaxWarning("The data %s is invalid, no offset column can be
found." % line))
continue
if data_col > len(line):
warn(RelaxWarning("The R2eff/R1rho data %s is invalid, no data
column can be found." % line))
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@gna.org
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
