r15269 - /branches/frame_order_testing/test_suite/system_tests/frame_order.py -- January 27, 2012 - 10:25

Author: bugman
Date: Fri Jan 27 10:25:23 2012
New Revision: 15269

URL: http://svn.gna.org/viewcvs/relax?rev=15269&view=rev
Log:
Created a special method for setting up the RDC, PCS, and optimisation flags.


Modified:
    branches/frame_order_testing/test_suite/system_tests/frame_order.py

Modified: branches/frame_order_testing/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/frame_order.py?rev=15269&r1=15268&r2=15269&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/frame_order.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/frame_order.py Fri 
Jan 27 10:25:23 2012
@@ -86,10 +86,14 @@
         # Create the data pipe.
         self.interpreter.pipe.create('test', 'frame order')
 
-        # Set a number of flags for the scripts.
-        ds.flag_rdc = True
-        ds.flag_pcs = True
-        ds.flag_opt = False
+
+    def flags(rdc=True, pcs=True, opt=False):
+        """Set a number of flags for the scripts."""
+
+        # Store the flags.
+        ds.flag_rdc = rdc
+        ds.flag_pcs = pcs
+        ds.flag_opt = opt
 
 
     def mesg_opt_debug(self):
@@ -176,6 +180,9 @@
     def test_cam_free_rotor(self):
         """Test the free rotor frame order model of CaM."""
 
+        # The flags.
+        self.flags()
+
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
@@ -192,8 +199,10 @@
     def test_cam_free_rotor_no_rdc(self):
         """Test the free rotor frame order model of CaM."""
 
-        # Execute the script.
-        ds.flag_rdc = False
+        # The flags.
+        self.flags(rdc=False)
+
+        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
         # Switch back to the original pipe.
@@ -209,8 +218,10 @@
     def test_cam_free_rotor_no_pcs(self):
         """Test the free rotor frame order model of CaM."""
 
-        # Execute the script.
-        ds.flag_pcs = False
+        # The flags.
+        self.flags(pcs=False)
+
+        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
         # Switch back to the original pipe.
@@ -226,6 +237,9 @@
     def test_cam_free_rotor2(self):
         """Test the second free rotor frame order model of CaM."""
 
+        # The flags.
+        self.flags()
+
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
@@ -242,8 +256,10 @@
     def test_cam_free_rotor2_no_rdc(self):
         """Test the second free rotor frame order model of CaM."""
 
-        # Execute the script.
-        ds.flag_rdc = False
+        # The flags.
+        self.flags(rdc=False)
+
+        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
         # Switch back to the original pipe.
@@ -259,8 +275,10 @@
     def test_cam_free_rotor2_no_pcs(self):
         """Test the second free rotor frame order model of CaM."""
 
-        # Execute the script.
-        ds.flag_pcs = False
+        # The flags.
+        self.flags(pcs=False)
+
+        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
         # Switch back to the original pipe.