r5927 - /1.3/generic_fns/structure/main.py -- April 21, 2008 - 17:18

Author: bugman
Date: Mon Apr 21 17:03:16 2008
New Revision: 5927

URL: http://svn.gna.org/viewcvs/relax?rev=5927&view=rev
Log:
Fixed a name clash of 'spin_id'.


Modified:
    1.3/generic_fns/structure/main.py

Modified: 1.3/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/main.py?rev=5927&r1=5926&r2=5927&view=diff
==============================================================================
--- 1.3/generic_fns/structure/main.py (original)
+++ 1.3/generic_fns/structure/main.py Mon Apr 21 17:03:16 2008
@@ -239,15 +239,15 @@
             continue
 
         # The spin identification string.
-        spin_id = generate_spin_id(mol_name, res_num, res_name, spin.num, 
spin.name)
+        id = generate_spin_id(mol_name, res_num, res_name, spin.num, 
spin.name)
 
         # The XH vector already exists.
         if hasattr(spin, 'xh_vect'):
-            warn(RelaxWarning("The XH vector for the spin " + `spin_id` + " 
already exists"))
+            warn(RelaxWarning("The XH vector for the spin " + `id` + " 
already exists"))
             continue
 
         # Get the bond info.
-        bond_vectors = cdp.structure.bond_vectors(atom_id=spin_id, 
attached_atom=proton)
+        bond_vectors = cdp.structure.bond_vectors(atom_id=id, 
attached_atom=proton)
 
         # No attached proton.
         if not bond_vectors:
@@ -269,7 +269,7 @@
 
                 # Test for zero length.
                 if norm_factor == 0.0:
-                    warn(RelaxZeroVectorWarning(spin_id))
+                    warn(RelaxZeroVectorWarning(id))
 
                 # Calculate the normalised vector.
                 else: