Author: bugman
Date: Fri Jul 19 11:03:46 2013
New Revision: 20407
URL: http://svn.gna.org/viewcvs/relax?rev=20407&view=rev
Log:
Added the 'LM63 3-site' model to the specific_analyses.relax_disp.variables
module.
This is the Luz and Meiboom 1963 analytic model for three exchanging sites.
This commit follows step 1 of the relaxation dispersion model addition
tutorial
(http://thread.gmane.org/gmane.science.nmr.relax.devel/3907).
Modified:
branches/relax_disp/specific_analyses/relax_disp/variables.py
Modified: branches/relax_disp/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/variables.py?rev=20407&r1=20406&r2=20407&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/variables.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/variables.py Fri Jul 19
11:03:46 2013
@@ -47,6 +47,9 @@
MODEL_LM63 = 'LM63'
"""The CPMG 2-site fast exchange model of Luz and Meiboom (1963)."""
+MODEL_LM63_3SITE = 'LM63 3-site'
+"""The CPMG 3-site fast exchange model of Luz and Meiboom (1963)."""
+
MODEL_CR72 = 'CR72'
"""The CPMG 2-site model for all time scales of Carver and Richards (1972),
whereby the simplification R20A = R20B is assumed."""
@@ -84,16 +87,16 @@
# The model lists.
-MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_CR72, MODEL_CR72_FULL,
MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_3D,
MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL,
MODEL_NS_2SITE_EXPANDED]
+MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B,
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR,
MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED]
"""The list of all dispersion models (excluding the R2eff model)."""
-MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B,
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR,
MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED]
+MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE,
MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B,
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR,
MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED]
"""The list of the R2eff model together with all dispersion models."""
-MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_CR72, MODEL_CR72_FULL,
MODEL_IT99, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR,
MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED]
+MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL,
MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_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_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL,
MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED]
+MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63,
MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_NS_2SITE_3D,
MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL,
MODEL_NS_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_DPL94, MODEL_M61B]
r20407 - /branches/relax_disp/specific_analyses/relax_disp/variables.py