Author: bugman Date: Fri Jan 18 16:44:15 2013 New Revision: 18228 URL: http://svn.gna.org/viewcvs/relax?rev=18228&view=rev Log: Bug fix for the loading of PCS data from a file with different spin types in different columns. This was caught by the Pcs.test_load_multi_col_data system test which now passes. Modified: trunk/generic_fns/pcs.py Modified: trunk/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pcs.py?rev=18228&r1=18227&r2=18228&view=diff ============================================================================== --- trunk/generic_fns/pcs.py (original) +++ trunk/generic_fns/pcs.py Fri Jan 18 16:44:15 2013 @@ -613,6 +613,8 @@ # Get the corresponding spin container. id = generate_spin_id(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. + spin = return_spin(id+spin_id) if spin == None: warn(RelaxNoSpinWarning(id)) continue