r15232 - /1.3/generic_fns/mol_res_spin.py -- January 24, 2012 - 18:42

Author: bugman
Date: Tue Jan 24 18:42:44 2012
New Revision: 15232

URL: http://svn.gna.org/viewcvs/relax?rev=15232&view=rev
Log:
Reordered the checks in Selection.__contains_mol_res_spin_containers().

This cuts the number of function calls down by avoiding relax_re.search() 
calls if residue or spin
numbers match.


Modified:
    1.3/generic_fns/mol_res_spin.py

Modified: 1.3/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=15232&r1=15231&r2=15232&view=diff
==============================================================================
--- 1.3/generic_fns/mol_res_spin.py (original)
+++ 1.3/generic_fns/mol_res_spin.py Tue Jan 24 18:42:44 2012
@@ -230,7 +230,7 @@
                 select_res = True
 
             # A true match.
-            elif relax_re.search(self.residues, res.name) or res.num in 
self.residues:
+            elif res.num in self.residues or relax_re.search(self.residues, 
res.name):
                 select_res = True
         else:
             # No residue container sent in, therefore the residue is assumed 
to match.
@@ -243,7 +243,7 @@
                 select_spin = True
 
             # A true match.
-            elif relax_re.search(self.spins, spin.name) or spin.num in 
self.spins:
+            elif spin.num in self.spins or relax_re.search(self.spins, 
spin.name):
                 select_spin = True
         else:
             # No spin container sent in, therefore the spin is assumed to 
match.