r23885 - /branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- June 12, 2014 - 16:40

Author: bugman
Date: Thu Jun 12 16:40:15 2014
New Revision: 23885

URL: http://svn.gna.org/viewcvs/relax?rev=23885&view=rev
Log:
Modified the CaM frame order system test base script to test alternative code 
paths.

This pivot point was fixed in all tests, so the code in the target functions 
behind the pivot_opt
flag was not being tested.  Now for those system tests whereby the calc 
rather than minimise user
function is called, the pivot is no longer fixed to execute this code.


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

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=23885&r1=23884&r2=23885&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 Thu Jun 12 16:40:15 2014
@@ -281,8 +281,11 @@
         # Set the reference domain.
         self._execute_uf(uf_name='frame_order.ref_domain', ref='N')
 
-        # Set the initial pivot point(s).
-        self._execute_uf(uf_name='frame_order.pivot', pivot=self.PIVOT, 
fix=True)
+        # Set the initial pivot point - fixed when optimising, unfixed 
otherwise to check different code paths.
+        fix = False
+        if hasattr(status, 'flag_opt') and status.flag_opt:
+            fix = True
+        self._execute_uf(uf_name='frame_order.pivot', pivot=self.PIVOT, 
fix=fix)
 
         # Set the paramagnetic centre.
         self._execute_uf(uf_name='paramag.centre', pos=[35.934, 12.194, 
-4.206])