r18935 - in /branches/frame_order_testing/test_suite/system_tests/scripts/frame_order: cam/base_script.py rigid_test.py -- March 22, 2013 - 10:15

Author: bugman
Date: Fri Mar 22 10:15:42 2013
New Revision: 18935

URL: http://svn.gna.org/viewcvs/relax?rev=18935&view=rev
Log:
Fixes for the frame order system test for the recent user function changes.

This includes the renaming of frame_order.cone_pdb to frame_order.pdb_model 
as well as the
elimination of the frame_order.domain_to_pdb user function.


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

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=18935&r1=18934&r2=18935&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 Fri Mar 22 10:15:42 2013
@@ -155,11 +155,7 @@
 
         # Create the cone PDB file.
         if self.cone:
-            self._execute_uf(uf_name='frame_order.cone_pdb', file='devnull', 
force=True)
-
-        # Set the domains.
-        self._execute_uf(uf_name='frame_order.domain_to_pdb', domain='N', 
pdb='1J7O_1st_NH.pdb')
-        self._execute_uf(uf_name='frame_order.domain_to_pdb', domain='C', 
pdb='1J7P_1st_NH_rot.pdb')
+            self._execute_uf(uf_name='frame_order.pdb_model', 
ave_pos_file='devnull', rep_file='devnull', dist_file='devnull', force=True)
 
 
     def setup_full(self):

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/rigid_test.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/rigid_test.py?rev=18935&r1=18934&r2=18935&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/rigid_test.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/rigid_test.py
 Fri Mar 22 10:15:42 2013
@@ -121,9 +121,6 @@
 # Set the reference domain.
 self._execute_uf(uf_name='frame_order.ref_domain', ref='fixed')
 
-# Link the domains to the PDB files.
-self._execute_uf(uf_name='frame_order.domain_to_pdb', domain='fixed', 
pdb='displaced.pdb')
-
 # Set up the mechanics of the displacement to the average domain position.
 self._execute_uf(uf_name='frame_order.average_position', pivot='com', 
translation=True)