r24919 - /branches/R1_fitting/specific_analyses/relax_disp/variables.py -- August 04, 2014 - 16:27

Author: tlinnet
Date: Mon Aug  4 16:27:23 2014
New Revision: 24919

URL: http://svn.gna.org/viewcvs/relax?rev=24919&view=rev
Log:
Added the model "MODEL_DPL94_FIT_R1", to the full list of models.

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/specific_analyses/relax_disp/variables.py

Modified: branches/R1_fitting/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/variables.py?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- branches/R1_fitting/specific_analyses/relax_disp/variables.py       
(original)
+++ branches/R1_fitting/specific_analyses/relax_disp/variables.py       Mon 
Aug  4 16:27:23 2014
@@ -109,6 +109,11 @@
 MODEL_DESC_DPL94 = "The Davis, Perlman and London (1994) extension of the 
Meiboom (1961) model for off-resonance data."
 MODEL_PARAMS_DPL94 = ['r2', 'phi_ex', 'kex']
 
+MODEL_DPL94_FIT_R1 = "%s_fit_r1"%MODEL_DPL94
+"""The R1rho 2-site fast exchange model of Davis, Perlman and London (1994), 
where R1 is fitted."""
+MODEL_DESC_DPL94_FIT_R1 = "The Davis, Perlman and London (1994) extension of 
the Meiboom (1961) model for off-resonance data, where R1 is fitted."
+MODEL_PARAMS_DPL94_FIT_R1 = ['r1_fit', 'r2', 'phi_ex', 'kex']
+
 MODEL_TP02 = 'TP02'
 MODEL_DESC_TP02 = "The Trott and Palmer (2002) off-resonance 2-site model 
for R1rho-type experiments."
 MODEL_PARAMS_TP02 = ['r2', 'pA', 'dw', 'kex']
@@ -182,7 +187,7 @@
 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_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]
+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_DPL94_FIT_R1, 
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_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]
@@ -233,6 +238,7 @@
     MODEL_M61: MODEL_DESC_M61,
     MODEL_M61B: MODEL_DESC_M61B,
     MODEL_DPL94: MODEL_DESC_DPL94,
+    MODEL_DPL94_FIT_R1: MODEL_DESC_DPL94_FIT_R1,
     MODEL_TP02: MODEL_DESC_TP02,
     MODEL_TAP03: MODEL_DESC_TAP03,
     MODEL_MP05: MODEL_DESC_MP05,
@@ -265,6 +271,7 @@
     MODEL_M61: MODEL_PARAMS_M61,
     MODEL_M61B: MODEL_PARAMS_M61B,
     MODEL_DPL94: MODEL_PARAMS_DPL94,
+    MODEL_DPL94_FIT_R1: MODEL_PARAMS_DPL94_FIT_R1,
     MODEL_TP02: MODEL_PARAMS_TP02,
     MODEL_TAP03: MODEL_PARAMS_TAP03,
     MODEL_MP05: MODEL_PARAMS_MP05,