r13949 - /branches/gui_testing/auto_analyses/dauvergne_protocol.py -- July 28, 2011 - 12:40

Author: bugman
Date: Thu Jul 28 12:40:44 2011
New Revision: 13949

URL: http://svn.gna.org/viewcvs/relax?rev=13949&view=rev
Log:
Bug fix for the dauvergne_protocol - the pipe.copy() calls are now followed 
by pipe.switch().

This is needed as previously the pipe.create() user function call 
automatically switched pipes, but
pipe.copy() does not.


Modified:
    branches/gui_testing/auto_analyses/dauvergne_protocol.py

Modified: branches/gui_testing/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/dauvergne_protocol.py?rev=13949&r1=13948&r2=13949&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/dauvergne_protocol.py (original)
+++ branches/gui_testing/auto_analyses/dauvergne_protocol.py Thu Jul 28 
12:40:44 2011
@@ -517,6 +517,7 @@
                     if has_pipe(name):
                         self.interpreter.pipe.delete(name)
                     self.interpreter.pipe.copy(self.pipe_name, name)
+                    self.interpreter.pipe.switch(name)
 
                     # Load the local tm diffusion model MI results.
                     self.interpreter.results.read(file='results', 
dir=self.results_dir+'local_tm'+sep+'aic')
@@ -606,6 +607,7 @@
 
             # Create the local_tm data pipe by copying.
             self.interpreter.pipe.copy(self.pipe_name, 'local_tm')
+            self.interpreter.pipe.switch('local_tm')
 
             # Load the local tm diffusion model MI results.
             self.interpreter.results.read(file='results', 
dir=self.results_dir+'local_tm'+sep+'aic')
@@ -627,6 +629,7 @@
 
                 # Create the data pipe by copying.
                 self.interpreter.pipe.copy(self.pipe_name, model)
+                self.interpreter.pipe.switch(model)
 
                 # Load the diffusion model results.
                 self.interpreter.results.read(file='results', 
dir=self.results_dir+model + sep+'round_'+repr(self.round)+sep+'opt')
@@ -715,6 +718,7 @@
             if has_pipe(name):
                 self.interpreter.pipe.delete(name)
             self.interpreter.pipe.copy(self.pipe_name, name)
+            self.interpreter.pipe.switch(name)
 
             # Copy the diffusion tensor from the 'opt' data pipe and prevent 
it from being minimised.
             if not local_tm: