r21427 - in /trunk/pipe_control: interatomic.py selection.py -- November 13, 2013 - 16:59

Author: bugman
Date: Wed Nov 13 16:59:10 2013
New Revision: 21427

URL: http://svn.gna.org/viewcvs/relax?rev=21427&view=rev
Log:
Renamed the interatomic_loop() function 'selected' argument to 'skip_desel'.

This is to match the spin_loop() function arguments.


Modified:
    trunk/pipe_control/interatomic.py
    trunk/pipe_control/selection.py

Modified: trunk/pipe_control/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/interatomic.py?rev=21427&r1=21426&r2=21427&view=diff
==============================================================================
--- trunk/pipe_control/interatomic.py (original)
+++ trunk/pipe_control/interatomic.py Wed Nov 13 16:59:10 2013
@@ -351,7 +351,7 @@
     return False
 
 
-def interatomic_loop(selection1=None, selection2=None, pipe=None, 
selected=True):
+def interatomic_loop(selection1=None, selection2=None, pipe=None, 
skip_desel=True):
     """Generator function for looping over all the interatomic data 
containers.
 
     @keyword selection1:    The optional spin ID selection of the first atom.
@@ -360,8 +360,8 @@
     @type selection2:       str
     @keyword pipe:          The data pipe containing the spin.  Defaults to 
the current data pipe.
     @type pipe:             str
-    @keyword selected:      A flag which if True will only return selected 
interatomic data containers.
-    @type selected:         bool
+    @keyword skip_desel:    A flag which if True will cause only selected 
interatomic data containers to be returned.
+    @type skip_desel:       bool
     """
 
     # The data pipe.
@@ -386,7 +386,7 @@
     # Loop over the containers, yielding them.
     for i in range(len(dp.interatomic)):
         # Skip deselected containers.
-        if selected and not dp.interatomic[i].select:
+        if skip_desel and not dp.interatomic[i].select:
             continue
 
         # Aliases.

Modified: trunk/pipe_control/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/selection.py?rev=21427&r1=21426&r2=21427&view=diff
==============================================================================
--- trunk/pipe_control/selection.py (original)
+++ trunk/pipe_control/selection.py Wed Nov 13 16:59:10 2013
@@ -157,11 +157,11 @@
     # First select all interatom containers if the change_all flag is set.
     if change_all:
         # Interatomic data loop.
-        for interatom in interatomic_loop(selected=False):
+        for interatom in interatomic_loop(skip_desel=False):
             interatom.select = True
 
     # Interatomic data loop.
-    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2, selected=False):
+    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2, skip_desel=False):
         # Deselect just the specified residues.
         if change_all:
             interatom.select = False
@@ -469,11 +469,11 @@
     # First deselect all interatom containers if the change_all flag is set.
     if change_all:
         # Interatomic data loop.
-        for interatom in interatomic_loop(selected=False):
+        for interatom in interatomic_loop(skip_desel=False):
             interatom.select = False
 
     # Interatomic data loop.
-    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2, selected=False):
+    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2, skip_desel=False):
         # Select just the specified containers.
         if change_all:
             interatom.select = True