r21422 - /trunk/pipe_control/interatomic.py -- November 13, 2013 - 15:06

Author: bugman
Date: Wed Nov 13 15:06:50 2013
New Revision: 21422

URL: http://svn.gna.org/viewcvs/relax?rev=21422&view=rev
Log:
Reverted r21420 as the spin containers and interatomic data containers should 
be handled separately.

The command used was:
svn merge -r21420:r21419 .

This is important to allow interatomic containers with good RDC data to be 
selected while one of the
spin pairs deselected (for example if its PCS data is bad).

.....
  r21420 | bugman | 2013-11-13 14:58:54 +0100 (Wed, 13 Nov 2013) | 3 lines
  Changed paths:
     M /trunk/pipe_control/interatomic.py
  
  The interatomic loop now skips the element if either of the spin systems 
are deselected.
.....


Modified:
    trunk/pipe_control/interatomic.py

Modified: trunk/pipe_control/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/interatomic.py?rev=21422&r1=21421&r2=21422&view=diff
==============================================================================
--- trunk/pipe_control/interatomic.py (original)
+++ trunk/pipe_control/interatomic.py Wed Nov 13 15:06:50 2013
@@ -400,10 +400,6 @@
         res2 =  cdp.mol[mol_index2].res[res_index2]
         spin2 = cdp.mol[mol_index2].res[res_index2].spin[spin_index2]
 
-        # Skip if either spin is deselected.
-        if not spin1.select or not spin2.select:
-            continue
-
         # The different selection combinations.
         if select_obj:
             sel1 = select_obj.contains_spin(spin_name=spin1.name, 
spin_num=spin1.num, res_name=res1.name, res_num=res1.num, mol=mol1.name)