Changeset 7945367 in sasview for src/sas

Timestamp:

Aug 21, 2015 6:17:40 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

600bea1

Parents:

a342928

Message:

make Fit Options dialog persistent and add Help button [NB: awaiting new bumps release]

Location:

src/sas

Files:

• fit/BumpsFitting.py (modified) (2 diffs)
• perspectives/fitting/fitting.py (modified) (2 diffs)

src/sas/fit/BumpsFitting.py

@@ -8 +8 @@
 
 from bumps import fitters
+try:
+    from bumps.options import FIT_CONFIG
+    # Default bumps to use the Levenberg-Marquardt optimizer
+    FIT_CONFIG.selected_id = fitters.LevenbergMarquardtFit.id
+    def get_fitter():
+        return FIT_CONFIG.selected_fitter, FIT_CONFIG.selected_values
+except:
+    # CRUFT: Bumps changed its handling of fit options around 0.7.5.6
+    # Default bumps to use the Levenberg-Marquardt optimizer
+    fitters.FIT_DEFAULT = 'lm'
+    def get_fitter():
+        fitopts = fitters.FIT_OPTIONS[fitters.FIT_DEFAULT]
+        return fitopts.fitclass, fitopts.options.copy()
+
+
 from bumps.mapper import SerialMapper, MPMapper
 from bumps import parameter
-
-# TODO: remove globals from interface to bumps options!
-# Default bumps to use the levenberg-marquardt optimizer
 from bumps.fitproblem import FitProblem
-fitters.FIT_DEFAULT = 'lm'
+
 
 from sas.fit.AbstractFitEngine import FitEngine
@@ -311 +323 @@
         return False
 
-    fitopts = fitters.FIT_OPTIONS[fitters.FIT_DEFAULT]
-    fitclass = fitopts.fitclass
-    options = fitopts.options.copy()
-    max_step = fitopts.options.get('steps', 0) + fitopts.options.get('burn', 0)
+    fitclass, options = get_fitter()
+    steps = options.get('steps', 0)
+    if steps == 0:
+        pop = options.get('pop',0)*len(problem._parameters)
+        samples = options.get('samples', 0)
+        steps = (samples+pop-1)/pop if pop != 0 else samples
+    max_step = steps + options.get('burn', 0)
     pars = [p.name for p in problem._parameters]
     #x0 = numpy.asarray([p.value for p in problem._parameters])

src/sas/perspectives/fitting/fitting.py

@@ -44 +44 @@
 from sas.perspectives.calculator.model_editor import EditorWindow
 from sas.guiframe.gui_manager import MDIFrame
+from sas.guiframe.documentation_window import DocumentationWindow
 
 MAX_NBR_DATA = 4
@@ -748 +749 @@
         Open the bumps options panel.
         """
-        from bumps.gui.fit_dialog import OpenFitOptions
-        OpenFitOptions()
+        try:
+            from bumps.gui.fit_dialog import show_fit_config
+            show_fit_config(self.parent, help=self.on_help)
+        except ImportError:
+            # CRUFT: Bumps 0.7.5.6 and earlier do not have the help button
+            from bumps.gui.fit_dialog import OpenFitOptions
+            OpenFitOptions()
+
+    def on_help(self, algorithm_id):
+        _TreeLocation = "user/perspectives/fitting/optimizer.html"
+        _anchor = "#fit-"+algorithm_id
+        DocumentationWindow(self.parent, -1, _TreeLocation, _anchor, "Optimizer Help")
+
 
     def on_fit_results(self, event=None):