Author: bugman
Date: Thu Sep 5 14:40:21 2013
New Revision: 20845
URL: http://svn.gna.org/viewcvs/relax?rev=20845&view=rev
Log:
Fix for the Relax_disp.test_hansen_cpmgfit_input system test for a new set of
errors.
The Hansen R2eff values have been recalculated and the errors are now
slightly different.
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=20845&r1=20844&r2=20845&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Thu Sep 5
14:40:21 2013
@@ -838,36 +838,36 @@
'@ yaxis ticklabel char size 0.8\n',
'@ world xmin 0.0\n',
'data\n',
- '0.066667 16.045541 0.646426
11.743296 \n',
- '0.133333 14.877925 0.506308
11.743296 \n',
- '0.200000 14.357820 0.623633
11.743296 \n',
- '0.266667 12.664495 0.601993
11.743296 \n',
- '0.333333 12.363205 0.597972
11.743296 \n',
- '0.400000 11.092532 0.583223
11.743296 \n',
- '0.466667 10.566090 0.577133
11.743296 \n',
- '0.533333 9.805807 0.468139
11.743296 \n',
- '0.600000 9.564301 0.565981
11.743296 \n',
- '0.666667 9.015634 0.559685
11.743296 \n',
- '0.733333 8.607765 0.555779
11.743296 \n',
- '0.800000 8.279997 0.552292
11.743296 \n',
- '0.866667 8.474536 0.554452
11.743296 \n',
- '0.933333 8.158973 0.457694
11.743296 \n',
- '1.000000 7.988631 0.549378
11.743296 \n',
- '0.066667 22.224914 0.279012
18.789274 \n',
- '0.133333 21.230874 0.212524
18.789274 \n',
- '0.200000 20.603704 0.268504
18.789274 \n',
- '0.266667 20.327797 0.266352
18.789274 \n',
- '0.333333 18.855377 0.257852
18.789274 \n',
- '0.400000 18.537531 0.255847
18.789274 \n',
- '0.466667 17.508069 0.250116
18.789274 \n',
- '0.533333 16.035604 0.193445
18.789274 \n',
- '0.600000 15.168192 0.237554
18.789274 \n',
- '0.666667 14.431802 0.234056
18.789274 \n',
- '0.733333 14.034137 0.232203
18.789274 \n',
- '0.800000 12.920148 0.226811
18.789274 \n',
- '0.866667 12.653673 0.225537
18.789274 \n',
- '0.933333 12.610864 0.183112
18.789274 \n',
- '1.000000 11.969303 0.222437
18.789274 \n'
+ '0.066667 16.045541 0.646183
11.743296 \n',
+ '0.133333 14.877925 0.506207
11.743296 \n',
+ '0.200000 14.357820 0.623259
11.743296 \n',
+ '0.266667 12.664495 0.601723
11.743296 \n',
+ '0.333333 12.363205 0.598040
11.743296 \n',
+ '0.400000 11.092532 0.582981
11.743296 \n',
+ '0.466667 10.566090 0.576964
11.743296 \n',
+ '0.533333 9.805807 0.468279
11.743296 \n',
+ '0.600000 9.564301 0.565861
11.743296 \n',
+ '0.666667 9.015634 0.559970
11.743296 \n',
+ '0.733333 8.607765 0.555675
11.743296 \n',
+ '0.800000 8.279997 0.552276
11.743296 \n',
+ '0.866667 8.474536 0.554288
11.743296 \n',
+ '0.933333 8.158973 0.457722
11.743296 \n',
+ '1.000000 7.988631 0.549293
11.743296 \n',
+ '0.066667 22.224914 0.278879
18.789274 \n',
+ '0.133333 21.230874 0.212641
18.789274 \n',
+ '0.200000 20.603704 0.268455
18.789274 \n',
+ '0.266667 20.327797 0.266742
18.789274 \n',
+ '0.333333 18.855377 0.257889
18.789274 \n',
+ '0.400000 18.537531 0.256041
18.789274 \n',
+ '0.466667 17.508069 0.250204
18.789274 \n',
+ '0.533333 16.035604 0.193523
18.789274 \n',
+ '0.600000 15.168192 0.237754
18.789274 \n',
+ '0.666667 14.431802 0.234062
18.789274 \n',
+ '0.733333 14.034137 0.232111
18.789274 \n',
+ '0.800000 12.920148 0.226807
18.789274 \n',
+ '0.866667 12.653673 0.225572
18.789274 \n',
+ '0.933333 12.610864 0.183052
18.789274 \n',
+ '1.000000 11.969303 0.222459
18.789274 \n'
]
spin2 = [
'title :71@N\n',
@@ -885,21 +885,21 @@
'@ yaxis ticklabel char size 0.8\n',
'@ world xmin 0.0\n',
'data\n',
- '0.066667 7.044342 0.353119
11.743296 \n',
- '0.133333 6.781033 0.294209
11.743296 \n',
- '0.200000 6.467623 0.349666
11.743296 \n',
- '0.266667 6.333340 0.349164
11.743296 \n',
- '0.333333 6.323238 0.348851
11.743296 \n',
- '0.400000 6.005245 0.346720
11.743296 \n',
- '0.466667 5.767052 0.345395
11.743296 \n',
- '0.533333 5.476968 0.289667
11.743296 \n',
- '0.600000 5.469949 0.343719
11.743296 \n',
- '0.666667 5.295113 0.342447
11.743296 \n',
- '0.733333 5.435648 0.343768
11.743296 \n',
- '0.800000 5.410400 0.343286
11.743296 \n',
- '0.866667 5.437554 0.343403
11.743296 \n',
- '0.933333 5.176844 0.287960
11.743296 \n',
- '1.000000 5.227232 0.341943
11.743296 \n'
+ '0.066667 7.044342 0.353377
11.743296 \n',
+ '0.133333 6.781033 0.294218
11.743296 \n',
+ '0.200000 6.467623 0.349728
11.743296 \n',
+ '0.266667 6.333340 0.348891
11.743296 \n',
+ '0.333333 6.323238 0.348828
11.743296 \n',
+ '0.400000 6.005245 0.346866
11.743296 \n',
+ '0.466667 5.767052 0.345413
11.743296 \n',
+ '0.533333 5.476968 0.289431
11.743296 \n',
+ '0.600000 5.469949 0.343621
11.743296 \n',
+ '0.666667 5.295113 0.342577
11.743296 \n',
+ '0.733333 5.435648 0.343416
11.743296 \n',
+ '0.800000 5.410400 0.343265
11.743296 \n',
+ '0.866667 5.437554 0.343427
11.743296 \n',
+ '0.933333 5.176844 0.288370
11.743296 \n',
+ '1.000000 5.227232 0.342174
11.743296 \n'
]
# Check the batch file.
@@ -916,6 +916,8 @@
lines = file.readlines()
file.close()
for i in range(len(lines)):
+ print(lines[i][:-1])
+ for i in range(len(lines)):
self.assertEqual(spin1[i], lines[i])
# Check spin :71@N.
@@ -923,6 +925,8 @@
file = open("%s%sspin%s.in" % (ds.tmpdir, sep, '_71_N'))
lines = file.readlines()
file.close()
+ for i in range(len(lines)):
+ print(lines[i][:-1])
for i in range(len(lines)):
self.assertEqual(spin2[i], lines[i])
r20845 - /branches/relax_disp/test_suite/system_tests/relax_disp.py