r18434 - /branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- February 07, 2013 - 14:24

Author: bugman
Date: Thu Feb  7 14:24:24 2013
New Revision: 18434

URL: http://svn.gna.org/viewcvs/relax?rev=18434&view=rev
Log:
Fix for the CaM frame order system tests - the RDC and PCS data was not being 
loaded.

This bug comes from the previous commit.


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=18434&r1=18433&r2=18434&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
 Thu Feb  7 14:24:24 2013
@@ -186,11 +186,11 @@
         ln = ['dy', 'tb', 'tm', 'er']
         for i in range(len(ln)):
             # Load the RDCs (if present).
-            if (not hasattr(status, 'flag_rdc') or status.flag_rdc) and 
access(self.data_path+'rdc_%s.txt'%ln[i], F_OK):
+            if (not hasattr(status, 'flag_rdc') or status.flag_rdc) and 
access(self.data_path+sep+'rdc_%s.txt'%ln[i], F_OK):
                 self._execute_uf(uf_name='rdc.read', align_id=ln[i], 
file='rdc_%s.txt'%ln[i], dir=self.data_path, spin_id1_col=1, spin_id2_col=2, 
data_col=3, error_col=4)
 
             # The PCS (if present).
-            if not hasattr(status, 'flag_pcs') or status.flag_pcs and 
access(self.data_path+'pcs_%s.txt'%ln[i], F_OK):
+            if not hasattr(status, 'flag_pcs') or status.flag_pcs and 
access(self.data_path+sep+'pcs_%s.txt'%ln[i], F_OK):
                 self._execute_uf(uf_name='pcs.read', align_id=ln[i], 
file='pcs_%s.txt'%ln[i], dir=self.data_path, mol_name_col=1, res_num_col=2, 
spin_name_col=5, data_col=6, error_col=7)
 
             # The temperature and field strength.