r24990 - /branches/R1_fitting/auto_analyses/relax_disp.py -- August 12, 2014 - 10:54

Author: tlinnet
Date: Tue Aug 12 10:54:52 2014
New Revision: 24990

URL: http://svn.gna.org/viewcvs/relax?rev=24990&view=rev
Log:
Replaced the test, if acquiring the model info to a numerical model from a 
analytical model.

sr #3135(https://gna.org/support/?3135): Optimisation of the R1 relaxation 
rate for the off-resonance R1rho relaxation dispersion models.

Modified:
    branches/R1_fitting/auto_analyses/relax_disp.py

Modified: branches/R1_fitting/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/auto_analyses/relax_disp.py?rev=24990&r1=24989&r2=24990&view=diff
==============================================================================
--- branches/R1_fitting/auto_analyses/relax_disp.py     (original)
+++ branches/R1_fitting/auto_analyses/relax_disp.py     Tue Aug 12 10:54:52 
2014
@@ -39,7 +39,7 @@
 from specific_analyses.relax_disp.data import has_exponential_exp_type, 
has_cpmg_exp_type, has_fixed_time_exp_type, has_r1rho_exp_type, loop_frq
 from specific_analyses.relax_disp.data import INTERPOLATE_DISP, 
INTERPOLATE_OFFSET, X_AXIS_DISP, X_AXIS_W_EFF, X_AXIS_THETA, Y_AXIS_R2_R1RHO, 
Y_AXIS_R2_EFF
 from specific_analyses.relax_disp.variables import nesting_model
-from specific_analyses.relax_disp.variables import MODEL_CR72, 
MODEL_CR72_FULL, MODEL_LIST_ANALYTIC, MODEL_LIST_NEST, MODEL_LIST_NUMERIC, 
MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1, MODEL_LIST_R1RHO_FULL, 
MODEL_LM63, MODEL_LM63_3SITE, MODEL_MP05, MODEL_MMQ_CR72, MODEL_NOREX, 
MODEL_NOREX_R1RHO, MODEL_NOREX_R1RHO_FIT_R1, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, 
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAM_R20B, 
MODEL_PARAMS, MODEL_R2EFF, PARAMS_R20
+from specific_analyses.relax_disp.variables import EQ_ANALYTIC, EQ_NUMERIC, 
EQ_SILICO, MODEL_CR72, MODEL_CR72_FULL, MODEL_LIST_ANALYTIC, MODEL_LIST_NEST, 
MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1, 
MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_LM63_3SITE, MODEL_MP05, 
MODEL_MMQ_CR72, MODEL_NOREX, MODEL_NOREX_R1RHO, MODEL_NOREX_R1RHO_FIT_R1, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAM_R20B, MODEL_PARAMS, MODEL_R2EFF, 
PARAMS_R20
 from status import Status; status = Status()
 
 
@@ -293,23 +293,16 @@
         else:
             nested_pipe = None
 
-
-        # Using the analytic solution.
-        analytic = False
-        if model in [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR] and MODEL_CR72 in self.models:
-            nested_pipe = self.name_pipe(MODEL_CR72)
-            analytic = True
-        elif model == MODEL_NS_MMQ_2SITE and MODEL_MMQ_CR72 in self.models:
-            nested_pipe = self.name_pipe(MODEL_MMQ_CR72)
-            analytic = True
-        if model == MODEL_NS_R1RHO_2SITE and MODEL_MP05 in self.models:
-            nested_pipe = self.name_pipe(MODEL_MP05)
-            analytic = True
-
         # No nesting.
         if not nested_pipe:
             print("No model nesting or model equivalence detected.")
             return False
+
+        # Using the analytic solution.
+        if model_info.eq in [EQ_NUMERIC, EQ_SILICO] and 
comparable_model_info.eq == EQ_ANALYTIC:
+            analytic = True
+        else:
+            analytic = False
 
         # Printout.
         if analytic: