Author: bugman Date: Wed Mar 27 17:15:16 2013 New Revision: 19261 URL: http://svn.gna.org/viewcvs/relax?rev=19261&view=rev Log: Some more fixes to make the Relax_disp.test_read_r2eff system test pass. These are again changes needed due to the trunk now being very different. Modified: branches/relax_disp/pipe_control/relax_data.py branches/relax_disp/test_suite/system_tests/relax_disp.py Modified: branches/relax_disp/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/relax_data.py?rev=19261&r1=19260&r2=19261&view=diff ============================================================================== --- branches/relax_disp/pipe_control/relax_data.py (original) +++ branches/relax_disp/pipe_control/relax_data.py Wed Mar 27 17:15:16 2013 @@ -46,7 +46,7 @@ # The relaxation data types supported. -VALID_TYPES = ['R1', 'R2', 'NOE'] +VALID_TYPES = ['R1', 'R2', 'NOE', 'R2eff'] Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=19261&r1=19260&r2=19261&view=diff ============================================================================== --- branches/relax_disp/test_suite/system_tests/relax_disp.py (original) +++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Mar 27 17:15:16 2013 @@ -80,10 +80,9 @@ self.interpreter.residue.create(3, 'Gly') # Read the file. - self.interpreter.relax_data.read('R2eff', '600', 600 * 1e6, 'r2eff.out', dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'r2eff', res_num_col=1, res_name_col=2, data_col=3, error_col=4) + self.interpreter.relax_data.read(ri_id='R2eff.600', ri_type='R2eff', frq=600*1e6, file='r2eff.out', dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'r2eff', res_num_col=1, res_name_col=2, data_col=3, error_col=4) # Test the data. - - self.assertEqual(cdp.mol[0].res[0].spin[0].relax_data[0], 15.000) - self.assertEqual(cdp.mol[0].res[1].spin[0].relax_data[0], 4.2003) - self.assertEqual(cdp.mol[0].res[2].spin[0].relax_data[0], 7.2385) + self.assertEqual(cdp.mol[0].res[0].spin[0].ri_data['R2eff.600'], 15.000) + self.assertEqual(cdp.mol[0].res[1].spin[0].ri_data['R2eff.600'], 4.2003) + self.assertEqual(cdp.mol[0].res[2].spin[0].ri_data['R2eff.600'], 7.2385)