Author: tlinnet
Date: Mon Aug 18 11:04:13 2014
New Revision: 25042
URL: http://svn.gna.org/viewcvs/relax?rev=25042&view=rev
Log:
Replaced remaining variable names: MODEL_PARAM_* with MODEL_LIST_*, to match
all of the other MODEL_LIST_* variables.
Modified:
trunk/specific_analyses/relax_disp/variables.py
trunk/target_functions/relax_disp.py
Modified: trunk/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25042&r1=25041&r2=25042&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Mon Aug 18 11:04:13
2014
@@ -493,13 +493,13 @@
MODEL_LIST_INV_RELAX_TIMES = [MODEL_B14, MODEL_B14_FULL, MODEL_MMQ_CR72,
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_2SITE_FIT_R1,
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
"""The inverted relaxation delay"""
-MODEL_PARAM_R20B = [MODEL_B14_FULL, MODEL_CR72_FULL,
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR_FULL]
+MODEL_LIST_R20B = [MODEL_B14_FULL, MODEL_CR72_FULL,
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR_FULL]
"""Models using R20B."""
-MODEL_PARAM_DW_MIX_DOUBLE = [MODEL_LM63_3SITE, MODEL_MMQ_CR72,
MODEL_NS_MMQ_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
+MODEL_LIST_DW_MIX_DOUBLE = [MODEL_LM63_3SITE, MODEL_MMQ_CR72,
MODEL_NS_MMQ_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
"""Models using parameters with mixed dw, and has two variables. For example
with both dw and dwH or dw_AB and dw_BC or phi_ex_B and phi_ex_C."""
-MODEL_PARAM_DW_MIX_QUADRUPLE = [MODEL_NS_MMQ_3SITE,
MODEL_NS_MMQ_3SITE_LINEAR]
+MODEL_LIST_DW_MIX_QUADRUPLE = [MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
"""Models using parameters with mixed dw, and has four variables. For
example with both dw_AB, dw_BC, dwH_AB and dwH_BC."""
Modified: trunk/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=25042&r1=25041&r2=25042&view=diff
==============================================================================
--- trunk/target_functions/relax_disp.py (original)
+++ trunk/target_functions/relax_disp.py Mon Aug 18 11:04:13 2014
@@ -55,7 +55,7 @@
from lib.errors import RelaxError
from lib.float import isNaN
from target_functions.chi2 import chi2_rankN
-from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ,
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ,
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_LIST_CPMG, EXP_TYPE_R1RHO,
MODEL_B14, MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94,
MODEL_DPL94_FIT_R1, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LIST_FULL,
MODEL_LIST_INV_RELAX_TIMES, MODEL_LIST_MMQ, MODEL_LIST_MQ_CPMG,
MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO, MODEL_LIST_R1RHO_FULL,
MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1, MODEL_LM63, MODEL_LM63_3SITE,
MODEL_M61, MODEL_M61B, MODEL_MP05, MODEL_MP05_FIT_R1, 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_2SITE_FIT_R1,
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAM_DW_MIX_DOUBLE,
MODEL_PARAM_DW_MIX_QUADRUPLE, MODEL_PARAM_R20B, MODEL_TAP03,
MODEL_TAP03_FIT_R1, MODEL_TP02, MODEL_TP02_FIT_R1, MODEL_TSMFK01
+from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ,
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ,
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_LIST_CPMG, EXP_TYPE_R1RHO,
MODEL_B14, MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94,
MODEL_DPL94_FIT_R1, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LIST_FULL, ,
MODEL_LIST_DW_MIX_DOUBLE, MODEL_LIST_DW_MIX_QUADRUPLE,
MODEL_LIST_INV_RELAX_TIMES, MODEL_LIST_R20B, MODEL_LIST_MMQ,
MODEL_LIST_MQ_CPMG, MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO,
MODEL_LIST_R1RHO_FULL, MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1,
MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, MODEL_MP05,
MODEL_MP05_FIT_R1, 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_2SITE_FIT_R1, MODEL_NS_R1RHO_3SITE,
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_TAP03, MODEL_TAP03_FIT_R1, MODEL_TP02,
MODEL_TP02_FIT_R1, MODEL_TSMFK01
class Dispersion:
@@ -405,17 +405,17 @@
# The spin and frequency dependent R2 parameters.
self.end_index.append(self.NE * self.NS * self.NM)
- if model in MODEL_PARAM_R20B:
+ if model in MODEL_LIST_R20B:
self.end_index.append(2 * self.NE * self.NS * self.NM)
# The spin and dependent parameters (phi_ex, dw, padw2).
self.end_index.append(self.end_index[-1] + self.NS)
# For models with both dw and dwH or dw_AB and dw_BC or phi_ex_B and
phi_ex_C.
- if model in MODEL_PARAM_DW_MIX_DOUBLE:
+ if model in MODEL_LIST_DW_MIX_DOUBLE:
self.end_index.append(self.end_index[-1] + self.NS)
- elif model in MODEL_PARAM_DW_MIX_QUADRUPLE:
+ elif model in MODEL_LIST_DW_MIX_QUADRUPLE:
self.end_index.append(self.end_index[-1] + self.NS)
self.end_index.append(self.end_index[-1] + self.NS)
self.end_index.append(self.end_index[-1] + self.NS)
r25042 - in /trunk: specific_analyses/relax_disp/variables.py target_functions/relax_disp.py