r17996 - /branches/frame_order_testing/auto_analyses/frame_order.py -- November 16, 2012 - 12:35

Author: bugman
Date: Fri Nov 16 12:35:24 2012
New Revision: 17996

URL: http://svn.gna.org/viewcvs/relax?rev=17996&view=rev
Log:
Fixes for the model selection part of the frame order auto-analysis protocol.


Modified:
    branches/frame_order_testing/auto_analyses/frame_order.py

Modified: branches/frame_order_testing/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/frame_order.py?rev=17996&r1=17995&r2=17996&view=diff
==============================================================================
--- branches/frame_order_testing/auto_analyses/frame_order.py (original)
+++ branches/frame_order_testing/auto_analyses/frame_order.py Fri Nov 16 
12:35:24 2012
@@ -80,6 +80,7 @@
 
         # A dictionary of the data pipe names.
         self.models = {}
+        self.pipes = []
 
         # Project directory (i.e. directory containing the model-free model 
results and the newly generated files)
         if results_dir:
@@ -101,7 +102,7 @@
             self.optimise()
 
             # Model selection.
-            self.interpreter.model_selection(method='AIC', 
modsel_pipe='final')
+            self.interpreter.model_selection(method='AIC', 
modsel_pipe='final', pipes=self.pipes)
 
             # Monte Carlo simulations.
             self.interpreter.monte_carlo.setup(number=self.mc_sim_num)
@@ -250,6 +251,7 @@
 
             # The data pipe name.
             self.models[model] = '%s - %s' % (title, self.pipe_bundle)
+            self.pipes.append(self.models[model])
 
             # The results file already exists, so read its contents instead.
             if self.read_results(model=model, pipe_name=self.models[model]):
@@ -315,6 +317,7 @@
 
         # The data pipe name.
         self.models[model] = '%s - %s' % (title, self.pipe_bundle)
+        self.pipes.append(self.models[model])
 
         # The results file already exists, so read its contents instead.
         if self.read_results(model=model, pipe_name=self.models[model]):