r22914 - /trunk/specific_analyses/relax_disp/variables.py -- May 02, 2014 - 11:56

Author: tlinnet
Date: Fri May  2 11:56:59 2014
New Revision: 22914

URL: http://svn.gna.org/viewcvs/relax?rev=22914&view=rev
Log:
Re-ordered the B14 model according to release year.

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";

The B14 model is explained in: http://wiki.nmr-relax.com/B14.

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=22914&r1=22913&r2=22914&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py     (original)
+++ trunk/specific_analyses/relax_disp/variables.py     Fri May  2 11:56:59 
2014
@@ -72,25 +72,25 @@
 MODEL_DESC_LM63_3SITE = "The Luz and Meiboom (1963) 3-site fast exchange 
model for SQ-CPMG experiments."
 MODEL_PARAMS_LM63_3SITE = ['r2', 'phi_ex_B', 'phi_ex_C', 'kB', 'kC']
 
+MODEL_CR72 = 'CR72'
+MODEL_DESC_CR72 = "The reduced Carver and Richards (1972) 2-site model for 
all time scales for SQ-CPMG experiments, whereby the simplification R20A = 
R20B is assumed."
+MODEL_PARAMS_CR72 = ['r2', 'pA', 'dw', 'kex']
+
+MODEL_CR72_FULL = 'CR72 full'
+MODEL_DESC_CR72_FULL = "The full Carver and Richards (1972) 2-site model for 
all time scales for SQ-CPMG experiments."
+MODEL_PARAMS_CR72_FULL = ['r2a', 'r2b', 'pA', 'dw', 'kex']
+
+MODEL_IT99 = 'IT99'
+MODEL_DESC_IT99 = "The Ishima and Torchia (1999) 2-site CPMG model for all 
time scales for SQ-CPMG experiments, with skewed populations (pA >> pB)."
+MODEL_PARAMS_IT99 = ['r2', 'pA', 'dw', 'tex']
+
+MODEL_TSMFK01 = 'TSMFK01'
+MODEL_DESC_TSMFK01 = "The Tollinger et al. (2001) 2-site very-slow exchange 
model for SQ-CPMG experiments."
+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_CR72 = 'CR72'
-MODEL_DESC_CR72 = "The reduced Carver and Richards (1972) 2-site model for 
all time scales for SQ-CPMG experiments, whereby the simplification R20A = 
R20B is assumed."
-MODEL_PARAMS_CR72 = ['r2', 'pA', 'dw', 'kex']
-
-MODEL_CR72_FULL = 'CR72 full'
-MODEL_DESC_CR72_FULL = "The full Carver and Richards (1972) 2-site model for 
all time scales for SQ-CPMG experiments."
-MODEL_PARAMS_CR72_FULL = ['r2a', 'r2b', 'pA', 'dw', 'kex']
-
-MODEL_IT99 = 'IT99'
-MODEL_DESC_IT99 = "The Ishima and Torchia (1999) 2-site CPMG model for all 
time scales for SQ-CPMG experiments, with skewed populations (pA >> pB)."
-MODEL_PARAMS_IT99 = ['r2', 'pA', 'dw', 'tex']
-
-MODEL_TSMFK01 = 'TSMFK01'
-MODEL_DESC_TSMFK01 = "The Tollinger et al. (2001) 2-site very-slow exchange 
model for SQ-CPMG experiments."
-MODEL_PARAMS_TSMFK01 = ['r2a', 'dw', 'k_AB']
 
 MODEL_M61 = 'M61'
 MODEL_DESC_M61 = "The Meiboom (1961) on-resonance 2-site fast exchange model 
for R1rho-type experiments."