r15041 - /branches/frame_order_testing/maths_fns/frame_order.py -- December 07, 2011 - 13:45

Author: bugman
Date: Wed Dec  7 13:45:35 2011
New Revision: 15041

URL: http://svn.gna.org/viewcvs/relax?rev=15041&view=rev
Log:
Fix for the rotor frame order model for when either RDCs or PCSs are missing.


Modified:
    branches/frame_order_testing/maths_fns/frame_order.py

Modified: branches/frame_order_testing/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order.py?rev=15041&r1=15040&r2=15041&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order.py Wed Dec  7 13:45:35 
2011
@@ -190,8 +190,8 @@
         if self.rdc_flag or self.pcs_flag:
             for i in xrange(self.num_align):
                 # Loop over the RDCs.
-                for j in xrange(self.num_rdc):
-                    if self.rdc_flag:
+                if self.rdc_flag:
+                    for j in xrange(self.num_rdc):
                         if isNaN(self.rdc[i, j]):
                             # Set the flag.
                             self.missing_rdc[i, j] = 1
@@ -210,8 +210,8 @@
                         self.rdc_error[i, j] = self.rdc_error[i, j] / 
sqrt(rdc_weights[i, j])
 
                 # Loop over the PCSs.
-                for j in xrange(self.num_pcs):
-                    if self.pcs_flag:
+                if self.pcs_flag:
+                    for j in xrange(self.num_pcs):
                         if isNaN(self.pcs[i, j]):
                             # Set the flag.
                             self.missing_pcs[i, j] = 1