r18030 - in /branches/frame_order_testing: ./ generic_fns/pcs.py generic_fns/rdc.py -- November 26, 2012 - 12:11

Author: bugman
Date: Mon Nov 26 12:11:11 2012
New Revision: 18030

URL: http://svn.gna.org/viewcvs/relax?rev=18030&view=rev
Log:
Merged revisions 18028 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18028 | bugman | 2012-11-23 16:34:37 +0100 (Fri, 23 Nov 2012) | 3 lines
  
  The rdc.write and pcs.write user functions now skip deselected spins.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/pcs.py
    branches/frame_order_testing/generic_fns/rdc.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 26 12:11:11 2012
@@ -1,1 +1,1 @@
-/trunk:1-17997
+/trunk:1-18029

Modified: branches/frame_order_testing/generic_fns/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/pcs.py?rev=18030&r1=18029&r2=18030&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/pcs.py (original)
+++ branches/frame_order_testing/generic_fns/pcs.py Mon Nov 26 12:11:11 2012
@@ -733,6 +733,10 @@
     values = []
     errors = []
     for spin, mol_name, res_num, res_name in spin_loop(full_info=True):
+        # Skip deselected spins.
+        if not spin.select:
+            continue
+
         # Skip spins with no PCSs.
         if not bc and (not hasattr(spin, 'pcs') or not align_id in 
spin.pcs.keys()):
             continue

Modified: branches/frame_order_testing/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/rdc.py?rev=18030&r1=18029&r2=18030&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/rdc.py (original)
+++ branches/frame_order_testing/generic_fns/rdc.py Mon Nov 26 12:11:11 2012
@@ -753,6 +753,10 @@
     # Loop over the interatomic data containers and collect the data.
     data = []
     for interatom in interatomic_loop():
+        # Skip deselected containers.
+        if not interatom.select:
+            continue
+
         # Skip containers with no RDCs.
         if not bc and (not hasattr(interatom, 'rdc') or align_id not in 
interatom.rdc.keys()):
             continue