r25149 - /trunk/specific_analyses/relax_disp/model.py -- August 21, 2014 - 10:25

Author: bugman
Date: Thu Aug 21 10:25:04 2014
New Revision: 25149

URL: http://svn.gna.org/viewcvs/relax?rev=25149&view=rev
Log:
Updated the specific_analyses.relax_disp.model.Model_class class to handle 
the dynamic R1 parameter.

The class variable self.params now has the 'r1' parameter prepended to the 
list if is_r1_optimised()
returns True.


Modified:
    trunk/specific_analyses/relax_disp/model.py

Modified: trunk/specific_analyses/relax_disp/model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/model.py?rev=25149&r1=25148&r2=25149&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/model.py (original)
+++ trunk/specific_analyses/relax_disp/model.py Thu Aug 21 10:25:04 2014
@@ -30,6 +30,7 @@
 # relax module imports.
 from lib.errors import RelaxError
 from specific_analyses.relax_disp.checks import check_missing_r1
+from specific_analyses.relax_disp.data import is_r1_optimised
 from specific_analyses.relax_disp.variables import EQ_ANALYTIC, EQ_NUMERIC, 
EQ_SILICO, EXP_TYPE_CPMG_MMQ, EXP_TYPE_R1RHO, EXP_TYPE_CPMG_SQ, 
EXP_TYPE_NOREX, EXP_TYPE_NOREX_R1RHO, EXP_TYPE_R2EFF, MODEL_DESC, MODEL_EQ, 
MODEL_EXP_TYPE, MODEL_LIST_ANALYTIC_CPMG, MODEL_LIST_NUMERIC_CPMG, 
MODEL_LIST_R1RHO_OFF_RES, MODEL_CR72, MODEL_DPL94, MODEL_IT99, MODEL_LM63, 
MODEL_LM63_3SITE, MODEL_MMQ_CR72, MODEL_NEST, MODEL_NOREX, MODEL_NOREX_R1RHO, 
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_PARAMS, MODEL_PARAMS_LM63, MODEL_PARAMS_LM63_3SITE, 
MODEL_PARAMS_NS_MMQ_2SITE, MODEL_PARAMS_NS_MMQ_3SITE, 
MODEL_PARAMS_NS_MMQ_3SITE_LINEAR, MODEL_PARAMS_NS_R1RHO_2SITE, 
MODEL_PARAMS_NS_R1RHO_3SITE, MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR, MODEL_R2EFF, 
MODEL_SITES, MODEL_YEAR, PARAMS_R20
 
 
@@ -57,6 +58,8 @@
 
         # model parameters.
         self.params = MODEL_PARAMS[self.model]
+        if is_r1_optimised:
+            self.params.insert(0, 'r1')
 
         # model number of parameters.
         self.params_nr = len(self.params)