Changeset acf8e4a5 in sasview for src

Timestamp:

Mar 31, 2015 9:52:01 AM (10 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:

4342107f, c971c98

Parents:

6987c8a

Message:

reference BumpsFit? directly and remove fit engine selection layer

Location:

src/sas

Files:

• fit/Fitting.py (deleted)
• perspectives/fitting/basepage.py (modified) (5 diffs)
• perspectives/fitting/fitpage.py (modified) (2 diffs)
• perspectives/fitting/fitpanel.py (modified) (1 diff)
• perspectives/fitting/fitting.py (modified) (11 diffs)
• perspectives/fitting/pagestate.py (modified) (3 diffs)
• perspectives/fitting/simfitpage.py (modified) (1 diff)

src/sas/perspectives/fitting/basepage.py

@@ -98 +98 @@
         self.npts = None
         self.num_points = None
-        ## default fitengine type
-        self.engine_type = 'bumps'
         ## smear default
         self.current_smearer = None
@@ -947 +945 @@
         Store current state
         """
-        self.state.engine_type = copy.deepcopy(self.engine_type)
         ## save model option
         if self.model != None:
@@ -1045 +1042 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-        if hasattr(self, "engine_type"):
-            self.state.engine_type = copy.deepcopy(self.engine_type)
 
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1299 +1294 @@
             # Backward compatibility (for older state files)
             self.magnetic_on = False
-        self.engine_type = state.engine_type
 
         self.disp_cb_dict = state.disp_cb_dict
@@ -1355 +1349 @@
             self.multifactorbox.SetSelection(state.multi_factor)
 
-        #reset the fitting engine type
-        self.engine_type = state.engine_type
-        #draw the pnael according to the new model parameter
+        #draw the panel according to the new model parameter
         self._on_select_model(event=None)
 

src/sas/perspectives/fitting/fitpage.py

@@ -183 +183 @@
             return True
         return False
-
-    def _on_engine_change(self, name):
-        """
-        get the current name of the fit engine type
-         and update the panel accordingly
-        """
-
-        self.engine_type = str(name)
-        self.state.engine_type = self.engine_type
-        if not self.is_mac:
-            if len(self.parameters) == 0:
-                self.Layout()
-                return
-            self.Layout()
-            self.Refresh()
 
     def _fill_range_sizer(self):
@@ -2834 +2819 @@
             self.SetupScrolling()
             return
-        ## the panel is drawn using the current value of the fit engine
-        if self.engine_type == None and self._manager != None:
-            self.engine_type = self._manager._return_engine_type()
 
         box_description = wx.StaticBox(self, -1, str("Model Parameters"))

src/sas/perspectives/fitting/fitpanel.py

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

src/sas/perspectives/fitting/fitting.py

@@ -32 +32 @@
 from sas.guiframe.plugin_base import PluginBase
 from sas.guiframe.data_processor import BatchCell
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.perspectives.fitting.console import ConsoleUpdate
 from sas.perspectives.fitting.fitproblem import FitProblemDictionary
@@ -84 +84 @@
         ## dictionary of page closed and id
         self.closed_page_dict = {}
-        ## Fit engine
-        self._fit_engine = 'bumps'
-        self._gui_engine = None
         ## Relative error desired in the sum of squares (float)
         self.batch_reset_flag = True
@@ -751 +748 @@
     def stop_fit(self, uid):
         """
-        Stop the fit engine
+        Stop the fit
         """
         if uid in self.fit_thread_list.keys():
@@ -877 +874 @@
         """
         Get series of data, model, associates parameters and range and send then
-        to  series of fit engines. Fit data and model, display result to
+        to  series of fitters. Fit data and model, display result to
         corresponding panels.
         :param uid: id related to the panel currently calling this fit function.
@@ -896 +893 @@
         sim_fitter = None
         if fit_type == 'simultaneous':
-            #simulatanous fit only one engine need to be created
-            sim_fitter = Fit(self._fit_engine)
+            # for simultaneous fitting only one fitter is needed
+            sim_fitter = Fit()
             sim_fitter.fitter_id = self.sim_page.uid
             fitter_list.append(sim_fitter)
@@ -936 +933 @@
                     for fitproblem in  fitproblem_list:
                         if sim_fitter is None:
-                            fitter = Fit(self._fit_engine)
+                            fitter = Fit()
                             fitter.fitter_id = page_id
                             fitter_list.append(fitter)
@@ -965 +962 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg, type="progress"))
 
-        #Handler used for fit engine displayed message
+        #Handler used to display fit message
         handler = ConsoleUpdate(parent=self.parent,
                                 manager=self,
@@ -1148 +1145 @@
     def _add_problem_to_fit(self, fitproblem, pars, fitter, fit_id):
         """
-        Create and set fit engine with series of data and model
-        :param pars: list of fittable parameters
-        :param fitter_list: list of fit engine
-        :param value:  structure storing data mapped to their model, range etc.
+        Create and set fitter with series of data and model
         """
         data = fitproblem.get_fit_data()
@@ -1207 +1201 @@
         """
         Display fit result in batch
-        :param result: list of objects received fromt fit engines
+        :param result: list of objects received from fitters
         :param pars: list of  fitted parameters names
         :param page_id: list of page ids which called fit function
@@ -1308 +1302 @@
                             batch_inputs["error on %s" % str(param)].append(ERROR)
                 else:
-                    # ToDo: Why sometimes res.pvec comes with numpy.float64?
-                    # Need to fix it within ScipyEngine
+                    # TODO: Why sometimes res.pvec comes with numpy.float64?
+                    # probably from scipy lmfit
                     if res.pvec.__class__ == numpy.float64:
                         res.pvec = [res.pvec]
@@ -1921 +1915 @@
                 dy = numpy.ones(len(data_copy.y))
             else:
-                ## Set consitently w/AbstractFitengine:
+                ## Set consistently w/AbstractFitengine:
                 # But this should be corrected later.
                 dy = deepcopy(data_copy.dy)

src/sas/perspectives/fitting/pagestate.py

@@ -42 +42 @@
                            ["name", "name", "string"],
                            ["data_name", "data_name", "string"]]
-LIST_OF_STATE_ATTRIBUTES = [["engine_type", "engine_type", "string"],
-                            ["qmin", "qmin", "float"],
+LIST_OF_STATE_ATTRIBUTES = [["qmin", "qmin", "float"],
                             ["qmax", "qmax", "float"],
                             ["npts", "npts", "float"],
@@ -173 +172 @@
         self.reset = False
 
-        #engine type
-        self.engine_type = None
         # flag to allow data2D plot
         self.enable2D = False
@@ -288 +285 @@
         obj.is_data = self.is_data
         obj.model_list_box = copy.deepcopy(self.model_list_box)
-        obj.engine_type = copy.deepcopy(self.engine_type)
 
         obj.categorycombobox = self.categorycombobox

src/sas/perspectives/fitting/simfitpage.py

@@ -152 +152 @@
 
         ## making sure all parameters content a constraint
-        ## validity of the constraint expression is own by fit engine
         if not self.batch_on and self.show_constraint.GetValue():
             if not self._set_constraint():