r23016 - /trunk/specific_analyses/relax_disp/variables.py -- May 06, 2014 - 17:26

Author: tlinnet
Date: Tue May  6 17:26:30 2014
New Revision: 23016

URL: http://svn.gna.org/viewcvs/relax?rev=23016&view=rev
Log:
Added B14_FULL to the lists of the specific_analyses.relax_disp.variables 
module.
 The model name is stored in a special variable which will be used throughout 
relax.

sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014) 
B14 model - 2-site exact solution model for all time scales.

This follows the tutorial for adding relaxation dispersion models at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax#Adding_the_model_to_the_list


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=23016&r1=23015&r2=23016&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py     (original)
+++ trunk/specific_analyses/relax_disp/variables.py     Tue May  6 17:26:30 
2014
@@ -89,8 +89,12 @@
 MODEL_PARAMS_TSMFK01 = ['r2a', 'dw', 'k_AB']
 
 MODEL_B14 = 'B14'
-MODEL_DESC_B14 = "The Baldwin (2014) 2-site CPMG exact solution model for 
all time scales for SQ-CPMG experiments."
-MODEL_PARAMS_B14 = ['r2a', 'r2b', 'pA', 'dw', 'kex']
+MODEL_DESC_B14 = "The Baldwin (2014) 2-site CPMG exact solution model for 
all time scales for SQ-CPMG experiments, whereby the simplification R20A = 
R20B is assumed."
+MODEL_PARAMS_B14 = ['r2', 'pA', 'dw', 'kex']
+
+MODEL_B14_FULL = 'B14 full'
+MODEL_DESC_B14_FULL = "The Baldwin (2014) 2-site CPMG exact solution model 
for all time scales for SQ-CPMG experiments."
+MODEL_PARAMS_B14_FULL = ['r2a', 'r2b', 'pA', 'dw', 'kex']
 
 MODEL_M61 = 'M61'
 MODEL_DESC_M61 = "The Meiboom (1961) on-resonance 2-site fast exchange model 
for R1rho-type experiments."
@@ -175,16 +179,16 @@
 
 
 # The model lists.
-MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_M61, MODEL_M61B, 
MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, 
MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_3SITE_LINEAR]
+MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, 
MODEL_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
 """The list of all dispersion models (excluding the R2eff model)."""
 
-MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, 
MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_M61, 
MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
+MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, 
MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, 
MODEL_B14_FULL, MODEL_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, 
MODEL_MP05, MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
 """The list of the R2eff model together with all dispersion models."""
 
-MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED]
+MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED]
 """The list of all dispersion models specifically for CPMG-type experiments 
(excluding the R2eff model)."""
 
-MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, 
MODEL_B14, MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED]
+MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, 
MODEL_B14, MODEL_B14_FULL, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_CPMG_2SITE_EXPANDED]
 """The list of the R2eff model together with all dispersion models 
specifically for CPMG-type experiments."""
 
 MODEL_LIST_R1RHO = [MODEL_NOREX, MODEL_M61, MODEL_M61B, MODEL_DPL94, 
MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_R1RHO_2SITE, 
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
@@ -202,7 +206,7 @@
 MODEL_LIST_MMQ = [MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_3SITE_LINEAR]
 """The list of all dispersion models specifically for MMQ CPMG-type 
experiments."""
 
-MODEL_LIST_ANALYTIC = [MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_M61, MODEL_M61B, 
MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MMQ_CR72, MODEL_MP05]
+MODEL_LIST_ANALYTIC = [MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, 
MODEL_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MMQ_CR72, 
MODEL_MP05]
 """The list of all analytic models."""
 
 MODEL_LIST_NUMERIC = [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_3SITE_LINEAR]
@@ -222,6 +226,7 @@
     MODEL_IT99: MODEL_DESC_IT99,
     MODEL_TSMFK01: MODEL_DESC_TSMFK01,
     MODEL_B14: MODEL_DESC_B14,
+    MODEL_B14_FULL: MODEL_DESC_B14_FULL,
     MODEL_M61: MODEL_DESC_M61,
     MODEL_M61B: MODEL_DESC_M61B,
     MODEL_DPL94: MODEL_DESC_DPL94,
@@ -253,6 +258,7 @@
     MODEL_IT99: MODEL_PARAMS_IT99,
     MODEL_TSMFK01: MODEL_PARAMS_TSMFK01,
     MODEL_B14: MODEL_PARAMS_B14,
+    MODEL_B14_FULL: MODEL_PARAMS_B14_FULL,
     MODEL_M61: MODEL_PARAMS_M61,
     MODEL_M61B: MODEL_PARAMS_M61B,
     MODEL_DPL94: MODEL_PARAMS_DPL94,