Author: bugman
Date: Fri Mar 22 16:19:53 2013
New Revision: 18969
URL: http://svn.gna.org/viewcvs/relax?rev=18969&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15372:15373
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15373:15374
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15374:15375
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15375:15376
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15376:15377
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15377:15378
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15378:15379
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15372:15373
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15373 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15373:15374
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15374 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@localhost relax-trunk]$ svn merge -r15374:15375
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15375 into '.':
G test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15375:15376
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15376 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
G test_suite/system_tests/frame_order.py
svn merge -r15376:15377
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
[edau@localhost relax-trunk]$ svn merge -r15376:15377
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15377 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@localhost relax-trunk]$ svn merge -r15377:15378
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15378 into '.':
G test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15378:15379
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15379 into '.':
G test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$
Modified:
trunk/test_suite/shared_data/frame_order/cam/opt_stats
trunk/test_suite/system_tests/frame_order.py
trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
Modified: trunk/test_suite/shared_data/frame_order/cam/opt_stats
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/opt_stats?rev=18969&r1=18968&r2=18969&view=diff
==============================================================================
--- trunk/test_suite/shared_data/frame_order/cam/opt_stats (original)
+++ trunk/test_suite/shared_data/frame_order/cam/opt_stats Fri Mar 22
16:19:53 2013
@@ -10,10 +10,10 @@
rotor2 0.08109927684015121 0.080669539157379247
0.00042973768277196469
rotor_2_state 0.98651249280028852 0.98514936500256733
0.0013631277977212196
free_rotor 0.49751590700410214 0.49726258158951819
0.00025332541458398443
-free_rotor2 72961.044767090716 72274.982162225424
686.06260486529129
+free_rotor2 0.15805818039902811 0.15789122044584425
0.0001669599531838678
iso_cone 0.047796257987533765 0.047304044109578447
0.00049221387795531329
iso_cone_free_rotor 0.19951714134210338 0.1984082397486189
0.0011089015934844701
-iso_cone_free_rotor2 9377.8312996775785 4398.7424233390984
4979.088876338481
+iso_cone_free_rotor2 0.03519623985009767 0.034276292191227402
0.00091994765887026873
iso_cone_torsionless ? ? ?
pseudo_ellipse 0.0961714010098947 0.095461523976414595
0.00070987703348010067
pseudo_ellipse2 0.032442806351129977 0.030991308327923742
0.0014514980232062339
@@ -30,10 +30,10 @@
rotor2 0.14648753596217906 0.080669539157379247
0.065817996804799814
rotor_2_state 2.4870975742280161 0.98514936500256733
1.501948209225449
free_rotor 0.50107028749670401 0.49726258158951819
0.0038077059071857616
-free_rotor2 54864.280804322938 53940.907790776953
923.37301354598378
+free_rotor2 0.16009716260086471 0.15789122044584425
0.0022059421550204446
iso_cone 275.91314364220716 0.047304044109578447
275.86583959809758
iso_cone_free_rotor 25.809435923180324 0.1984082397486189
25.611027683431701
-iso_cone_free_rotor2 1987.0396039230304 1968.6938341786392
18.345769744391234
+iso_cone_free_rotor2 14.592815060002437 0.034276292191227402
14.558538767811207
iso_cone_torsionless ? ? ?
pseudo_ellipse 95.104987068996209 0.095461523976414595
95.009525545019784
pseudo_ellipse2 215.42189142523156 0.030991308327923742
215.39090011690368
@@ -50,10 +50,10 @@
rotor2 0.081098953498889667 0.080669539157379247
0.00042941434151042446
rotor_2_state 0.98651554736334846 0.98514936500256733
0.001366182360781083
free_rotor 0.49751589915599342 0.49726258158951819
0.00025331756647524353
-free_rotor2 54851.540535059685 53940.907790776953
910.63274428273485
+free_rotor2 0.15805817306679379 0.15789122044584425
0.00016695262094953978
iso_cone 0.047808065744685081 0.047304044109578447
0.00050402163510663526
iso_cone_free_rotor 0.19949613552285542 0.1984082397486189
0.0010878957742364997
-iso_cone_free_rotor2 15048.231120071436 4398.7424233390984
10649.488696732338
+iso_cone_free_rotor2 0.035303183308578456 0.034276292191227402
0.0010268911173510545
iso_cone_torsionless ? ? ?
pseudo_ellipse 0.096153146637620937 0.095461523976414595
0.00069162266120635369
pseudo_ellipse2 0.032729958558399358 0.030991308327923742
0.0017386502304756221
Modified: trunk/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=18969&r1=18968&r2=18969&view=diff
==============================================================================
--- trunk/test_suite/system_tests/frame_order.py (original)
+++ trunk/test_suite/system_tests/frame_order.py Fri Mar 22 16:19:53 2013
@@ -99,7 +99,7 @@
del status.flag_pcs
- def check_chi2(self, chi2=None, places=8):
+ def check_chi2(self, chi2=0.0, places=8):
"""Check the function evaluation."""
# Switch back to the original pipe.
@@ -236,7 +236,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags()
self.interpreter.run(script_file=self.cam_path+'free_rotor2.py')
- self.check_chi2(53940.907790776953+923.37301354598378)
+ self.check_chi2(0.0022059421550204446+0.15789122044584425)
def test_cam_free_rotor2_pcs(self):
@@ -245,7 +245,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(rdc=False)
self.interpreter.run(script_file=self.cam_path+'free_rotor2.py')
- self.check_chi2(53940.907790776953)
+ self.check_chi2(0.0022059421550204446)
def test_cam_free_rotor2_rdc(self):
@@ -254,7 +254,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(pcs=False)
self.interpreter.run(script_file=self.cam_path+'free_rotor2.py')
- self.check_chi2(923.37301354598378)
+ self.check_chi2(0.15789122044584425)
def test_cam_iso_cone(self):
@@ -317,7 +317,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags()
self.interpreter.run(script_file=self.cam_path+'iso_cone_free_rotor2.py')
- self.check_chi2(18.345769744391234+1968.6938341786392)
+ self.check_chi2(14.558538767811207+0.034276292191227402)
def test_cam_iso_cone_free_rotor2_pcs(self):
@@ -326,7 +326,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(rdc=False)
self.interpreter.run(script_file=self.cam_path+'iso_cone_free_rotor2.py')
- self.check_chi2(18.345769744391234)
+ self.check_chi2(14.558538767811207)
def test_cam_iso_cone_free_rotor2_rdc(self):
@@ -335,7 +335,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(pcs=False)
self.interpreter.run(script_file=self.cam_path+'iso_cone_free_rotor2.py')
- self.check_chi2(1968.6938341786392)
+ self.check_chi2(0.034276292191227402)
def test_cam_iso_cone_torsionless(self):
@@ -398,7 +398,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags()
self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse2.py')
- self.check_chi2(0.0+0.0)
+ self.check_chi2(215.39090011690368+0.030991308327923742)
def test_cam_pseudo_ellipse2_pcs(self):
@@ -407,7 +407,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(rdc=False)
self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse2.py')
- self.check_chi2(0.0)
+ self.check_chi2(215.39090011690368)
def test_cam_pseudo_ellipse2_rdc(self):
@@ -416,7 +416,7 @@
# The flags, execute the script, and then check the chi2 value.
self.flags(pcs=False)
self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse2.py')
- self.check_chi2(0.0)
+ self.check_chi2(0.030991308327923742)
def test_cam_pseudo_ellipse_free_rotor(self):
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=18969&r1=18968&r2=18969&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
(original)
+++ trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py Fri
Mar 22 16:19:53 2013
@@ -32,10 +32,10 @@
# Set up some class variables.
directory = 'free_rotor2'
model = 'free rotor'
- ave_pos_beta = 2.5534876110153948
- ave_pos_gamma = 0.47194843111649976
- axis_theta = 1.6573281536701425
- axis_phi = 0.89246262623423234
+ ave_pos_beta = 0.77485244603476433
+ ave_pos_gamma = 0.1420704587263735
+ axis_theta = 0.69828059079619353433
+ axis_phi = 4.03227550621962294031
cone = True
num_int_pts = 50
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=18969&r1=18968&r2=18969&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
Fri Mar 22 16:19:53 2013
@@ -34,8 +34,8 @@
directory = 'iso_cone_free_rotor2'
model = 'iso cone, free rotor'
ave_pos_alpha = 4.3434999280669997
- ave_pos_beta = 0.43544332764249905
- ave_pos_gamma = 3.8013235235956007
+ ave_pos_beta = 0.77485244603476433
+ ave_pos_gamma = 0.1420704587263735
axis_theta = 0.69828059079619353433
axis_phi = 4.03227550621962294031
cone_s1 = iso_cone_theta_to_S(1.2)
r18969 - in /trunk/test_suite: shared_data/frame_order/cam/ system_tests/ system_tests/scripts/frame_order/cam/