r14443 - /branches/inversion-recovery/test_suite/system_tests/relax_fit.py -- August 25, 2011 - 12:28

Author: semor
Date: Thu Aug 25 12:28:00 2011
New Revision: 14443

URL: http://svn.gna.org/viewcvs/relax?rev=14443&view=rev
Log:
Prepared further the test for the inversion-recovery (exp_3param_inv_neg) 
equation.


Modified:
    branches/inversion-recovery/test_suite/system_tests/relax_fit.py

Modified: branches/inversion-recovery/test_suite/system_tests/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/relax_fit.py?rev=14443&r1=14442&r2=14443&view=diff
==============================================================================
--- branches/inversion-recovery/test_suite/system_tests/relax_fit.py 
(original)
+++ branches/inversion-recovery/test_suite/system_tests/relax_fit.py Thu Aug 
25 12:28:00 2011
@@ -93,23 +93,24 @@
         """Check the results of the curve-fitting."""
 
         # Data.
-        relax_times = [0.0176, 0.0176, 0.0352, 0.0704, 0.0704, 0.1056, 
0.1584, 0.1584, 0.1936, 0.1936]
-        chi2 = [None, None, None, 3.1727215308183405, 5.9732236976178248, 
17.633333237460601, 4.7413502242106036, 10.759950979457724, None, None, None, 
6.5520255580798752]
-        rx = [None, None, None, 8.0814894819861891, 8.6478971007171523, 
9.5710638143380482, 10.716551832690667, 11.143793929315777, None, None, None, 
12.828753698718391]
-        i0 = [None, None, None, 1996050.9679873895, 2068490.9458262245, 
1611556.5193290685, 1362887.2329727132, 1877670.5629299041, None, None, None, 
897044.17270784755]
+        relax_times = [0.2, 0.45, 0.75, 0.75, 1.1, 1.5, 1.95, 1.95, 2.45]
+        chi2 = [1]
+        rx = [1.5]
+        i0 = [-50]
+        iinf = [14]
 
         # Some checks.
         self.assertEqual(cdp.curve_type, 'exp_3param_inv_neg')
         self.assertEqual(cdp.int_method, ds.int_type)
-        self.assertEqual(len(cdp.relax_times), 10)
+        self.assertEqual(len(cdp.relax_times), 9)
         cdp_relax_times = sorted(cdp.relax_times.values())
-        for i in range(10):
+        for i in range(9):
             self.assertEqual(cdp_relax_times[i], relax_times[i])
 
         # Check the errors.
         for key in cdp.sigma_I:
-            self.assertEqual(cdp.sigma_I[key], 10142.707367087694)
-            self.assertEqual(cdp.var_I[key], 102874512.734375)
+            self.assertEqual(cdp.sigma_I[key], 100)
+            self.assertEqual(cdp.var_I[key], 100)
 
         # Spin data check.
         i = 0
@@ -123,10 +124,11 @@
                 self.assertAlmostEqual(spin.chi2, chi2[i])
                 self.assertAlmostEqual(spin.rx, rx[i])
                 self.assertAlmostEqual(spin.i0/1e6, i0[i]/1e6)
+                self.assertAlmostEqual(spin.iinf/1e6, iinf[i]/1e6)
 
             # Increment the spin index.
             i = i + 1
-            if i >= 12:
+            if i >= 1:
                 break