r12702 - /branches/relax_data/test_suite/system_tests/model_selection.py -- March 02, 2011 - 11:35

Author: bugman
Date: Wed Mar  2 11:35:05 2011
New Revision: 12702

URL: http://svn.gna.org/viewcvs/relax?rev=12702&view=rev
Log:
Updated the test_aic_mod_sel_diff_tensor() system test for the new relax data 
ID string design.


Modified:
    branches/relax_data/test_suite/system_tests/model_selection.py

Modified: branches/relax_data/test_suite/system_tests/model_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/test_suite/system_tests/model_selection.py?rev=12702&r1=12701&r2=12702&view=diff
==============================================================================
--- branches/relax_data/test_suite/system_tests/model_selection.py (original)
+++ branches/relax_data/test_suite/system_tests/model_selection.py Wed Mar  2 
11:35:05 2011
@@ -61,12 +61,12 @@
             self.interpreter.model_free.select_model(model='m4')
 
             # Read the relaxation data.
-            self.interpreter.relax_data.read('R1', '600', 600.0 * 1e6, 
'r1.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
-            self.interpreter.relax_data.read('R2', '600', 600.0 * 1e6, 
'r2.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
-            self.interpreter.relax_data.read('NOE', '600', 600.0 * 1e6, 
'noe.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
-            self.interpreter.relax_data.read('R1', '500', 500.0 * 1e6, 
'r1.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
-            self.interpreter.relax_data.read('R2', '500', 500.0 * 1e6, 
'r2.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
-            self.interpreter.relax_data.read('NOE', '500', 500.0 * 1e6, 
'noe.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, 
error_col=4)
+            self.interpreter.relax_data.read(ri_id='R1_600',  ri_type='R1',  
frq=600.0*1e6, file='r1.600.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
+            self.interpreter.relax_data.read(ri_id='R2_600',  ri_type='R2',  
frq=600.0*1e6, file='r2.600.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
+            self.interpreter.relax_data.read(ri_id='NOE_600', ri_type='NOE', 
frq=600.0*1e6, file='noe.600.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
+            self.interpreter.relax_data.read(ri_id='R1_500',  ri_type='R1',  
frq=500.0*1e6, file='r1.500.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
+            self.interpreter.relax_data.read(ri_id='R2_500',  ri_type='R2',  
frq=500.0*1e6, file='r2.500.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
+            self.interpreter.relax_data.read(ri_id='NOE_500', ri_type='NOE', 
frq=500.0*1e6, file='noe.500.out', dir=path, res_num_col=1, res_name_col=2, 
data_col=3, error_col=4)
 
             # Set the diffusion tensors.
             self.interpreter.diffusion_tensor.init(tensors[i], fixed=False)