r5718 - /branches/spin_loop_bool/generic_fns/selection.py -- April 14, 2008 - 22:03

Author: bugman
Date: Mon Apr 14 22:03:08 2008
New Revision: 5718

URL: http://svn.gna.org/viewcvs/relax?rev=5718&view=rev
Log:
Updated all the other comparisons to the selection object.


Modified:
    branches/spin_loop_bool/generic_fns/selection.py

Modified: branches/spin_loop_bool/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spin_loop_bool/generic_fns/selection.py?rev=5718&r1=5717&r2=5718&view=diff
==============================================================================
--- branches/spin_loop_bool/generic_fns/selection.py (original)
+++ branches/spin_loop_bool/generic_fns/selection.py Mon Apr 14 22:03:08 2008
@@ -732,14 +732,10 @@
     res_num = 0
     res_container = None
     for mol in relax_data_store[pipe].mol:
-        # Skip the molecule if there is no match to the selection.
-        if mol not in select_obj:
-            continue
-
         # Loop over the residues.
         for res in mol.res:
             # Skip the residue if there is no match to the selection.
-            if res not in select_obj:
+            if (mol, res) not in select_obj:
                 continue
 
             # Store the residue container.
@@ -782,20 +778,12 @@
     spin_num = 0
     spin_container = None
     for mol in relax_data_store[pipe].mol:
-        # Skip the molecule if there is no match to the selection.
-        if mol not in select_obj:
-            continue
-
         # Loop over the residues.
         for res in mol.res:
-            # Skip the residue if there is no match to the selection.
-            if res not in select_obj:
-                continue
-
             # Loop over the spins.
             for spin in res.spin:
                 # Skip the spin if there is no match to the selection.
-                if spin not in select_obj:
+                if (mol, res, spin) not in select_obj:
                     continue
 
                 # Store the spin container.