r19685 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- May 15, 2013 - 15:13

Author: bugman
Date: Wed May 15 15:13:03 2013
New Revision: 19685

URL: http://svn.gna.org/viewcvs/relax?rev=19685&view=rev
Log:
Updated the relaxation dispersion system tests of the Hansen CPMG data for 
the new models.

The models are now 'LM63' and 'CR72', and the tests have been renamed to
Relax_disp.test_hansen_cpmg_data_LM63 and 
Relax_disp.test_hansen_cpmg_data_CR72.


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=19685&r1=19684&r2=19685&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed May 15 
15:13:03 2013
@@ -56,27 +56,27 @@
         ds.__reset__()
 
 
-    def test_hansen_cpmg_data_fast_2site(self):
-        """Optimisation of Dr. Flemming Hansen's CPMG data to the fast 
2-site dispersion model.
+    def test_hansen_cpmg_data_LM63(self):
+        """Optimisation of Dr. Flemming Hansen's CPMG data to the LM63 
dispersion model.
 
         This uses the data from Dr. Flemming Hansen's paper at 
http://dx.doi.org/10.1021/jp074793o.  This is CPMG data with a fixed 
relaxation time period.
         """
 
         # Set the model.
-        ds.models = ['R2eff', 'fast 2-site']
+        ds.models = ['R2eff', 'LM63']
 
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'hansen_data.py')
 
 
-    def test_hansen_cpmg_data_slow_2site(self):
-        """Optimisation of Dr. Flemming Hansen's CPMG data to the slow 
2-site dispersion model.
+    def test_hansen_cpmg_data_CR72(self):
+        """Optimisation of Dr. Flemming Hansen's CPMG data to the CR72 
dispersion model.
 
         This uses the data from Dr. Flemming Hansen's paper at 
http://dx.doi.org/10.1021/jp074793o.  This is CPMG data with a fixed 
relaxation time period.
         """
 
         # Set the model.
-        ds.models = ['R2eff', 'slow 2-site']
+        ds.models = ['R2eff', 'CR72']
 
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'hansen_data.py')