r23422 - /branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/ -- May 26, 2014 - 15:23

Author: bugman
Date: Mon May 26 15:23:37 2014
New Revision: 23422

URL: http://svn.gna.org/viewcvs/relax?rev=23422&view=rev
Log:
Fixes for the 2nd frame order free-rotor system tests.

The average domain position parameters are now set to the correct values, 
matching those in the
relax log file frame_order_ave_pos_opt.log in 
test_suite/shared_data/frame_order/cam/free_rotor2.


Modified:
    
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
    
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=23422&r1=23421&r2=23422&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
 (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
 Mon May 26 15:23:37 2014
@@ -31,10 +31,12 @@
     # Set up some class variables.
     DIRECTORY = 'free_rotor2'
     MODEL = 'free rotor'
-    # FIXME:  The b' and g' angles need to be newly optimised as in r23397, 
but with the free_rotor2 test data.
+    AVE_POS_X = -13.9092836985788
+    AVE_POS_Y = -0.36893728819422167
+    AVE_POS_Z = 2.8352640418129806
     AVE_POS_ALPHA = None
-    AVE_POS_BETA = 0.19740471457956135
-    AVE_POS_GAMMA = 4.6622313104265416
+    AVE_POS_BETA = 5.389498937346155
+    AVE_POS_GAMMA = 0.09243393677259322
     AXIS_THETA = 0.69828059079619353433
     AXIS_PHI = 4.03227550621962294031
 

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=23422&r1=23421&r2=23422&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
        (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
        Mon May 26 15:23:37 2014
@@ -32,10 +32,12 @@
     # Set up some class variables.
     DIRECTORY = 'iso_cone_free_rotor2'
     MODEL = 'iso cone, free rotor'
-    # FIXME:  The b' and g' angles need to be newly optimised as in r23397, 
but with the free_rotor2 test data.
+    AVE_POS_X = -13.9092836985788
+    AVE_POS_Y = -0.36893728819422167
+    AVE_POS_Z = 2.8352640418129806
     AVE_POS_ALPHA = None
-    AVE_POS_BETA = 0.19740471457956135
-    AVE_POS_GAMMA = 4.6622313104265416
+    AVE_POS_BETA = 5.389498937346155
+    AVE_POS_GAMMA = 0.09243393677259322
     AXIS_THETA = 0.69828059079619353433
     AXIS_PHI = 4.03227550621962294031
     CONE_S1 = iso_cone_theta_to_S(1.2)