r26917 - /branches/frame_order_cleanup/specific_analyses/frame_order/data.py -- December 03, 2014 - 15:11

Author: bugman
Date: Wed Dec  3 15:11:46 2014
New Revision: 26917

URL: http://svn.gna.org/viewcvs/relax?rev=26917&view=rev
Log:
Improved checking for the frame order generate_pivot() function.

The check_model() checking object is now called to make sure the frame order 
model has been
specified, as this is essential for this function.


Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/data.py

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/data.py?rev=26917&r1=26916&r2=26917&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/data.py  
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/data.py  Wed 
Dec  3 15:11:46 2014
@@ -35,7 +35,7 @@
 from pipe_control.interatomic import interatomic_loop
 from pipe_control.mol_res_spin import spin_loop
 from pipe_control.pipes import check_pipe
-from specific_analyses.frame_order.checks import check_pivot
+from specific_analyses.frame_order.checks import check_model, check_pivot
 
 
 def base_data_types():
@@ -117,14 +117,13 @@
     """
 
     # Checks.
+    check_pipe(pipe_name)
     check_pivot(pipe_name=pipe_name)
+    check_model(pipe_name=pipe_name)
 
     # The data pipe.
     if pipe_name == None:
         pipe_name = pipes.cdp_name()
-
-    # Test the data pipe.
-    check_pipe(pipe_name)
 
     # Get the data pipe.
     dp = pipes.get_pipe(pipe_name)