r14604 - /1.3/auto_analyses/dauvergne_protocol.py -- September 06, 2011 - 19:42

Author: bugman
Date: Tue Sep  6 19:42:14 2011
New Revision: 14604

URL: http://svn.gna.org/viewcvs/relax?rev=14604&view=rev
Log:
Fix for the dauvergne_protocol model-free auto-analysis with the deletion of 
data pipes.

Now only the data pipes created by dauvergne_protocol are deleted.  This 
fixes the problem whereby
data pipes from other analyses are deleted by dauvergne_protocol, breaking 
the GUI.


Modified:
    1.3/auto_analyses/dauvergne_protocol.py

Modified: 1.3/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/dauvergne_protocol.py?rev=14604&r1=14603&r2=14604&view=diff
==============================================================================
--- 1.3/auto_analyses/dauvergne_protocol.py (original)
+++ 1.3/auto_analyses/dauvergne_protocol.py Tue Sep  6 19:42:14 2011
@@ -645,14 +645,10 @@
             # All the global diffusion models to be used in the model 
selection.
             self.pipes = ['local_tm', 'sphere', 'prolate', 'oblate', 
'ellipsoid']
 
-            # Remove all pipes.
+            # Remove all temporary pipes used in this auto-analysis.
             for name in pipe_names():
-                # Skip the original pipe.
-                if name == self.pipe_name:
-                    continue
-
-                # Delete the pipe.
-                self.interpreter.pipe.delete(name)
+                if name in self.pipes + self.mf_models + 
self.local_tm_models + ['aic', 'previous']:
+                    self.interpreter.pipe.delete(name)
 
             # Missing optimised model.
             dir_list = listdir(self.results_dir)