Author: tlinnet
Date: Mon Aug 18 13:50:26 2014
New Revision: 25046
URL: http://svn.gna.org/viewcvs/relax?rev=25046&view=rev
Log:
Fix for correct English, replacing "where" with "whereby".
Modified:
trunk/gui/analyses/auto_relax_disp.py
trunk/specific_analyses/relax_disp/variables.py
trunk/target_functions/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=25046&r1=25045&r2=25046&view=diff
==============================================================================
--- trunk/gui/analyses/auto_relax_disp.py (original)
+++ trunk/gui/analyses/auto_relax_disp.py Mon Aug 18 13:50:26 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 where 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 fitted. 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,
where R1 is fitted.",
+ "The Davis, Perlman and London (1994) 2-site fast exchange equation,
whereby R1 is fitted.",
"The Trott and Palmer (2002) 2-site equation for all time scales.",
- "The Trott and Palmer (2002) 2-site equation for all time scales,
where R1 is fitted.",
+ "The Trott and Palmer (2002) 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.",
- "The Trott, Abergel and Palmer (2003) off-resonance 2-site equation
for all time scales, where R1 is fitted.",
+ "The Trott, Abergel and Palmer (2003) 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.",
- "The Miloushev and Palmer (2005) off-resonance 2-site equation for
all time scales, where R1 is fitted.",
+ "The Miloushev and Palmer (2005) off-resonance 2-site equation for
all time scales, whereby R1 is fitted.",
"The 2-site numerical solution using 3D magnetisation vectors.",
- "The 2-site numerical solution using 3D magnetisation vectors, where
R1 is fitted.",
+ "The 2-site numerical solution using 3D magnetisation vectors,
whereby R1 is fitted.",
"The 3-site linearised numerical solution using 3D magnetisation
vectors.",
"The 3-site numerical solution using 3D magnetisation vectors.",
None,
Modified: trunk/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25046&r1=25045&r2=25046&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Mon Aug 18 13:50:26
2014
@@ -100,7 +100,7 @@
MODEL_EQ_NOREX_R1RHO = EQ_ANALYTIC
MODEL_NOREX_R1RHO_FIT_R1 = "No Rex R1rho off res R1 fit"
-MODEL_DESC_NOREX_R1RHO_FIT_R1 = "The model for no chemical exchange
relaxation, for R1rho off resonance models, where R1 is fitted."
+MODEL_DESC_NOREX_R1RHO_FIT_R1 = "The model for no chemical exchange
relaxation, for R1rho off resonance models, whereby R1 is fitted."
MODEL_PARAMS_NOREX_R1RHO_FIT_R1 = ['r1', 'r2']
# This year is fake. Just to get the order correct.
MODEL_YEAR_NOREX_R1RHO_FIT_R1 = 1953
@@ -198,8 +198,8 @@
MODEL_EQ_DPL94 = EQ_ANALYTIC
MODEL_DPL94_FIT_R1 = "DPL94 R1 fit"
-"""The R1rho 2-site fast exchange model of Davis, Perlman and London (1994),
where R1 is fitted."""
-MODEL_DESC_DPL94_FIT_R1 = "The Davis, Perlman and London (1994) extension of
the Meiboom (1961) model for off-resonance data, where R1 is fitted."
+"""The R1rho 2-site fast exchange model of Davis, Perlman and London (1994),
whereby R1 is fitted."""
+MODEL_DESC_DPL94_FIT_R1 = "The Davis, Perlman and London (1994) extension of
the Meiboom (1961) model for off-resonance data, whereby R1 is fitted."
MODEL_PARAMS_DPL94_FIT_R1 = ['r1', 'r2', 'phi_ex', 'kex']
MODEL_YEAR_DPL94_FIT_R1 = 1994
MODEL_EXP_TYPE_DPL94_FIT_R1 = EXP_TYPE_R1RHO
@@ -215,7 +215,7 @@
MODEL_EQ_TP02 = EQ_ANALYTIC
MODEL_TP02_FIT_R1 = "TP02 R1 fit"
-MODEL_DESC_TP02_FIT_R1 = "The Trott and Palmer (2002) off-resonance 2-site
model for R1rho-type experiments, where R1 is fitted."
+MODEL_DESC_TP02_FIT_R1 = "The Trott and Palmer (2002) off-resonance 2-site
model for R1rho-type experiments, whereby R1 is fitted."
MODEL_PARAMS_TP02_FIT_R1 = ['r1', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_TP02_FIT_R1 = 2002
MODEL_EXP_TYPE_TP02_FIT_R1 = EXP_TYPE_R1RHO
@@ -231,7 +231,7 @@
MODEL_EQ_TAP03 = EQ_ANALYTIC
MODEL_TAP03_FIT_R1 = "TAP03 R1 fit"
-MODEL_DESC_TAP03_FIT_R1 = "The Trott, Abergel and Palmer (2003)
off-resonance 2-site model for R1rho-type experiments, where R1 is fitted."
+MODEL_DESC_TAP03_FIT_R1 = "The Trott, Abergel and Palmer (2003)
off-resonance 2-site model for R1rho-type experiments, whereby R1 is fitted."
MODEL_PARAMS_TAP03_FIT_R1 = ['r1', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_TAP03_FIT_R1 = 2003
MODEL_EXP_TYPE_TAP03_FIT_R1 = EXP_TYPE_R1RHO
@@ -249,7 +249,7 @@
MODEL_MP05_FIT_R1 = "MP05 R1 fit"
"""The R1rho 2-site off-resonance exchange model of Miloushev and Palmer
(2005)."""
-MODEL_DESC_MP05_FIT_R1 = "The Miloushev and Palmer (2005) off-resonance
2-site model for R1rho-type experiments, where R1 is fitted."
+MODEL_DESC_MP05_FIT_R1 = "The Miloushev and Palmer (2005) off-resonance
2-site model for R1rho-type experiments, whereby R1 is fitted."
MODEL_PARAMS_MP05_FIT_R1 = ['r1', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_MP05_FIT_R1 = 2005
MODEL_EXP_TYPE_MP05_FIT_R1 = EXP_TYPE_R1RHO
@@ -307,7 +307,7 @@
MODEL_EQ_NS_R1RHO_2SITE = EQ_NUMERIC
MODEL_NS_R1RHO_2SITE_FIT_R1 = "NS R1rho 2-site R1 fit"
-MODEL_DESC_NS_R1RHO_2SITE_FIT_R1 = "The reduced numerical solution for the
2-site Bloch-McConnell equations using 3D magnetisation vectors for
R1rho-type experiments, whereby the simplification R20A = R20B is assumed,
and where R1 is fitted."
+MODEL_DESC_NS_R1RHO_2SITE_FIT_R1 = "The reduced numerical solution for the
2-site Bloch-McConnell equations using 3D magnetisation vectors for
R1rho-type experiments, whereby the simplification R20A = R20B is assumed,
and whereby R1 is fitted."
MODEL_PARAMS_NS_R1RHO_2SITE_FIT_R1 = ['r1', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_NS_R1RHO_2SITE_FIT_R1 = 2005
MODEL_EXP_TYPE_NS_R1RHO_2SITE_FIT_R1 = EXP_TYPE_R1RHO
@@ -422,20 +422,20 @@
MODEL_LIST_R1RHO_ON_RES = [MODEL_M61, MODEL_M61B]
"""The list of all dispersion models specifically for R1rho-type
on-resonance experiments (excluding the R2eff model and model 'No Rex')."""
-#### Off-resonance R1rho models, where R1 has been measured.
+#### Off-resonance R1rho models, whereby R1 has been measured.
MODEL_LIST_ANALYTIC_R1RHO_W_R1 = [MODEL_DPL94, MODEL_TP02, MODEL_TAP03,
MODEL_MP05]
"""The list of all dispersion models specifically for analytical R1rho-type
experiments which use R1 in their equations (excluding the R2eff model and
model 'No Rex')."""
-#### Off-resonance R1rho models, where R1 will be fitted.
+#### Off-resonance R1rho models, whereby R1 will be fitted.
MODEL_LIST_ANALYTIC_R1RHO_FIT_R1 = [MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1,
MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
"""The list of all dispersion models specifically for R1rho-type experiments
which fit R1 in their equations (excluding the R2eff model and model 'No
Rex')."""
### The numerical models.
-#### Off-resonance R1rho models, where R1 has been measured.
+#### Off-resonance R1rho models, whereby R1 has been measured.
MODEL_LIST_NUMERIC_R1RHO_W_R1 = [MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE,
MODEL_NS_R1RHO_3SITE_LINEAR]
"""The list of all dispersion models specifically for numeric R1rho-type
experiments which use R1 in their equations (excluding the R2eff model and
model 'No Rex')."""
-#### Off-resonance R1rho models, where R1 will be fitted.
+#### Off-resonance R1rho models, whereby R1 will be fitted.
MODEL_LIST_NUMERIC_R1RHO_FIT_R1 = [MODEL_NS_R1RHO_2SITE_FIT_R1]
"""The list of all dispersion models specifically for numeric R1rho-type
experiments which fit R1 in their equations (excluding the R2eff model and
model 'No Rex')."""
Modified: trunk/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=25046&r1=25045&r2=25046&view=diff
==============================================================================
--- trunk/target_functions/relax_disp.py (original)
+++ trunk/target_functions/relax_disp.py Mon Aug 18 13:50:26 2014
@@ -1227,7 +1227,7 @@
def func_DPL94_fit_r1(self, params):
- """Target function for the Davis, Perlman and London (1994) fast
2-site off-resonance exchange model for R1rho-type experiments, where R1 is
fitted.
+ """Target function for the Davis, Perlman and London (1994) fast
2-site off-resonance exchange model for R1rho-type experiments, whereby R1 is
fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
@@ -1476,7 +1476,7 @@
def func_MP05_fit_r1(self, params):
- """Target function for the Miloushev and Palmer (2005) R1rho
off-resonance 2-site model, where R1 is fitted.
+ """Target function for the Miloushev and Palmer (2005) R1rho
off-resonance 2-site model, whereby R1 is fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
@@ -1619,7 +1619,7 @@
def func_NOREX_R1RHO_FIT_R1(self, params):
- """Target function for no exchange, for R1rho off resonance models,
where R1 is fitted.
+ """Target function for no exchange, for R1rho off resonance models,
whereby R1 is fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
@@ -1926,7 +1926,7 @@
def func_ns_r1rho_2site_fit_r1(self, params):
- """Target function for the reduced numerical solution for the 2-site
Bloch-McConnell equations for R1rho data, where R1 is fitted.
+ """Target function for the reduced numerical solution for the 2-site
Bloch-McConnell equations for R1rho data, whereby R1 is fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
@@ -2029,7 +2029,7 @@
def func_TAP03_fit_r1(self, params):
- """Target function for the Trott, Abergel and Palmer (2003) R1rho
off-resonance 2-site model, where R1 is fitted.
+ """Target function for the Trott, Abergel and Palmer (2003) R1rho
off-resonance 2-site model, whereby R1 is fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
@@ -2079,7 +2079,7 @@
def func_TP02_fit_r1(self, params):
- """Target function for the Trott and Palmer (2002) R1rho
off-resonance 2-site model, where R1 is fitted.
+ """Target function for the Trott and Palmer (2002) R1rho
off-resonance 2-site model, whereby R1 is fitted.
@param params: The vector of parameter values.
@type params: numpy rank-1 float array
Modified: trunk/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_disp.py?rev=25046&r1=25045&r2=25046&view=diff
==============================================================================
--- trunk/user_functions/relax_disp.py (original)
+++ trunk/user_functions/relax_disp.py Mon Aug 18 13:50:26 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 where 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 fitted. 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, where 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
fitted, 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, where 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 fitted, 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,
where 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 fitted, 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, where 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 fitted, 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 where 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 fitted. 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.
r25046 - in /trunk: gui/analyses/ specific_analyses/relax_disp/ target_functions/ user_functions/