r18641 - /branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- March 05, 2013 - 15:40

Author: bugman
Date: Tue Mar  5 15:40:48 2013
New Revision: 18641

URL: http://svn.gna.org/viewcvs/relax?rev=18641&view=rev
Log:
Decreased the total time required for the frame order system tests.

Instead of using all the PCS data, the PCS data subsets are now used.  This 
decreases the total time
on one machine from 656.300 to 461.354 (total CPU seconds from profiling).


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=18641&r1=18640&r2=18641&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
 Tue Mar  5 15:40:48 2013
@@ -191,7 +191,7 @@
 
             # The PCS (if present).
             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)
+                self._execute_uf(uf_name='pcs.read', align_id=ln[i], 
file='pcs_%s_subset.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.
             self._execute_uf(uf_name='temperature', id=ln[i], temp=303)