Author: bugman Date: Sun Mar 10 21:28:56 2013 New Revision: 18746 URL: http://svn.gna.org/viewcvs/relax?rev=18746&view=rev Log: The pcs.read user function backend now uses generic_fns.mol_res_spin.generate_spin_id_unique(). This allows the matching spin container to always be returned for storing the data. 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=18746&r1=18745&r2=18746&view=diff ============================================================================== --- trunk/generic_fns/pcs.py (original) +++ trunk/generic_fns/pcs.py Sun Mar 10 21:28:56 2013 @@ -34,7 +34,7 @@ # relax module imports. from generic_fns import grace, pipes from generic_fns.align_tensor import get_tensor_index -from generic_fns.mol_res_spin import exists_mol_res_spin_data, generate_spin_id, return_spin, spin_index_loop, spin_loop +from generic_fns.mol_res_spin import exists_mol_res_spin_data, generate_spin_id_unique, return_spin, spin_index_loop, spin_loop from maths_fns.pcs import ave_pcs_tensor, pcs_tensor from maths_fns.vectors import random_unit_vector from physical_constants import g1H, pcs_constant @@ -652,7 +652,7 @@ raise RelaxError("An invalid error value of zero has been encountered.") # 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) + 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. spin = return_spin(id+spin_id)