r20317 - /branches/relax_disp/specific_analyses/relax_disp/variables.py -- July 16, 2013 - 09:53

Author: bugman
Date: Tue Jul 16 09:53:05 2013
New Revision: 20317

URL: http://svn.gna.org/viewcvs/relax?rev=20317&view=rev
Log:
Added the 'CR72 red' model to the specific_analyses.relax_disp.variables 
module.

This is the Carver and Richards 1972 analytic model with the simplification 
R20A = R20B.  The
current 'CR72' makes the same assumption, but that model will be expanded to 
support R20A and R20B
later.

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=20317&r1=20316&r2=20317&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/variables.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/variables.py Tue Jul 16 
09:53:05 2013
@@ -47,6 +47,9 @@
 MODEL_LM63 = 'LM63'
 """The CPMG 2-site fast exchange model of Luz and Meiboom (1963)."""
 
+MODEL_CR72_RED = 'CR72 red'
+"""The CPMG 2-site model for all time scales of Carver and Richards (1972), 
whereby the simplification R20A = R20B is assumed."""
+
 MODEL_CR72 = 'CR72'
 """The CPMG 2-site model for all time scales of Carver and Richards 
(1972)."""
 
@@ -72,16 +75,16 @@
 
 
 # The model lists.
-MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_CR72, MODEL_IT99, 
MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR]
+MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR]
 """The list of all dispersion models (excluding the R2eff model)."""
 
-MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_CR72, 
MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR]
+MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, 
MODEL_CR72, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, 
MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
 """The list of the R2eff model together with all dispersion models."""
 
-MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_CR72, MODEL_IT99, 
MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
+MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
 """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_IT99, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
+MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
MODEL_CR72_RED, MODEL_CR72, MODEL_IT99, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR]
 """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]