r19781 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- May 30, 2013 - 11:14

Author: bugman
Date: Thu May 30 11:14:08 2013
New Revision: 19781

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

The r2eff and i0 spin data structure keys are now strings.


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=19781&r1=19780&r2=19781&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Thu May 30 
11:14:08 2013
@@ -245,16 +245,17 @@
             print("\nResidue number %s." % (i+1))
 
             # Check the fitted parameters.
-            self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].r2eff[1000.0], 
res_data[i][0], places=2)
-            self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].r2eff[2000.0], 
res_data[i][1], places=2)
-            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].i0[1000.0]/10000, 
res_data[i][2]/10000, places=3)
-            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].i0[2000.0]/10000, 
res_data[i][3]/10000, places=3)
+            print cdp.mol[0].res[i].spin[0].r2eff
+            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].r2eff['1000.0'], 
res_data[i][0], places=2)
+            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].r2eff['2000.0'], 
res_data[i][1], places=2)
+            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].i0['1000.0']/10000, 
res_data[i][2]/10000, places=3)
+            
self.assertAlmostEqual(cdp.mol[0].res[i].spin[0].i0['2000.0']/10000, 
res_data[i][3]/10000, places=3)
 
             # Check the simulation errors.
-            self.assert_(cdp.mol[0].res[i].spin[0].r2eff_err[1000.0] < 5.0)
-            self.assert_(cdp.mol[0].res[i].spin[0].r2eff_err[2000.0] < 5.0)
-            self.assert_(cdp.mol[0].res[i].spin[0].i0_err[1000.0]/10000 < 
5.0)
-            self.assert_(cdp.mol[0].res[i].spin[0].i0_err[2000.0]/10000 < 
5.0)
+            self.assert_(cdp.mol[0].res[i].spin[0].r2eff_err['1000.0'] < 5.0)
+            self.assert_(cdp.mol[0].res[i].spin[0].r2eff_err['2000.0'] < 5.0)
+            self.assert_(cdp.mol[0].res[i].spin[0].i0_err['1000.0']/10000 < 
5.0)
+            self.assert_(cdp.mol[0].res[i].spin[0].i0_err['2000.0']/10000 < 
5.0)
 
             # Check that certain parameters are not present.
             for param in blacklist: