r5506 - /1.3/generic_fns/selection.py -- April 09, 2008 - 16:56

Author: bugman
Date: Wed Apr  9 16:56:46 2008
New Revision: 5506

URL: http://svn.gna.org/viewcvs/relax?rev=5506&view=rev
Log:
Reverted r5491, r5492, and r5493 as these introduced a bug.

The command used was:
svn merge -r5493:5490 .

The problem is that empty MoleculeContainers, ResidueContainers, and 
SpinContainers should be
returned when the selection identifier only selects a higher structure.


Modified:
    1.3/generic_fns/selection.py

Modified: 1.3/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=5506&r1=5505&r2=5506&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Wed Apr  9 16:56:46 2008
@@ -717,10 +717,6 @@
     mol_num = 0
     mol_container = None
     for mol in relax_data_store[pipe].mol:
-        # Skip empty MoleculeContainers.
-        if mol.is_empty():
-            continue
-
         # Skip the molecule if there is no match to the selection.
         if mol not in select_obj:
             continue
@@ -765,20 +761,12 @@
     res_num = 0
     res_container = None
     for mol in relax_data_store[pipe].mol:
-        # Skip empty MoleculeContainers.
-        if mol.is_empty():
-            continue
-
         # 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 empty ResidueContainers.
-            if res.is_empty():
-                continue
-
             # Skip the residue if there is no match to the selection.
             if res not in select_obj:
                 continue
@@ -823,30 +811,18 @@
     spin_num = 0
     spin_container = None
     for mol in relax_data_store[pipe].mol:
-        # Skip empty MoleculeContainers.
-        if mol.is_empty():
-            continue
-
         # 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 empty ResidueContainers.
-            if res.is_empty():
-                continue
-
             # 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 empty SpinContainers.
-                if spin.is_empty():
-                    continue
-
                 # Skip the spin if there is no match to the selection.
                 if spin not in select_obj:
                     continue