r15302 - /branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- February 03, 2012 - 13:59

Author: bugman
Date: Fri Feb  3 13:59:08 2012
New Revision: 15302

URL: http://svn.gna.org/viewcvs/relax?rev=15302&view=rev
Log:
The frame order system test scripts can now operate as stand alone scripts.


Modified:
    
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=15302&r1=15301&r2=15302&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 Fri Feb  3 13:59:08 2012
@@ -93,11 +93,11 @@
         ln = ['dy', 'tb', 'tm', 'er']
         for i in range(len(ln)):
             # Load the RDCs.
-            if ds.flag_rdc:
+            if not hasattr(ds, 'flag_rdc') or ds.flag_rdc:
                 self.interpreter.rdc.read(align_id=ln[i], 
file='rdc_%s.txt'%ln[i], dir=self.data_path, res_num_col=2, spin_name_col=5, 
data_col=6, error_col=7)
 
             # The PCS.
-            if ds.flag_pcs:
+            if not hasattr(ds, 'flag_pcs') or ds.flag_pcs:
                 self.interpreter.pcs.read(align_id=ln[i], 
file='pcs_%s.txt'%ln[i], dir=self.data_path, res_num_col=2, spin_name_col=5, 
data_col=6, error_col=7)
 
             # The temperature and field strength.
@@ -173,7 +173,7 @@
         print("\nchi2: %s" % cdp.chi2)
 
         # Optimise.
-        if ds.flag_opt:
+        if hasattr(ds, 'flag_opt') and ds.flag_opt:
             self.interpreter.grid_search(inc=11)
             self.interpreter.minimise('simplex', constraints=False)