r22622 - /branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- April 03, 2014 - 13:26

Author: bugman
Date: Thu Apr  3 13:26:47 2014
New Revision: 22622

URL: http://svn.gna.org/viewcvs/relax?rev=22622&view=rev
Log:
Fix for the CaM frame order system tests.

The axis alpha angle and pivot shifting to the closest point to the CoM in 
the base system test
script now only happens for the 'rotor' and 'free rotor' models.  This allows 
the tests for the
isotropic cone models to pass again.


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=22622&r1=22621&r2=22622&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
        Thu Apr  3 13:26:47 2014
@@ -83,7 +83,7 @@
         """Execute the frame order analysis."""
 
         # Parameter conversions.
-        if self.AXIS_THETA != None and self.AXIS_ALPHA == None:
+        if self.MODEL in ['rotor', 'free rotor']:
             self.convert_rotor(theta=self.AXIS_THETA, phi=self.AXIS_PHI, 
pivot=self.PIVOT, com=self.COM)
 
         # Alias the user function executor method.