Author: bugman Date: Wed Mar 27 15:44:59 2013 New Revision: 19250 URL: http://svn.gna.org/viewcvs/relax?rev=19250&view=rev Log: Ported r8724 from the old relax_disp branch into the new branch. The command used was: svn merge -r8723:8724 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 . ..... r8724 | semor | 2009-02-04 00:27:26 +0100 (Wed, 04 Feb 2009) | 9 lines Changed paths: M /branches/relax_disp/test_suite/system_tests/relax_disp.py A small fix to the system test. However, is this fix the solution or is there something wrong with the reading of data (such as 'R2eff') by relax_data.read() ? Shouldn't the data, for example 'R2eff', be available in 'cdp.mol[0].res[0].spin[0].R2eff_val[0]' or 'cdp.mol[0].res[0].spin[0].R2eff[0]' for the 1st spin of the 1st residue in the 1st molecule ? ..... Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py 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=19250&r1=19249&r2=19250&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 15:44:59 2013 @@ -90,6 +90,7 @@ self.relax.interpreter._Relax_data.read('R2eff', '600', 600 * 1e6, 'r2eff.out', dir=sys.path[-1] + "/test_suite/shared_data/curve_fitting_disp/r2eff") # Test the data. - self.assertEqual(cdp.mol[0].res[0].spin[0].R2eff_val[0], 15.000) - self.assertEqual(cdp.mol[0].res[1].spin[0].R2eff_val[0], 4.2003) - self.assertEqual(cdp.mol[0].res[2].spin[0].R2eff_val[0], 7.2385) + + 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)