Author: bugman Date: Wed Mar 2 16:34:01 2011 New Revision: 12725 URL: http://svn.gna.org/viewcvs/relax?rev=12725&view=rev Log: Fixes for the opt_tm_fns system test module for the local_tm model-free model tests. Modified: branches/relax_data/test_suite/system_tests/scripts/model_free/opt_tm_fns.py Modified: branches/relax_data/test_suite/system_tests/scripts/model_free/opt_tm_fns.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_data/test_suite/system_tests/scripts/model_free/opt_tm_fns.py?rev=12725&r1=12724&r2=12725&view=diff ============================================================================== --- branches/relax_data/test_suite/system_tests/scripts/model_free/opt_tm_fns.py (original) +++ branches/relax_data/test_suite/system_tests/scripts/model_free/opt_tm_fns.py Wed Mar 2 16:34:01 2011 @@ -160,9 +160,9 @@ # Load the relaxation data. for i in range(len(frq)): - interpreter.relax_data.read(ri_id='NOE_%s'%frq[i], ri_type='NOE', frq=float(frq[i])*1e6, 'noe.%s.out' % frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) - interpreter.relax_data.read(ri_id='R1_%s'%frq[i], ri_type='R1', frq=float(frq[i])*1e6, 'r1.%s.out' % frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) - interpreter.relax_data.read(ri_id='R2_%s'%frq[i], ri_type='R2', frq=float(frq[i])*1e6, 'r2.%s.out' % frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) + interpreter.relax_data.read(ri_id='NOE_%s'%frq[i], ri_type='NOE', frq=float(frq[i])*1e6, file='noe.%s.out'%frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) + interpreter.relax_data.read(ri_id='R1_%s'%frq[i], ri_type='R1', frq=float(frq[i])*1e6, file='r1.%s.out'%frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) + interpreter.relax_data.read(ri_id='R2_%s'%frq[i], ri_type='R2', frq=float(frq[i])*1e6, file='r2.%s.out'%frq[i], dir=path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) # Setup other values. interpreter.value.set(1.20 * 1e-10, 'bond_length')