Author: tlinnet
Date: Tue Aug 19 10:54:10 2014
New Revision: 25066
URL: http://svn.gna.org/viewcvs/relax?rev=25066&view=rev
Log:
Added definition and dictionary, for each model, to determine which model
they nest from.
This is better to Hard-code, since it makes it possible to produce a table
with an overview,
and accurately determine which model is nested from.
This is discussed in thread.
http://thread.gmane.org/gmane.science.nmr.relax.devel/6684
Modified:
trunk/specific_analyses/relax_disp/variables.py
Modified: trunk/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25066&r1=25065&r2=25066&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Tue Aug 19 10:54:10
2014
@@ -496,6 +496,55 @@
MODEL_NEST_R1RHO = MODEL_MP05
MODEL_LIST_NEST = [MODEL_NEST_CPMG, MODEL_NEST_MMQ, MODEL_NEST_R1RHO]
+
+# Define recurring lists.
+## For CPMG.
+MODEL_NEST_LIST_CPMG = [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_STAR,
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_B14, MODEL_CR72]
+MODEL_NEST_LIST_CPMG_R20B = [MODEL_NS_CPMG_2SITE_3D_FULL,
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_B14_FULL, MODEL_CR72_FULL]
+## For R1rho.
+MODEL_NEST_LIST_R1RHO_2SITE = [MODEL_MP05, MODEL_TAP03, MODEL_TP02]
+MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1 = [MODEL_MP05_FIT_R1, MODEL_TAP03_FIT_R1,
MODEL_TP02_FIT_R1]
+MODEL_NEST_LIST_R1RHO_3SITE = [MODEL_NS_R1RHO_3SITE_LINEAR,
MODEL_NS_R1RHO_2SITE]
+## For CPMG MMQ.
+MODEL_NEST_LIST_MMQ_2SITE = [MODEL_NS_MMQ_2SITE, MODEL_MMQ_CR72, MODEL_CR72]
+MODEL_NEST_LIST_MMQ_3SITE = [MODEL_NS_MMQ_3SITE_LINEAR]
+
+# Define order of nesting models for each model.
+MODEL_NEST_R2EFF = None
+MODEL_NEST_NOREX = None
+MODEL_NEST_NOREX_R1RHO = None
+MODEL_NEST_NOREX_R1RHO_FIT_R1 = None
+MODEL_NEST_LM63 = None
+MODEL_NEST_LM63_3SITE = [MODEL_LM63]
+MODEL_NEST_CR72 = MODEL_NEST_LIST_CPMG + MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_CR72_FULL = MODEL_NEST_LIST_CPMG_R20B + MODEL_NEST_LIST_CPMG
+MODEL_NEST_IT99 = None
+MODEL_NEST_TSMFK01 = None
+MODEL_NEST_B14 = MODEL_NEST_LIST_CPMG + MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_B14_FULL = MODEL_NEST_LIST_CPMG_R20B + MODEL_NEST_LIST_CPMG
+MODEL_NEST_M61 = None
+MODEL_NEST_M61B = None
+MODEL_NEST_DPL94 = None
+MODEL_NEST_DPL94_FIT_R1 = None
+MODEL_NEST_TP02 = MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_TP02_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
+MODEL_NEST_TAP03 = MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_TAP03_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
+MODEL_NEST_MP05 = MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_MP05_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
+MODEL_NEST_NS_CPMG_2SITE_3D = MODEL_NEST_LIST_CPMG +
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_CPMG_2SITE_3D_FULL = MODEL_NEST_LIST_CPMG_R20B +
MODEL_NEST_LIST_CPMG
+MODEL_NEST_NS_CPMG_2SITE_STAR = MODEL_NEST_LIST_CPMG +
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_CPMG_2SITE_STAR_FULL = MODEL_NEST_LIST_CPMG_R20B +
MODEL_NEST_LIST_CPMG
+MODEL_NEST_NS_CPMG_2SITE_EXPANDED = MODEL_NEST_LIST_CPMG +
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_R1RHO_2SITE = MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_NS_R1RHO_2SITE_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
+MODEL_NEST_NS_R1RHO_3SITE = MODEL_NEST_LIST_R1RHO_3SITE +
MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_NS_R1RHO_3SITE_LINEAR = MODEL_NEST_LIST_R1RHO_3SITE +
MODEL_NEST_LIST_R1RHO_2SITE
+MODEL_NEST_MMQ_CR72 = MODEL_NEST_LIST_MMQ_2SITE
+MODEL_NEST_NS_MMQ_2SITE = MODEL_NEST_LIST_MMQ_2SITE
+MODEL_NEST_NS_MMQ_3SITE = MODEL_NEST_LIST_MMQ_3SITE +
MODEL_NEST_LIST_MMQ_2SITE
+MODEL_NEST_NS_MMQ_3SITE_LINEAR = MODEL_NEST_LIST_MMQ_2SITE
# Full model description list.
@@ -732,3 +781,42 @@
MODEL_NS_MMQ_3SITE_LINEAR: MODEL_EQ_NS_MMQ_3SITE_LINEAR
}
+# Full list of nesting models type.
+MODEL_NEST = {
+ MODEL_R2EFF: MODEL_NEST_R2EFF,
+ MODEL_NOREX: MODEL_NEST_NOREX,
+ MODEL_NOREX_R1RHO: MODEL_NEST_NOREX_R1RHO,
+ MODEL_NOREX_R1RHO_FIT_R1: MODEL_NEST_NOREX_R1RHO_FIT_R1,
+ MODEL_LM63: MODEL_NEST_LM63,
+ MODEL_LM63_3SITE: MODEL_NEST_LM63_3SITE,
+ MODEL_CR72: MODEL_NEST_CR72,
+ MODEL_CR72_FULL: MODEL_NEST_CR72_FULL,
+ MODEL_IT99: MODEL_NEST_IT99,
+ MODEL_TSMFK01: MODEL_NEST_TSMFK01,
+ MODEL_B14: MODEL_NEST_B14,
+ MODEL_B14_FULL: MODEL_NEST_B14_FULL,
+ MODEL_M61: MODEL_NEST_M61,
+ MODEL_M61B: MODEL_NEST_M61B,
+ MODEL_DPL94: MODEL_NEST_DPL94,
+ MODEL_DPL94_FIT_R1: MODEL_NEST_DPL94_FIT_R1,
+ MODEL_TP02: MODEL_NEST_TP02,
+ MODEL_TP02_FIT_R1: MODEL_NEST_TP02_FIT_R1,
+ MODEL_TAP03: MODEL_NEST_TAP03,
+ MODEL_TAP03_FIT_R1: MODEL_NEST_TAP03_FIT_R1,
+ MODEL_MP05: MODEL_NEST_MP05,
+ MODEL_MP05_FIT_R1: MODEL_NEST_MP05_FIT_R1,
+ MODEL_NS_CPMG_2SITE_3D: MODEL_NEST_NS_CPMG_2SITE_3D,
+ MODEL_NS_CPMG_2SITE_3D_FULL: MODEL_NEST_NS_CPMG_2SITE_3D_FULL,
+ MODEL_NS_CPMG_2SITE_STAR: MODEL_NEST_NS_CPMG_2SITE_STAR,
+ MODEL_NS_CPMG_2SITE_STAR_FULL: MODEL_NEST_NS_CPMG_2SITE_STAR_FULL,
+ MODEL_NS_CPMG_2SITE_EXPANDED: MODEL_NEST_NS_CPMG_2SITE_EXPANDED,
+ MODEL_NS_R1RHO_2SITE: MODEL_NEST_NS_R1RHO_2SITE,
+ MODEL_NS_R1RHO_2SITE_FIT_R1: MODEL_NEST_NS_R1RHO_2SITE_FIT_R1,
+ MODEL_NS_R1RHO_3SITE: MODEL_NEST_NS_R1RHO_3SITE,
+ MODEL_NS_R1RHO_3SITE_LINEAR: MODEL_NEST_NS_R1RHO_3SITE_LINEAR,
+ MODEL_MMQ_CR72: MODEL_NEST_MMQ_CR72,
+ MODEL_NS_MMQ_2SITE: MODEL_NEST_NS_MMQ_2SITE,
+ MODEL_NS_MMQ_3SITE: MODEL_NEST_NS_MMQ_3SITE,
+ MODEL_NS_MMQ_3SITE_LINEAR: MODEL_NEST_NS_MMQ_3SITE_LINEAR
+}
+
r25066 - /trunk/specific_analyses/relax_disp/variables.py