Hi Troels,
I know this is a little strange, but I have used the ordering of the
CPMG-type followed by R1rho-type model followed by the ordering by
date for the dispersion models. The B14 model
(http://wiki.nmr-relax.com/B14) might therefore fit better between the
'TSMFK01' CPMG model (http://wiki.nmr-relax.com/TSMFK01) and the 'M61'
R1rho model (http://wiki.nmr-relax.com/M61), as B14 is the absolutely
latest CPMG analytic model. In the future when someone decides to
clean up the code, then maybe all models - analytic and numeric, CPMG
and R1rho - will be alphabetically ordered. Or maybe not - this
ordering follows that of the manual.
Cheers,
Edward
On 1 May 2014 09:16, <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Thu May 1 09:16:11 2014
New Revision: 22898
URL: http://svn.gna.org/viewcvs/relax?rev=22898&view=rev
Log:
Added MODEL_B14 to specific_analyses.relax_disp.variables.
sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014)
B14 model - 2-site exact solution model for all time scales.
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=22898&r1=22897&r2=22898&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Thu May 1 09:16:11
2014
@@ -2,6 +2,7 @@
#
#
# Copyright (C) 2004-2013 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
+# Copyright (C) 2014 Troels E. Linnet
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -70,6 +71,10 @@
MODEL_LM63_3SITE = 'LM63 3-site'
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_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."
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
Re: r22898 - /trunk/specific_analyses/relax_disp/variables.py