r22174 - /branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- February 12, 2014 - 11:14

Author: bugman
Date: Wed Feb 12 11:14:09 2014
New Revision: 22174

URL: http://svn.gna.org/viewcvs/relax?rev=22174&view=rev
Log:
Changed the handling of the pivot point in the CaM frame order system tests.

The pivot point is now a class variable, rather than being hardcoded into a 
function.  The handling
of a second pivot has also been added.


Modified:
    
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.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=22174&r1=22173&r2=22174&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
 Wed Feb 12 11:14:09 2014
@@ -23,7 +23,7 @@
 """Base script for the optimisation of the rigid frame order test models."""
 
 # Python module imports.
-from numpy import array, float64, transpose, zeros
+from numpy import array, float32, float64, transpose, zeros
 from os import F_OK, access, sep
 
 # relax module imports.
@@ -46,6 +46,9 @@
 
     # The frame order model.
     MODEL = None
+
+    # The number of integration points.
+    NUM_INT_PTS = 50
 
     # The model parameters.
     AVE_POS_ALPHA, AVE_POS_BETA, AVE_POS_GAMMA = 
reverse_euler_zyz(4.3434999280669997, 0.43544332764249905, 3.8013235235956007)
@@ -62,8 +65,9 @@
     AXIS_PHI2 = None
     CONE_SIGMA_MAX2 = None
 
-    # The number of integration points.
-    NUM_INT_PTS = 50
+    # The pivot points.
+    PIVOT = array([ 37.254, 0.5, 16.7465], float32)
+    PIVOT2 = None
 
 
     def __init__(self, exec_fn):
@@ -259,9 +263,10 @@
         # Set the reference domain.
         self._execute_uf(uf_name='frame_order.ref_domain', ref='N')
 
-        # Set the initial pivot point.
-        pivot = array([ 37.254, 0.5, 16.7465])
-        self._execute_uf(uf_name='frame_order.pivot', pivot=pivot, fix=True)
+        # Set the initial pivot point(s).
+        self._execute_uf(uf_name='frame_order.pivot', pivot=self.PIVOT, 
fix=True)
+        if self.PIVOT2 != None:
+            self._execute_uf(uf_name='frame_order.pivot', pivot=self.PIVOT2, 
order=2, fix=True)
 
         # Set the paramagnetic centre.
         self._execute_uf(uf_name='paramag.centre', pos=[35.934, 12.194, 
-4.206])