r22875 - /trunk/gui/analyses/auto_relax_disp.py -- April 29, 2014 - 15:12

Author: tlinnet
Date: Tue Apr 29 15:12:24 2014
New Revision: 22875

URL: http://svn.gna.org/viewcvs/relax?rev=22875&view=rev
Log:
Better wording of experimental feature in GUI tooltip.

Feature request: #3151, (https://gna.org/support/index.php?3151) - User 
function to set the R20 parameters in the default grid search using the 
minimum R2eff value.

Modified:
    trunk/gui/analyses/auto_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=22875&r1=22874&r2=22875&view=diff
==============================================================================
--- trunk/gui/analyses/auto_relax_disp.py       (original)
+++ trunk/gui/analyses/auto_relax_disp.py       Tue Apr 29 15:12:24 2014
@@ -360,13 +360,13 @@
         # The grid search optimisation settings.
         self.grid_inc = Spin_ctrl(box, self, text="Grid search increments:", 
default=21, min=1, max=100, tooltip="This is the number of increments per 
dimension of the grid search performed prior to numerical optimisation.", 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
-        # The speed up of grid search.
-        tooltip = "True will set the grid %s values from the minimum %s/%s 
values. This will speed up the grid search with a factor 
GRID_INC^(Nr_spec_freq). For a CPMG experiment with two fields and standard 
GRID_INC=21, the speed-up is a factor 441." % (r2, r2eff, r1rho)
-        self.set_grid_r20 = Boolean_ctrl(box, self, text="Speed up of grid 
search", default=False, tooltip=tooltip, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
-
         # The MC simulation settings.
         self.mc_sim_num = Spin_ctrl(box, self, text="Monte Carlo simulation 
number:", default=500, min=1, max=100000, tooltip="This is the number of 
Monte Carlo simulations performed for error propagation and analysis.  For 
best results, at least 500 is recommended.", width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
         self.mc_sim_all_models = Boolean_ctrl(box, self, text="Per model 
error analysis:", default=False, tooltip="A flag which if True will cause 
Monte Carlo simulations to be performed for each individual model.  Otherwise 
Monte Carlo simulations will be reserved for the final model.", 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+
+        # The speed up of grid search.
+        tooltip = "Experimental option, be careful.  True will set the grid 
%s values from the minimum %s values.  This will speed up the grid search 
with a factor GRID_INC^(Nr_spec_freq).  For a CPMG experiment with two fields 
and standard GRID_INC=21, the speed-up is a factor 441." % (r2, r2eff)
+        self.set_grid_r20 = Boolean_ctrl(box, self, text="Set R20 to the 
minimum R2eff.", default=False, tooltip=tooltip, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # The insignificance cutoff.
         tooltip = "The %s/%s value in rad/s by which to judge 
insignificance.  If the maximum difference between two points on all 
dispersion curves for a spin is less than this value, that spin will be 
deselected.  This does not affect the '%s' model.  Set this value to 0.0 to 
use all data." % (r2eff, r1rho, MODEL_NOREX)