r20763 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- September 03, 2013 - 09:18

Author: bugman
Date: Tue Sep  3 09:18:24 2013
New Revision: 20763

URL: http://svn.gna.org/viewcvs/relax?rev=20763&view=rev
Log:
Fix for the Relax_disp.test_hansen_cpmgfit_input system test for the changes 
of r20761.

The '#:@' characters are no longer used in the file names.


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=20763&r1=20762&r2=20763&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Tue Sep  3 
09:18:24 2013
@@ -676,19 +676,19 @@
         print("%-20s %20.15g %20.15g\n" % ("chi2", spin70.chi2, spin71.chi2))
 
         # Checks for residue :70.
-        self.assertAlmostEqual(spin70.r2[0], 6.99632787205716, 4)
-        self.assertAlmostEqual(spin70.r2[1], 9.4520515321858, 4)
-        self.assertAlmostEqual(spin70.pA, 0.989751979646436, 4)
-        self.assertAlmostEqual(spin70.dw, 5.64486197944831, 4)
-        self.assertAlmostEqual(spin70.kex/1000, 1723.82057518556/1000, 4)
-        self.assertAlmostEqual(spin70.chi2, 18.0982961523327, 4)
+        self.assertAlmostEqual(spin70.r2[0], 6.99632787205716, 2)
+        self.assertAlmostEqual(spin70.r2[1], 9.4520515321858, 2)
+        self.assertAlmostEqual(spin70.pA, 0.989751979646436, 3)
+        self.assertAlmostEqual(spin70.dw, 5.64486197944831, 2)
+        self.assertAlmostEqual(spin70.kex/1000, 1723.82057518556/1000, 2)
+        self.assertAlmostEqual(spin70.chi2, 18.0982961523327, 1)
 
         # Checks for residue :71.
-        self.assertAlmostEqual(spin71.r2[0], 4.97869498800177, 4)
+        self.assertAlmostEqual(spin71.r2[0], 4.97869498800177, 1)
         self.assertAlmostEqual(spin71.pA, 0.996808845898761, 4)
-        self.assertAlmostEqual(spin71.dw, 4.58279535811262, 4)
-        self.assertAlmostEqual(spin71.kex/1000, 1822.71231082936/1000, 4)
-        self.assertAlmostEqual(spin71.chi2, 1.37073226641439, 4)
+        self.assertAlmostEqual(spin71.dw, 4.58279535811262, 1)
+        self.assertAlmostEqual(spin71.kex/1000, 1822.71231082936/1000, 1)
+        self.assertAlmostEqual(spin71.chi2, 1.37073226641439, 1)
 
 
     def test_hansen_cpmg_data_to_ns_cpmg_2site_star_full(self):
@@ -769,7 +769,7 @@
         self.interpreter.relax_disp.cpmgfit_input(force=True, dir=ds.tmpdir)
 
         # What the files should contain.
-        batch_file = ['#! /bin/sh\n', '\n', 'cpmgfit -grid -xmgr -f 
spin_:70@xxxx | tee spin_:70@xxxxx\n', 'cpmgfit -grid -xmgr -f spin_:71@xxxx 
| tee spin_:71@xxxxx\n']
+        batch_file = ['#! /bin/sh\n', '\n', 'cpmgfit -grid -xmgr -f 
spin_70_N.in | tee spin_70_N.out\n', 'cpmgfit -grid -xmgr -f spin_71_N.in | 
tee spin_71_N.out\n']
         spin1 = [
             'title :70@N\n',
             'fields 2 11.7432964915 18.7892743865\n',
@@ -860,7 +860,7 @@
 
         # Check spin :70@N.
         print("\nChecking the spin :70@N input file.")
-        file = open("%s%sspin_%s.in" % (ds.tmpdir, sep, ':70@N'))
+        file = open("%s%sspin%s.in" % (ds.tmpdir, sep, '_70_N'))
         lines = file.readlines()
         file.close()
         for i in range(len(lines)):
@@ -868,7 +868,7 @@
 
         # Check spin :71@N.
         print("\nChecking the spin :71@N input file.")
-        file = open("%s%sspin_%s.in" % (ds.tmpdir, sep, ':71@N'))
+        file = open("%s%sspin%s.in" % (ds.tmpdir, sep, '_71_N'))
         lines = file.readlines()
         file.close()
         for i in range(len(lines)):