r22615 - /branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py -- March 31, 2014 - 10:52

Author: bugman
Date: Mon Mar 31 10:52:12 2014
New Revision: 22615

URL: http://svn.gna.org/viewcvs/relax?rev=22615&view=rev
Log:
Reverted r22192 as the parameter conversion is now performed by the base 
script.

This is only for the rotor CaM frame order system test script.  The changes 
to the base script have
already been rewritten.

The command used was:
svn merge -r22192:22191 
test_suite/system_tests/scripts/frame_order/cam/rotor.py


Modified:
    
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/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=22615&r1=22614&r2=22615&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
      Mon Mar 31 10:52:12 2014
@@ -22,12 +22,8 @@
 # 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):
@@ -35,14 +31,10 @@
     # 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)