r18564 - /branches/frame_order_testing/specific_fns/frame_order.py -- February 22, 2013 - 10:18

Author: bugman
Date: Fri Feb 22 10:18:27 2013
New Revision: 18564

URL: http://svn.gna.org/viewcvs/relax?rev=18564&view=rev
Log:
Fix for the frame order specific base_data_loop() method.

The RDC data is now handled the same as the rest of the 
specific_fns.frame_order module by using the
_check_rdcs() method to determine if RDCs should be skipped.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=18564&r1=18563&r2=18564&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Fri Feb 22 
10:18:27 2013
@@ -1654,12 +1654,12 @@
 
         # Loop over the interatomic data containers for the moving domain 
(for the RDC data).
         for interatom in interatomic_loop(id):
-            # Skip deselected containers.
-            if not interatom.select:
-                continue
-
-            # No RDC, so skip.
-            if not hasattr(interatom, 'rdc'):
+            # Get the spins.
+            spin1 = return_spin(interatom.spin_id1)
+            spin2 = return_spin(interatom.spin_id2)
+
+            # RDC checks.
+            if not self._check_rdcs(interatom, spin1, spin2):
                 continue
 
             # Loop over the alignment IDs.