Changeset eff93b8 in sasview

Timestamp:

May 19, 2014 3:30:19 PM (10 years ago)

Author:

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:

85a3b46

Parents:

4a0dc427

Message:

change default fit engine to bumps:levenberg-marquardt

Files:

• src/sans/fit/BumpsFitting.py (modified) (2 diffs)
• src/sans/perspectives/fitting/fitpanel.py (modified) (1 diff)
• src/sans/perspectives/fitting/fitting.py (modified) (6 diffs)
• test/park_integration/test/utest_fit_cylinder.py (modified) (1 diff)

src/sans/fit/BumpsFitting.py

@@ -196 +196 @@
             handler.update_fit(last=True)
 
-        # TODO: shouldn't reference internal parameters
+        # TODO: shouldn't reference internal parameters of fit problem
         varying = problem._parameters
         # collect the results
@@ -208 +208 @@
             R.residuals = fitness.residuals()
             R.fitter_id = self.fitter_id
+            # TODO: should scale stderr by sqrt(chisq/DOF) if dy is unknown
             R.stderr = result['stderr'][fitted_index]
             R.pvec = result['value'][fitted_index]

src/sans/perspectives/fitting/fitpanel.py

@@ -64 +64 @@
         self.sim_page = None
         self.batch_page = None
-        self.fit_engine_type = "scipy"
+        self.fit_engine_type = "bumps"
         ## get the state of a page
         self.Bind(basepage.EVT_PAGE_INFO, self._onGetstate)

src/sans/perspectives/fitting/fitting.py

@@ -45 +45 @@
 from sans.guiframe.gui_manager import MDIFrame
 
+# TODO: remove globals from interface to bumps options!
+# Default bumps to use the levenberg-marquardt optimizer
+import bumps.fitters
+bumps.fitters.FIT_DEFAULT = 'lm'
+
 MAX_NBR_DATA = 4
 SANS_F_TOL = 5e-05
@@ -80 +85 @@
         # Start with a good default
         self.elapsed = 0.022
-        # the type of optimizer selected, park or scipy
-        self.fitter = None
         self.fit_panel = None
         #let fit ready
@@ -90 +93 @@
         self.closed_page_dict = {}
         ## Fit engine
-        self._fit_engine = 'scipy'
+        self._fit_engine = 'bumps'
         self._gui_engine = None
         ## Relative error desired in the sum of squares (float); scipy only
@@ -206 +209 @@
         wx.EVT_MENU(owner, self.bumps_id, self._onset_engine_bumps)
         
-        self.menu1.FindItemById(self.scipy_id).Check(True)
-        self.menu1.FindItemById(self.park_id).Check(False)
-        self.menu1.FindItemById(self.bumps_id).Check(False)
+        self.menu1.FindItemById(self.scipy_id).Check(self._fit_engine=="scipy")
+        self.menu1.FindItemById(self.park_id).Check(self._fit_engine=="park")
+        self.menu1.FindItemById(self.bumps_id).Check(self._fit_engine=="bumps")
         self.menu1.AppendSeparator()
         self.id_tol = wx.NewId()
@@ -986 +989 @@
             if value.get_scheduled() == 1:
                 fitproblem_count += 1
-        self._gui_engine = self._return_engine_type()
+        # Remember the user selected fit engine before the fit.  Simultaneous
+        # fitting may change the selected engine, so it needs to be restored
+        # when the fit is complete.
+        self._gui_engine = self._fit_engine
         self.fitproblem_count = fitproblem_count
         if self._fit_engine in ("park","bumps"):
@@ -1751 +1757 @@
                 break
     
-    def _return_engine_type(self):
-        """
-        return the current type of engine
-        """
-        return self._fit_engine
-     
     def _on_change_engine(self, engine='park'):
         """

test/park_integration/test/utest_fit_cylinder.py

@@ -126 +126 @@
 
         fitter.set_data(self.data2,2)
-        fitter.set_model(self.model2, 2, ['radius','scale'],
+        fitter.set_model(self.model2, 2, ['length','radius','scale'],
                          constraints=[("length","C1.length")])
         fitter.select_problem_for_fit(id=1,value=1)