Author: bugman
Date: Wed May 29 16:22:36 2013
New Revision: 19775
URL: http://svn.gna.org/viewcvs/relax?rev=19775&view=rev
Log:
Fixes for the checking in the Relax_disp.test_hansen_cpmgfit_input system
test.
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=19775&r1=19774&r2=19775&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed May 29
16:22:36 2013
@@ -120,7 +120,7 @@
batch_file = ['#! /bin/sh\n', '\n', 'cpmgfit -xmgr -f
spin_:70@xxxx\n', 'cpmgfit -xmgr -f spin_:71@xxxx\n']
spin1 = [
'title :70@N\n',
- 'fields 2 18.7892743865 11.7432964915\n',
+ 'fields 2 11.7432964915 18.7892743865\n',
'function CPMG\n',
'R2 1 10 20\n',
'Rex 0 100.0 100\n',
@@ -134,40 +134,40 @@
'@ yaxis ticklabel char size 0.8\n',
'@ world xmin 0.0\n',
'data\n',
- '0.066667 22.224914 0.157014
18.789274 \n',
- '0.133333 21.230874 0.123960
18.789274 \n',
- '0.200000 20.603704 0.162258
18.789274 \n',
- '0.266667 20.327797 0.154694
18.789274 \n',
- '0.333333 18.855377 0.159253
18.789274 \n',
- '0.400000 18.537531 0.141982
18.789274 \n',
- '0.466667 17.508069 0.139421
18.789274 \n',
- '0.533333 16.035604 0.113450
18.789274 \n',
- '0.600000 15.168192 0.145221
18.789274 \n',
- '0.666667 14.431802 0.138125
18.789274 \n',
- '0.733333 14.034137 0.131017
18.789274 \n',
- '0.800000 12.920148 0.131678
18.789274 \n',
- '0.866667 12.653673 0.139552
18.789274 \n',
- '0.933333 12.610864 0.103480
18.789274 \n',
- '1.000000 11.969303 0.135988
18.789274 \n',
- '0.066667 16.045541 0.296491
11.743296 \n',
- '0.133333 14.877925 0.234000
11.743296 \n',
- '0.200000 14.357820 0.301228
11.743296 \n',
- '0.266667 12.664495 0.299527
11.743296 \n',
- '0.333333 12.363205 0.271194
11.743296 \n',
- '0.400000 11.092532 0.285045
11.743296 \n',
- '0.466667 10.566090 0.295090
11.743296 \n',
- '0.533333 9.805807 0.235226
11.743296 \n',
- '0.600000 9.564301 0.281865
11.743296 \n',
- '0.666667 9.015634 0.275269
11.743296 \n',
- '0.733333 8.607765 0.266371
11.743296 \n',
- '0.800000 8.279997 0.274045
11.743296 \n',
- '0.866667 8.474536 0.251836
11.743296 \n',
- '0.933333 8.158973 0.220777
11.743296 \n',
- '1.000000 7.988631 0.264123
11.743296 \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'
]
spin2 = [
'title :71@N\n',
- 'fields 2 18.7892743865 11.7432964915\n',
+ 'fields 2 11.7432964915 18.7892743865\n',
'function CPMG\n',
'R2 1 10 20\n',
'Rex 0 100.0 100\n',
@@ -181,24 +181,25 @@
'@ yaxis ticklabel char size 0.8\n',
'@ world xmin 0.0\n',
'data\n',
- '0.066667 7.044342 0.174267
11.743296 \n',
- '0.133333 6.781033 0.137976
11.743296 \n',
- '0.200000 6.467623 0.171372
11.743296 \n',
- '0.266667 6.333340 0.179931
11.743296 \n',
- '0.333333 6.323238 0.162322
11.743296 \n',
- '0.400000 6.005245 0.166673
11.743296 \n',
- '0.466667 5.767052 0.168136
11.743296 \n',
- '0.533333 5.476968 0.134411
11.743296 \n',
- '0.600000 5.469949 0.157734
11.743296 \n',
- '0.666667 5.295113 0.168230
11.743296 \n',
- '0.733333 5.435648 0.163755
11.743296 \n',
- '0.800000 5.410400 0.165309
11.743296 \n',
- '0.866667 5.437554 0.158582
11.743296 \n',
- '0.933333 5.176844 0.144974
11.743296 \n',
- '1.000000 5.227232 0.162255
11.743296 \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'
]
# Check the batch file.
+ print("\nChecking the batch file.")
file = open("%s%sbatch_run.sh" % (ds.tmpdir, sep))
lines = file.readlines()
file.close()
@@ -206,6 +207,7 @@
self.assertEqual(batch_file[i], lines[i])
# Check spin :70@N.
+ print("\nChecking the spin :70@N input file.")
file = open("%s%sspin_%s.in" % (ds.tmpdir, sep, ':70@N'))
lines = file.readlines()
file.close()
@@ -213,6 +215,7 @@
self.assertEqual(spin1[i], lines[i])
# Check spin :71@N.
+ print("\nChecking the spin :71@N input file.")
file = open("%s%sspin_%s.in" % (ds.tmpdir, sep, ':71@N'))
lines = file.readlines()
file.close()
r19775 - /branches/relax_disp/test_suite/system_tests/relax_disp.py