r27961 - in /trunk: pipe_control/pymol_control.py specific_analyses/frame_order/uf.py -- October 02, 2015 - 16:09

Author: bugman
Date: Fri Oct  2 16:09:25 2015
New Revision: 27961

URL: http://svn.gna.org/viewcvs/relax?rev=27961&view=rev
Log:
Fix for the merger of the frame_order_cleanup branch.

The pipe_control.pipes.check_pipe() function is being incorrectly used, but 
now matches that of the
frame_order_cleanup branch.


Modified:
    trunk/pipe_control/pymol_control.py
    trunk/specific_analyses/frame_order/uf.py

Modified: trunk/pipe_control/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pymol_control.py?rev=27961&r1=27960&r2=27961&view=diff
==============================================================================
--- trunk/pipe_control/pymol_control.py (original)
+++ trunk/pipe_control/pymol_control.py Fri Oct  2 16:09:25 2015
@@ -41,7 +41,6 @@
 from lib.warnings import RelaxWarning
 from lib.io import delete, file_root, get_file_path, open_read_file, 
open_write_file, test_binary
 from lib.structure.files import find_pdb_files
-from pipe_control import pipes
 from pipe_control.mol_res_spin import exists_mol_res_spin_data
 from pipe_control.pipes import check_pipe
 from pipe_control.result_files import add_result_file

Modified: trunk/specific_analyses/frame_order/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/uf.py?rev=27961&r1=27960&r2=27961&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/uf.py   (original)
+++ trunk/specific_analyses/frame_order/uf.py   Fri Oct  2 16:09:25 2015
@@ -39,7 +39,7 @@
 from lib.geometry.rotations import euler_to_R_zyz, R_to_euler_zyz
 from lib.io import open_write_file
 from lib.warnings import RelaxWarning
-from pipe_control import pipes
+from pipe_control.pipes import check_pipe
 from specific_analyses.frame_order.checks import check_domain, check_model, 
check_parameters, check_pivot
 from specific_analyses.frame_order.data import domain_moving, generate_pivot
 from specific_analyses.frame_order.geometric import average_position, 
create_ave_pos, create_geometric_rep, generate_axis_system
@@ -388,7 +388,7 @@
     """
 
     # Test if the current data pipe exists.
-    pipes.test()
+    check_pipe()
 
     # Store the flag.
     cdp.quad_int = flag
@@ -470,7 +470,7 @@
     print("Pseudo-Brownian dynamics simulation of the frame order motions.")
 
     # Checks.
-    pipes.test()
+    check_pipe()
     check_model()
     check_domain()
     check_parameters()
@@ -528,7 +528,7 @@
     """
 
     # Test if the current data pipe exists.
-    pipes.test()
+    check_pipe()
 
     # Throw a warning to the user if not enough points are being used.
     if max_num < 200: