r17069 - /branches/interatomic/generic_fns/selection.py -- June 27, 2012 - 10:04

Author: bugman
Date: Wed Jun 27 10:04:05 2012
New Revision: 17069

URL: http://svn.gna.org/viewcvs/relax?rev=17069&view=rev
Log:
Fixes for the interatomic_loop() calls in the interatom selection and 
deselection user functions.


Modified:
    branches/interatomic/generic_fns/selection.py

Modified: branches/interatomic/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/selection.py?rev=17069&r1=17068&r2=17069&view=diff
==============================================================================
--- branches/interatomic/generic_fns/selection.py (original)
+++ branches/interatomic/generic_fns/selection.py Wed Jun 27 10:04:05 2012
@@ -27,6 +27,7 @@
 from warnings import warn
 
 # relax module imports.
+from generic_fns.interatomic import interatomic_loop
 from generic_fns.mol_res_spin import exists_mol_res_spin_data, 
generate_spin_id, return_spin, spin_loop
 from generic_fns import pipes
 from relax_errors import RelaxError, RelaxNoSequenceError
@@ -98,7 +99,7 @@
             interatom.select = True
 
     # Interatomic data loop.
-    for interatom in interatomic_loop(spin_id1=spin_id1, spin_id2=spin_id2):
+    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2):
         # Deselect just the specified residues.
         if change_all:
             interatom.select = False
@@ -390,7 +391,7 @@
             interatom.select = False
 
     # Interatomic data loop.
-    for interatom in interatomic_loop(spin_id1=spin_id1, spin_id2=spin_id2):
+    for interatom in interatomic_loop(selection1=spin_id1, 
selection2=spin_id2):
         # Select just the specified containers.
         if change_all:
             interatom.select = True