r21472 - /branches/relax_disp/auto_analyses/relax_disp.py -- November 16, 2013 - 17:12

Author: bugman
Date: Sat Nov 16 17:12:55 2013
New Revision: 21472

URL: http://svn.gna.org/viewcvs/relax?rev=21472&view=rev
Log:
The 'MP05' and 'NS R1rho 2-site' are now nested in the dispersion 
auto-analysis.

As the 'MP05' model is valid across all times scales and does not require 
skewed populations, its
optimised parameters can be used as the starting point of optimisation of the 
'NS R1rho 2-site'
numeric model.  This results in huge speed ups of the numeric model as 
previously a grid search was
being performed.

Modified:
    branches/relax_disp/auto_analyses/relax_disp.py

Modified: branches/relax_disp/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/relax_disp.py?rev=21472&r1=21471&r2=21472&view=diff
==============================================================================
--- branches/relax_disp/auto_analyses/relax_disp.py (original)
+++ branches/relax_disp/auto_analyses/relax_disp.py Sat Nov 16 17:12:55 2013
@@ -156,7 +156,7 @@
             # Loop over all models.
             for model in self.models:
                 # Skip the models used for nesting.
-                if model in [MODEL_CR72, MODEL_MQ_CR72]:
+                if model in [MODEL_CR72, MODEL_MQ_CR72, MODEL_MP05]:
                     continue
 
                 # Warnings for all other analytic models.
@@ -233,6 +233,9 @@
         elif model == MODEL_MMQ_2SITE and MODEL_MQ_CR72 in self.models:
             nested_pipe = MODEL_MQ_CR72
             analytic = True
+        if model == MODEL_NS_R1RHO_2SITE and MODEL_MP05 in self.models:
+            nested_pipe = MODEL_MP05
+            analytic = True
 
         # No nesting.
         if not nested_pipe: