Author: bugman
Date: Tue Mar 3 14:34:41 2015
New Revision: 27742
URL: http://svn.gna.org/viewcvs/relax?rev=27742&view=rev
Log:
Fix for the pcs.read user function.
The problem was caught by the new Pcs.test_pcs_copy_different_spins system
test. If the spin system
does not exist in the current data pipe, but data for it is present in the PCS
file, the pcs.read
user function would terminate in a TypeError.
Modified:
trunk/pipe_control/pcs.py
Modified: trunk/pipe_control/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pcs.py?rev=27742&r1=27741&r2=27742&view=diff
==============================================================================
--- trunk/pipe_control/pcs.py (original)
+++ trunk/pipe_control/pcs.py Tue Mar 3 14:34:41 2015
@@ -734,7 +734,7 @@
# Get the corresponding spin container.
id = generate_spin_id_unique(mol_name=mol_name, res_num=res_num,
res_name=res_name, spin_num=spin_num, spin_name=spin_name)
spin = return_spin(id)
- if spin == None and spin_id[0] == '@': # Allow spin IDs of atom
names to be used to specify multi column data.
+ if spin == None and spin_id and spin_id[0] == '@': # Allow spin IDs
of atom names to be used to specify multi column data.
spin = return_spin(id+spin_id)
if spin == None:
warn(RelaxNoSpinWarning(id))
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
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
