Author: bugman Date: Tue Oct 15 16:15:22 2013 New Revision: 21115 URL: http://svn.gna.org/viewcvs/relax?rev=21115&view=rev Log: Manually reverted the temporary change of r21094. The command used was: svn merge -r21094:r21093 . ..... r21094 | bugman | 2013-10-14 15:40:53 +0200 (Mon, 14 Oct 2013) | 5 lines Changed paths: M /branches/relax_disp/test_suite/system_tests/relax_disp.py Temporarily turned off the Relax_disp.test_sprangers_cpmg_data_auto_analysis system test. This commit must be reverted! ..... 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=21115&r1=21114&r2=21115&view=diff ============================================================================== --- branches/relax_disp/test_suite/system_tests/relax_disp.py (original) +++ branches/relax_disp/test_suite/system_tests/relax_disp.py Tue Oct 15 16:15:22 2013 @@ -1491,7 +1491,7 @@ self.assertEqual(cdp.mol[0].res[2].spin[0].ri_data['R2eff.600'], 7.2385) - def xxx_test_sprangers_cpmg_data_auto_analysis(self): + def test_sprangers_cpmg_data_auto_analysis(self): """Test of the dispersion auto-analysis using Remco Sprangers' MQ CPMG data. This uses the data from Remco Sprangers' paper at http://dx.doi.org/10.1073/pnas.0507370102. This is MQ CPMG data with a fixed relaxation time period.