r25754 - /branches/frame_order_cleanup/auto_analyses/frame_order.py -- September 11, 2014 - 20:30

Author: bugman
Date: Thu Sep 11 20:30:12 2014
New Revision: 25754

URL: http://svn.gna.org/viewcvs/relax?rev=25754&view=rev
Log:
Fix for the axis permutation protocol in the frame order auto-analysis.

This would fail if a results file for the permuted model already exists as 
the pipe.copy user
function call was being performed too early.


Modified:
    branches/frame_order_cleanup/auto_analyses/frame_order.py

Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=25754&r1=25753&r2=25754&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/frame_order.py   (original)
+++ branches/frame_order_cleanup/auto_analyses/frame_order.py   Thu Sep 11 
20:30:12 2014
@@ -190,13 +190,9 @@
             # A new model name.
             perm_model = "%s permutation %s" % (model, perm)
 
-            # Copy the data pipe, and add it to the list so it is included 
in the model selection.
+            # The data pipe name.
             self.pipe_name_dict[perm_model] = '%s permutation %s - %s' % 
(title, perm, self.pipe_bundle)
             self.pipe_name_list.append(self.pipe_name_dict[perm_model])
-            self.interpreter.pipe.copy(pipe_from=self.pipe_name_dict[model], 
pipe_to=self.pipe_name_dict[perm_model])
-
-            # Switch to the new pipe.
-            
self.interpreter.pipe.switch(pipe_name=self.pipe_name_dict[perm_model])
 
             # The results file already exists, so read its contents instead.
             if self.read_results(model=perm_model, 
pipe_name=self.pipe_name_dict[perm_model]):
@@ -208,6 +204,12 @@
 
                 # Exit the function.
                 return
+
+            # Copy the data pipe, and add it to the list so it is included 
in the model selection.
+            self.interpreter.pipe.copy(pipe_from=self.pipe_name_dict[model], 
pipe_to=self.pipe_name_dict[perm_model])
+
+            # Switch to the new pipe.
+            
self.interpreter.pipe.switch(pipe_name=self.pipe_name_dict[perm_model])
 
             # Permute the axes.
             self.interpreter.frame_order.permute_axes(permutation=perm)