r16655 - /branches/uf_redesign/auto_analyses/dauvergne_protocol.py -- June 05, 2012 - 09:35

Author: bugman
Date: Tue Jun  5 09:35:27 2012
New Revision: 16655

URL: http://svn.gna.org/viewcvs/relax?rev=16655&view=rev
Log:
The dauverge_protocol auto-analysis now uses the new 'bundle' user function 
args.

This is used in the pipe copying to place the newly created pipe and in the 
model selection, both so
that all pipes created during the analysis are located within the pipe bundle 
reserved for that
analysis.


Modified:
    branches/uf_redesign/auto_analyses/dauvergne_protocol.py

Modified: branches/uf_redesign/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/auto_analyses/dauvergne_protocol.py?rev=16655&r1=16654&r2=16655&view=diff
==============================================================================
--- branches/uf_redesign/auto_analyses/dauvergne_protocol.py (original)
+++ branches/uf_redesign/auto_analyses/dauvergne_protocol.py Tue Jun  5 
09:35:27 2012
@@ -748,7 +748,7 @@
         # Model selection (delete the model selection pipe if it already 
exists).
         if has_pipe(modsel_pipe):
             self.interpreter.pipe.delete(modsel_pipe)
-        self.interpreter.model_selection(method='AIC', 
modsel_pipe=modsel_pipe, pipes=self.pipes)
+        self.interpreter.model_selection(method='AIC', 
modsel_pipe=modsel_pipe, bundle=self.pipe_bundle, pipes=self.pipes)
 
         # Write the results.
         if write_flag:
@@ -772,7 +772,7 @@
             # Create the data pipe (by copying).
             if has_pipe(name):
                 self.interpreter.pipe.delete(name)
-            self.interpreter.pipe.copy(self.pipe_name, name)
+            self.interpreter.pipe.copy(self.pipe_name, name, 
bundle_to=self.pipe_bundle)
             self.interpreter.pipe.switch(name)
 
             # Copy the diffusion tensor from the 'opt' data pipe and prevent 
it from being minimised.