r20705 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- August 28, 2013 - 18:40

Author: bugman
Date: Wed Aug 28 18:40:20 2013
New Revision: 20705

URL: http://svn.gna.org/viewcvs/relax?rev=20705&view=rev
Log:
Fixes for the parameter checks in the 
Relax_disp.test_r1rho_off_res_fixed_time_tp02 system test.

The parameter values had not been updated from when the test was copied from 
one of the other tests.


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=20705&r1=20704&r2=20705&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Aug 28 
18:40:20 2013
@@ -860,14 +860,10 @@
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'r1rho_off_res_tp02.py')
 
         # The original parameters.
-        i0 = [100000.0, 20000.0]
-        r1rho_prime = [2.25, 24.0]
-        pA = 0.87654321
+        r1rho_prime = [[10.0, 15.0], [12.0, 18.0]]
+        pA = 0.7654321
         kex = 1234.56789
-        delta_omega = [1.0, 2.0]
-        phi_ex = []
-        for i in range(2):
-            phi_ex.append(pA * (1.0 - pA) * delta_omega[i]**2)
+        delta_omega = [7.0, 9.0]
 
         # Switch to the 'TP02' model data pipe, then check for each spin.
         self.interpreter.pipe.switch('TP02')
@@ -877,9 +873,10 @@
             print("\nSpin %s." % spin_id)
 
             # Check the fitted parameters.
-            self.assertAlmostEqual(spin.r2[0]/10, 
r1rho_prime[spin_index]/10, 2)
-            self.assertAlmostEqual(spin.phi_ex, phi_ex[spin_index], 2)
-            self.assertAlmostEqual(spin.kex/1000.0, kex/1000.0, 2)
+            self.assertAlmostEqual(spin.r2[0]/10, 
r1rho_prime[spin_index][0]/10, 4)
+            self.assertAlmostEqual(spin.r2[1]/10, 
r1rho_prime[spin_index][1]/10, 4)
+            self.assertAlmostEqual(spin.dw, delta_omega[spin_index], 3)
+            self.assertAlmostEqual(spin.kex/1000.0, kex/1000.0, 3)
 
             # Increment the spin index.
             spin_index += 1