Author: bugman
Date: Sat Nov 29 13:43:44 2014
New Revision: 26836
URL: http://svn.gna.org/viewcvs/relax?rev=26836&view=rev
Log:
Expansion and improvements for the relax_fit.select_model user function
documentation and printouts.
Modified:
trunk/specific_analyses/relax_fit/uf.py
trunk/user_functions/relax_fit.py
Modified: trunk/specific_analyses/relax_fit/uf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/uf.py?rev=26836&r1=26835&r2=26836&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit/uf.py (original)
+++ trunk/specific_analyses/relax_fit/uf.py Sat Nov 29 13:43:44 2014
@@ -105,12 +105,12 @@
# Three parameter inversion recovery fit.
elif model == 'inv':
- print("Three parameter inversion recovery fit.")
+ print("The inversion recovery experiment.")
params = ['rx', 'i0', 'iinf']
# The saturation recovery.
elif model == 'sat':
- print("Saturation recovery.")
+ print("The saturation recovery experiment.")
params = ['rx', 'iinf']
# Invalid model.
Modified: trunk/user_functions/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_fit.py?rev=26836&r1=26835&r2=26836&view=diff
==============================================================================
--- trunk/user_functions/relax_fit.py (original)
+++ trunk/user_functions/relax_fit.py Sat Nov 29 13:43:44 2014
@@ -83,9 +83,9 @@
desc = "The type of relaxation curve to fit.",
wiz_element_type = "combo",
wiz_combo_choices = [
- "exp: [Rx, I0]",
- "inv: [Rx, I0, Iinf]",
- "Saturation recovery, [Rx, Iinf]"
+ "Two parameter exponential fit: [Rx, I0]",
+ "Inversion recovery: [Rx, I0, Iinf]",
+ "Saturation recovery: [Rx, Iinf]"
],
wiz_combo_data = [
"exp",
@@ -96,14 +96,13 @@
)
# Description.
uf.desc.append(Desc_container())
-uf.desc[-1].add_paragraph("The supported relaxation experiments include the
default two parameter exponential fit, selected by setting the model type to
'exp', the three parameter inversion recovery experiment in which the peak
intensity limit is a non-zero value, selected by setting the model to 'inv',
and the saturation recovery R1 experiment.")
-uf.desc[-1].add_paragraph("The two models are:")
-uf.desc[-1].add_item_list_element("'exp'", "The parameters are [Rx, I0], and
the equation is I(t) = I0*exp(-Rx*t).")
-uf.desc[-1].add_item_list_element("'inv'", "The parameters are [Rx, I0,
Iinf]. This has not been implemented yet.")
-uf.desc[-1].add_item_list_element("'sat'", "The saturation recovery
experiment. The parameters are [Rx, Iinf] and the equation is I(t) =
Iinf*(1-exp(-Rx*t)).")
+uf.desc[-1].add_paragraph("A number of relaxation experiments are supported
and include:")
+uf.desc[-1].add_paragraph("The 'exp' model. This is the default two
parameter exponential fit. The magnetisation starts at I0 and decays to
zero. The parameters are [Rx, I0], and the equation is I(t) =
I0*exp(-Rx*t).")
+uf.desc[-1].add_paragraph("The 'inv' model. This is the inversion recovery
experiment in which the peak intensity limit is a non-zero value. The
magnetisation starts at a negative I0 value and decays to a positive Iinf
value. The parameters are [Rx, I0, Iinf] and the equation is I(t) = Iinf -
I0*exp(-Rx*t). This has not been implemented yet.")
+uf.desc[-1].add_paragraph("The 'sat' model. This is the saturation recovery
experiment. The magnetisation starts at zero and decays to a positive Iinf
value. The parameters are [Rx, Iinf] and the equation is I(t) = Iinf*(1 -
exp(-Rx*t)).")
uf.backend = select_model
uf.menu_text = "&select_model"
uf.gui_icon = "oxygen.actions.list-add"
-uf.wizard_height_desc = 300
-uf.wizard_size = (800, 500)
+uf.wizard_height_desc = 500
+uf.wizard_size = (900, 600)
uf.wizard_apply_button = False
r26836 - in /trunk: specific_analyses/relax_fit/uf.py user_functions/relax_fit.py