r16958 - in /branches/interatomic: ./ generic_fns/mol_res_spin.py -- June 19, 2012 - 14:56

Author: bugman
Date: Tue Jun 19 14:55:59 2012
New Revision: 16958

URL: http://svn.gna.org/viewcvs/relax?rev=16958&view=rev
Log:
Merged revisions 16957 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r16957 | bugman | 2012-06-19 14:55:38 +0200 (Tue, 19 Jun 2012) | 3 lines
  
  The generate_spin_id() function now choses to use the spin name instead of 
number by default.
........

Modified:
    branches/interatomic/   (props changed)
    branches/interatomic/generic_fns/mol_res_spin.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 19 14:55:59 2012
@@ -1,1 +1,1 @@
-/trunk:1-16917
+/trunk:1-16957

Modified: branches/interatomic/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/mol_res_spin.py?rev=16958&r1=16957&r2=16958&view=diff
==============================================================================
--- branches/interatomic/generic_fns/mol_res_spin.py (original)
+++ branches/interatomic/generic_fns/mol_res_spin.py Tue Jun 19 14:55:59 2012
@@ -1571,10 +1571,10 @@
         id = id + ":" + res_name
 
     # Spin data.
-    if spin_num != None:
+    if spin_name != None:
+        id = id + "@" + spin_name
+    elif spin_num != None:
         id = id + "@" + str(spin_num)
-    elif spin_name != None:
-        id = id + "@" + spin_name
 
     # Return the spin id string.
     return id