r18743 - /trunk/generic_fns/mol_res_spin.py -- March 10, 2013 - 16:20

Author: bugman
Date: Sun Mar 10 16:20:27 2013
New Revision: 18743

URL: http://svn.gna.org/viewcvs/relax?rev=18743&view=rev
Log:
Fix for the new generate_spin_id_unique() function.

The precedence is now residue number then name, and spin name then number.


Modified:
    trunk/generic_fns/mol_res_spin.py

Modified: trunk/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/mol_res_spin.py?rev=18743&r1=18742&r2=18743&view=diff
==============================================================================
--- trunk/generic_fns/mol_res_spin.py (original)
+++ trunk/generic_fns/mol_res_spin.py Sun Mar 10 16:20:27 2013
@@ -1770,14 +1770,14 @@
         unique_spin_num = False
 
     # The unique ID.
+    if unique_res_num and unique_spin_name:
+        return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_num=res.num, spin_name=spin.name)
+    if unique_res_num and unique_spin_num:
+        return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_num=res.num, spin_num=spin.num)
     if unique_res_name and unique_spin_num:
         return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_name=res.name, spin_num=spin.num)
     if unique_res_name and unique_spin_name:
         return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_name=res.name, spin_name=spin.name)
-    if unique_res_num and unique_spin_name:
-        return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_num=res.num, spin_name=spin.name)
-    if unique_res_num and unique_spin_num:
-        return generate_spin_id(pipe_cont=pipe_cont, mol_name=mol.name, 
res_num=res.num, spin_num=spin.num)
 
 
 def get_molecule_ids(selection=None):