Author: bugman Date: Mon Jan 31 15:19:03 2011 New Revision: 12464 URL: http://svn.gna.org/viewcvs/relax?rev=12464&view=rev Log: Reverted r12461 as this was the wrong way to do this. The command used was: svn merge -r12461:12460 . Modified: branches/bmrb/generic_fns/relax_data.py Modified: branches/bmrb/generic_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/relax_data.py?rev=12464&r1=12463&r2=12464&view=diff ============================================================================== --- branches/bmrb/generic_fns/relax_data.py (original) +++ branches/bmrb/generic_fns/relax_data.py Mon Jan 31 15:19:03 2011 @@ -792,7 +792,7 @@ if not spin_ids: spin_ids = [] for i in range(N): - spin_ids.append(generate_spin_id(spin_num=spin_nums[i], spin_name=None, res_num=res_nums[i], res_name=res_names[i], mol_name=mol_names[i])) + spin_ids.append(generate_spin_id(spin_num=spin_nums[i], spin_name=spin_names[i], res_num=res_nums[i], res_name=res_names[i], mol_name=mol_names[i])) # Initialise the global data for the current pipe if necessary. data_init(cdp, global_flag=True)