r9615 - in /1.3/test_suite/system_tests/scripts: align_fit.py lactose_n_state.py -- October 07, 2009 - 10:08

Author: bugman
Date: Wed Oct  7 10:08:32 2009
New Revision: 9615

URL: http://svn.gna.org/viewcvs/relax?rev=9615&view=rev
Log:
Fixes for the system tests to use the new 'align_id' args.


Modified:
    1.3/test_suite/system_tests/scripts/align_fit.py
    1.3/test_suite/system_tests/scripts/lactose_n_state.py

Modified: 1.3/test_suite/system_tests/scripts/align_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/align_fit.py?rev=9615&r1=9614&r2=9615&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/align_fit.py (original)
+++ 1.3/test_suite/system_tests/scripts/align_fit.py Wed Oct  7 10:08:32 2009
@@ -44,11 +44,11 @@
 
 # RDCs.
 if ds.mode in ['rdc', 'all']:
-    rdc.read(id='synth', file=rdc_file, dir=DATA_PATH, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6)
+    rdc.read(align_id='synth', file=rdc_file, dir=DATA_PATH, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6)
 
 # PCSs.
 if ds.mode in ['pcs', 'all']:
-    pcs.read(id='synth', file=pcs_file, dir=DATA_PATH, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6)
+    pcs.read(align_id='synth', file=pcs_file, dir=DATA_PATH, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6)
 
     # Set the paramagnetic centre.
     pcs.centre(atom_id=':1000@CA')

Modified: 1.3/test_suite/system_tests/scripts/lactose_n_state.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/lactose_n_state.py?rev=9615&r1=9614&r2=9615&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/lactose_n_state.py (original)
+++ 1.3/test_suite/system_tests/scripts/lactose_n_state.py Wed Oct  7 
10:08:32 2009
@@ -45,12 +45,12 @@
 # Load the RDCs and PCSs.
 for i in xrange(len(align_list)):
     # The RDC.
-    rdc.read(id=align_list[i], file='rdc.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=i+3, error_col=None)
-    rdc.read(id=align_list[i], file='rdc_err.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=None, error_col=i+3)
+    rdc.read(align_id=align_list[i], file='rdc.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=i+3, error_col=None)
+    rdc.read(align_id=align_list[i], file='rdc_err.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=None, error_col=i+3)
 
     # The PCS.
-    pcs.read(id=align_list[i], file='pcs.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=i+2, error_col=None)
-    pcs.read(id=align_list[i], file='pcs_err.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=None, error_col=i+2)
+    pcs.read(align_id=align_list[i], file='pcs.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=i+2, error_col=None)
+    pcs.read(align_id=align_list[i], file='pcs_err.txt', dir=data_path, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=1, data_col=None, error_col=i+2)
 
     # The temperature.
     temperature(id=align_list[i], temp=298)