Author: bugman
Date: Tue Aug 19 10:33:54 2014
New Revision: 25065
URL: http://svn.gna.org/viewcvs/relax?rev=25065&view=rev
Log:
Small verb tense fix for the descriptions of the '* R1 fit' relaxation
dispersion models.
Modified:
trunk/gui/analyses/auto_relax_disp.py
trunk/user_functions/relax_disp.py
Modified: trunk/gui/analyses/auto_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_relax_disp.py?rev=25065&r1=25064&r2=25065&view=diff
==============================================================================
--- trunk/gui/analyses/auto_relax_disp.py (original)
+++ trunk/gui/analyses/auto_relax_disp.py Tue Aug 19 10:33:54 2014
@@ -798,7 +798,7 @@
None,
"The model for no chemical exchange relaxation.",
"The model for no chemical exchange being present, for off-resonance
R1rho-type experiments. R1rho = R1 * cos(theta)^2 + r1rho_prime *
sin(theta)^2.",
- "The model for no chemical exchange being present, for off-resonance
R1rho-type experiments whereby R1 is fitted. R1rho = R1 * cos(theta)^2 +
r1rho_prime * sin(theta)^2.",
+ "The model for no chemical exchange being present, for off-resonance
R1rho-type experiments whereby R1 is fit. R1rho = R1 * cos(theta)^2 +
r1rho_prime * sin(theta)^2.",
None,
"The original Luz and Meiboom (1963) 2-site fast exchange equation.",
"The original Luz and Meiboom (1963) 3-site fast exchange equation.",
@@ -817,15 +817,15 @@
"The Meiboom (1961) 2-site fast exchange equation.",
"The Meiboom (1961) 2-site equation for all time scales with pA >>
pB.",
"The Davis, Perlman and London (1994) 2-site fast exchange
equation.",
- "The Davis, Perlman and London (1994) 2-site fast exchange equation,
whereby R1 is fitted.",
+ "The Davis, Perlman and London (1994) 2-site fast exchange equation,
whereby R1 is fit.",
"The Trott and Palmer (2002) 2-site equation for all time scales.",
- "The Trott and Palmer (2002) 2-site equation for all time scales,
whereby R1 is fitted.",
+ "The Trott and Palmer (2002) 2-site equation for all time scales,
whereby R1 is fit.",
"The Trott, Abergel and Palmer (2003) off-resonance 2-site equation
for all time scales.",
- "The Trott, Abergel and Palmer (2003) off-resonance 2-site equation
for all time scales, whereby R1 is fitted.",
+ "The Trott, Abergel and Palmer (2003) off-resonance 2-site equation
for all time scales, whereby R1 is fit.",
"The Miloushev and Palmer (2005) off-resonance 2-site equation for
all time scales.",
- "The Miloushev and Palmer (2005) off-resonance 2-site equation for
all time scales, whereby R1 is fitted.",
+ "The Miloushev and Palmer (2005) off-resonance 2-site equation for
all time scales, whereby R1 is fit.",
"The 2-site numerical solution using 3D magnetisation vectors.",
- "The 2-site numerical solution using 3D magnetisation vectors,
whereby R1 is fitted.",
+ "The 2-site numerical solution using 3D magnetisation vectors,
whereby R1 is fit.",
"The 3-site linearised numerical solution using 3D magnetisation
vectors.",
"The 3-site numerical solution using 3D magnetisation vectors.",
None,
Modified: trunk/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_disp.py?rev=25065&r1=25064&r2=25065&view=diff
==============================================================================
--- trunk/user_functions/relax_disp.py (original)
+++ trunk/user_functions/relax_disp.py Tue Aug 19 10:33:54 2014
@@ -942,7 +942,7 @@
uf.desc.append(Desc_container('The no chemical exchange models'))
uf.desc[-1].add_item_list_element("'%s'" % MODEL_NOREX, "This is the model
for no chemical exchange being present.")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_NOREX_R1RHO, "This is the
model for no chemical exchange being present, for off-resonance R1rho-type
experiments. R1rho = R1 * cos(theta)^2 + r1rho_prime * sin(theta)^2")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_NOREX_R1RHO_FIT_R1, "This
is the model for no chemical exchange being present, for off-resonance
R1rho-type experiments whereby R1 is fitted. R1rho = R1 * cos(theta)^2 +
r1rho_prime * sin(theta)^2")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_NOREX_R1RHO_FIT_R1, "This
is the model for no chemical exchange being present, for off-resonance
R1rho-type experiments whereby R1 is fit. R1rho = R1 * cos(theta)^2 +
r1rho_prime * sin(theta)^2")
# CPMG-type data.
uf.desc.append(Desc_container('The SQ CPMG-type experiments'))
uf.desc[-1].add_paragraph("The currently supported analytic models are:")
@@ -975,16 +975,16 @@
uf.desc[-1].add_item_list_element("'%s'" % MODEL_M61B, "The Meiboom (1961)
2-site equation for all time scales with pA >> pB and with parameters
{R1rho', ..., pA, dw, kex},")
uf.desc[-1].add_paragraph("Off-resonance models are:")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_DPL94, "The Davis, Perlman
and London (1994) 2-site fast exchange equation with parameters {R1rho', ...,
phi_ex, kex},")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_DPL94_FIT_R1, "The Davis,
Perlman and London (1994) 2-site fast exchange equation, whereby R1 is
fitted, with parameters {R1rho', R1, ..., phi_ex, kex},")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_DPL94_FIT_R1, "The Davis,
Perlman and London (1994) 2-site fast exchange equation, whereby R1 is fit,
with parameters {R1rho', R1, ..., phi_ex, kex},")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_TP02, "The Trott and Palmer
(2002) 2-site equation for all time scales with parameters {R1rho', ..., pA,
dw, kex}.")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_TP02_FIT_R1, "The Trott and
Palmer (2002) 2-site equation for all time scales, whereby R1 is fitted, with
parameters {R1rho', R1, ..., pA, dw, kex}.")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_TP02_FIT_R1, "The Trott and
Palmer (2002) 2-site equation for all time scales, whereby R1 is fit, with
parameters {R1rho', R1, ..., pA, dw, kex}.")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_TAP03, "The Trott, Abergel
and Palmer (2003) off-resonance 2-site equation for all time scales with
parameters {R1rho', ..., pA, dw, kex}.")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_TAP03_FIT_R1, "The Trott,
Abergel and Palmer (2003) off-resonance 2-site equation for all time scales,
whereby R1 is fitted, with parameters {R1rho', R1, ..., pA, dw, kex}.")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_TAP03_FIT_R1, "The Trott,
Abergel and Palmer (2003) off-resonance 2-site equation for all time scales,
whereby R1 is fit, with parameters {R1rho', R1, ..., pA, dw, kex}.")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_MP05, "The Miloushev and
Palmer (2005) 2-site off-resonance equation for all time scales with
parameters {R1rho', ..., pA, dw, kex}.")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_MP05_FIT_R1, "The Miloushev
and Palmer (2005) 2-site off-resonance equation for all time scales, whereby
R1 is fitted, with parameters {R1rho', R1, ..., pA, dw, kex}.")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_MP05_FIT_R1, "The Miloushev
and Palmer (2005) 2-site off-resonance equation for all time scales, whereby
R1 is fit, with parameters {R1rho', R1, ..., pA, dw, kex}.")
uf.desc[-1].add_paragraph("The currently supported numeric models are:")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_R1RHO_2SITE, "The
numerical solution for the 2-site Bloch-McConnell equations using 3D
magnetisation vectors whereby the simplification R20A = R20B. Its parameters
are {R1rho', ..., pA, dw, kex}.")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_R1RHO_2SITE_FIT_R1, "The
numerical solution for the 2-site Bloch-McConnell equations using 3D
magnetisation vectors whereby the simplification R20A = R20B and whereby R1
is fitted. Its parameters are {R1rho', R1, ..., pA, dw, kex}.")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_R1RHO_2SITE_FIT_R1, "The
numerical solution for the 2-site Bloch-McConnell equations using 3D
magnetisation vectors whereby the simplification R20A = R20B and whereby R1
is fit. Its parameters are {R1rho', R1, ..., pA, dw, kex}.")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_R1RHO_3SITE_LINEAR, "The
numerical solution for the 3-site Bloch-McConnell equations using 3D
magnetisation vectors whereby the simplification R20A = R20B = R20C is
assumed and linearised with kAC = kCA = 0. Its parameters are {R1rho', ...,
pA, dw(AB), kex(AB), pB, dw(BC), kex(BC)}.")
uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_R1RHO_3SITE, "The
numerical solution for the 3-site Bloch-McConnell equations using 3D
magnetisation vectors. Its parameters are {R1rho', ..., pA, dw(AB), kex(AB),
pB, dw(BC), kex(BC), kex(AC)}.")
# Prompt examples.
r25065 - in /trunk: gui/analyses/auto_relax_disp.py user_functions/relax_disp.py