r22192 - in /branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam: base_script.py rotor.py -- February 14, 2014 - 17:25

Author: bugman
Date: Fri Feb 14 17:25:00 2014
New Revision: 22192

URL: http://svn.gna.org/viewcvs/relax?rev=22192&view=rev
Log:
Converted the Frame_order.test_cam_rotor system script test to use the new 
rotor model parameters.

The rotor frame order parameters {P_alpha, P_beta, P_gamma, T_x, T_y, T_z, 
E_theta, E_phi, p_x, p_y,
p_z}, where P_i are the Euler angles defining the average domain position, 
T_i are the translations
defining the average domain position, E_i are the Eigenframe angles defining 
the rotation axis, and
p_i are the pivot point coordinates, will be converted to {P_alpha, P_beta, 
P_gamma, T_x, T_y, T_z,
Ax_alpha, p_x, p_y, p_z}.  Ax_alpha is the new parameter which defines the 
rotation axis together
with the pivot using the minimal parameter set {p_x, p_y, p_z, Ax_alpha}.


Modified:
    
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py
    
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py

Modified: 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=22192&r1=22191&r2=22192&view=diff
==============================================================================
--- 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 (original)
+++ 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 Fri Feb 14 17:25:00 2014
@@ -129,6 +129,8 @@
             self._execute_uf(uf_name='value.set', val=self.AXIS_THETA, 
param='axis_theta')
         if self.AXIS_PHI != None:
             self._execute_uf(uf_name='value.set', val=self.AXIS_PHI, 
param='axis_phi')
+        if self.AXIS_ALPHA != None:
+            self._execute_uf(uf_name='value.set', val=self.AXIS_ALPHA, 
param='axis_alpha')
         if self.CONE_THETA_X != None:
             self._execute_uf(uf_name='value.set', val=self.CONE_THETA_X, 
param='cone_theta_x')
         if self.CONE_THETA_Y != None:

Modified: 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=22192&r1=22191&r2=22192&view=diff
==============================================================================
--- 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py
 (original)
+++ 
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py
 Fri Feb 14 17:25:00 2014
@@ -22,8 +22,12 @@
 # Module docstring.
 """Script for optimising the rotor frame order test model of CaM."""
 
+# Python module imports
+from numpy import arcsin, array, dot, float64, zeros
+
 # relax module imports.
 from base_script import Base_script
+from lib.geometry.coord_transform import spherical_to_cartesian
 
 
 class Analysis(Base_script):
@@ -31,10 +35,14 @@
     # Set up some class variables.
     DIRECTORY = 'rotor'
     MODEL = 'rotor'
-    AXIS_THETA = 0.9600799785953431
-    AXIS_PHI = 4.0322755062196229
     CONE_SIGMA_MAX = 30.0 / 360.0 * 2.0 * pi
 
+    # Translate the system.
+    axis_theta = 0.9600799785953431
+    axis_phi = 4.0322755062196229
+    r_ax = zeros(3, float64)
+    spherical_to_cartesian([1, axis_theta, axis_phi], r_ax)
+    AXIS_ALPHA = arcsin(dot(r_ax, array([0, 0, 1], float64)))
 
 # Execute the analysis.
 Analysis(self._execute_uf)