r18419 - /trunk/auto_analyses/dauvergne_protocol.py -- February 05, 2013 - 09:49

Author: bugman
Date: Tue Feb  5 09:49:21 2013
New Revision: 18419

URL: http://svn.gna.org/viewcvs/relax?rev=18419&view=rev
Log:
Fix for bug #20481 (https://gna.org/bugs/?20481).

This is the bug where the dauvergne_protocol model-free auto-analysis expects 
the prolate and oblate
spheroids and ellipsoid to be optimised.  It was caught by the 
Mf.test_bug_20479_gui_final_pipe GUI
test.


Modified:
    trunk/auto_analyses/dauvergne_protocol.py

Modified: trunk/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/dauvergne_protocol.py?rev=18419&r1=18418&r2=18419&view=diff
==============================================================================
--- trunk/auto_analyses/dauvergne_protocol.py (original)
+++ trunk/auto_analyses/dauvergne_protocol.py Tue Feb  5 09:49:21 2013
@@ -664,23 +664,29 @@
             # Diffusion model selection.
             ############################
 
-            # All the global diffusion models to be used in the model 
selection.
-            models = ['local_tm', 'sphere', 'prolate', 'oblate', 'ellipsoid']
+            # The contents of the results directory.
+            dir_list = listdir(self.results_dir)
+
+            # Check that the minimal set of global diffusion models required 
for the protocol has been optimised.
+            min_models = ['local_tm', 'sphere']
+            for model in min_models:
+                if model not in dir_list:
+                    raise RelaxError("The minimum set of global diffusion 
models required for the protocol have not been optimised, the '%s' model 
results cannot be found." % model)
+
+            # Build a list of all global diffusion models optimised.
+            all_models = ['local_tm', 'sphere', 'prolate', 'oblate', 
'ellipsoid']
+            self.opt_models = []
             self.pipes = []
-            for name in models:
-                self.pipes.append(self.name_pipe(name))
+            for model in all_models:
+                if model in dir_list:
+                    self.opt_models.append(model)
+                    self.pipes.append(self.name_pipe(model))
 
             # Remove all temporary pipes used in this auto-analysis.
             for name in pipe_names(bundle=self.pipe_bundle):
                 if name in self.pipes + self.mf_model_pipes + 
self.local_tm_model_pipes + [self.name_pipe('aic'), 
self.name_pipe('previous')]:
                     self.interpreter.pipe.delete(name)
 
-            # Missing optimised model.
-            dir_list = listdir(self.results_dir)
-            for name in models:
-                if name not in dir_list:
-                    raise RelaxError("The %s model must be optimised first." 
% name)
-
             # Create the local_tm data pipe.
             self.interpreter.pipe.create(self.name_pipe('local_tm'), 'mf', 
bundle=self.pipe_bundle)
 
@@ -689,6 +695,10 @@
 
             # Loop over models MII to MV.
             for model in ['sphere', 'prolate', 'oblate', 'ellipsoid']:
+                # Skip missing models.
+                if model not in self.opt_models:
+                    continue
+
                 # Determine which was the last round of optimisation for 
each of the models.
                 self.round = self.determine_rnd(model=model) - 1