Author: tlinnet
Date: Mon Aug 18 13:09:42 2014
New Revision: 25044
URL: http://svn.gna.org/viewcvs/relax?rev=25044&view=rev
Log:
Renamed R1rho off resonance models where R1 is fitted.
This removes the "underscore".
This is a better representation presented to the user, for example in the GUI
model
selection list or the relax_disp.select_model user function in all UI.
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=25044&r1=25043&r2=25044&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Mon Aug 18 13:09:42
2014
@@ -90,7 +90,7 @@
MODEL_SITES_NOREX = 1
MODEL_EQ_NOREX = EQ_ANALYTIC
-MODEL_NOREX_R1RHO = "No_Rex_R1rho_off_res"
+MODEL_NOREX_R1RHO = "No Rex R1rho off res"
MODEL_DESC_NOREX_R1RHO = "The model for no chemical exchange relaxation, for
R1rho off resonance models."
MODEL_PARAMS_NOREX_R1RHO = ['r2']
# This year is fake. Just to get the order correct.
@@ -99,7 +99,7 @@
MODEL_SITES_NOREX_R1RHO = 1
MODEL_EQ_NOREX_R1RHO = EQ_ANALYTIC
-MODEL_NOREX_R1RHO_FIT_R1 = "%s_fit_r1"%MODEL_NOREX_R1RHO
+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_PARAMS_NOREX_R1RHO_FIT_R1 = ['r1_fit', 'r2']
# This year is fake. Just to get the order correct.
@@ -197,7 +197,7 @@
MODEL_SITES_DPL94 = 2
MODEL_EQ_DPL94 = EQ_ANALYTIC
-MODEL_DPL94_FIT_R1 = "%s_fit_r1"%MODEL_DPL94
+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."
MODEL_PARAMS_DPL94_FIT_R1 = ['r1_fit', 'r2', 'phi_ex', 'kex']
@@ -214,7 +214,7 @@
MODEL_SITES_TP02 = 2
MODEL_EQ_TP02 = EQ_ANALYTIC
-MODEL_TP02_FIT_R1 = "%s_fit_r1"%MODEL_TP02
+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_PARAMS_TP02_FIT_R1 = ['r1_fit', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_TP02_FIT_R1 = 2002
@@ -230,7 +230,7 @@
MODEL_SITES_TAP03 = 2
MODEL_EQ_TAP03 = EQ_ANALYTIC
-MODEL_TAP03_FIT_R1 = "%s_fit_r1"%MODEL_TAP03
+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_PARAMS_TAP03_FIT_R1 = ['r1_fit', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_TAP03_FIT_R1 = 2003
@@ -247,7 +247,7 @@
MODEL_SITES_MP05 = 2
MODEL_EQ_MP05 = EQ_ANALYTIC
-MODEL_MP05_FIT_R1 = "%s_fit_r1"%MODEL_MP05
+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_PARAMS_MP05_FIT_R1 = ['r1_fit', 'r2', 'pA', 'dw', 'kex']
@@ -306,7 +306,7 @@
MODEL_SITES_NS_R1RHO_2SITE = 2
MODEL_EQ_NS_R1RHO_2SITE = EQ_NUMERIC
-MODEL_NS_R1RHO_2SITE_FIT_R1 = "%s_fit_r1"%MODEL_NS_R1RHO_2SITE
+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_PARAMS_NS_R1RHO_2SITE_FIT_R1 = ['r1_fit', 'r2', 'pA', 'dw', 'kex']
MODEL_YEAR_NS_R1RHO_2SITE_FIT_R1 = 2005
r25044 - /trunk/specific_analyses/relax_disp/variables.py