Changeset bf5e985 in sasview

Timestamp:

May 21, 2014 5:18:42 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:

278e86f

Parents:

233c121

Message:

restore simultaneous fitting for bumps

Location:

src/sans

Files:

• fit/AbstractFitEngine.py (modified) (2 diffs)
• fit/BumpsFitting.py (modified) (4 diffs)
• perspectives/fitting/basepage.py (modified) (3 diffs)
• perspectives/fitting/fitpage.py (modified) (7 diffs)
• perspectives/fitting/fitting.py (modified) (1 diff)
• perspectives/fitting/simfitpage.py (modified) (2 diffs)

src/sans/fit/AbstractFitEngine.py

@@ -396 +396 @@
         Base class for scipy and park fit engine
         """
-        #List of parameter names to fit
-        self.param_list = []
         #Dictionnary of fitArrange element (fit problems)
         self.fit_arrange_dict = {}
@@ -444 +442 @@
         self.fit_arrange_dict[id].vals = [sasmodel.getParam(name) for name in pars]
         self.fit_arrange_dict[id].constraints = constraints
-
-        self.param_list.extend(pars)
 
     def set_data(self, data, id, smearer=None, qmin=None, qmax=None):

src/sans/fit/BumpsFitting.py

@@ -111 +111 @@
         for k,p in self._pars.items():
             p.fixed = (k not in param_list or k in self.constraints)
-        self.fitted_pars = [self._pars[k] for k in param_list if k not in self.constraints]
         self.fitted_par_names = [k for k in param_list if k not in self.constraints]
+        self.computed_par_names = [k for k in param_list if k in self.constraints]
+        self.fitted_pars = [self._pars[k] for k in self.fitted_par_names]
+        self.computed_pars = [self._pars[k] for k in self.computed_par_names]
 
     # ===== Fitness interface ====
@@ -163 +165 @@
             ftol=1.49012e-8, reset_flag=False):
         # Build collection of bumps fitness calculators
-        models = [ SasFitness(model=M.get_model(),
-                              data=M.get_data(),
-                              constraints=M.constraints,
-                              fitted=M.pars)
-                   for i,M in enumerate(self.fit_arrange_dict.values())
-                   if M.get_to_fit() == 1 ]
+        models = [SasFitness(model=M.get_model(),
+                             data=M.get_data(),
+                             constraints=M.constraints,
+                             fitted=M.pars)
+                  for M in self.fit_arrange_dict.values()
+                  if M.get_to_fit()]
         if len(models) == 0:
             raise RuntimeError("Nothing to fit")
@@ -177 +179 @@
         exprs = {}
         for M in models:
-            exprs.update((".".join((M.name,k)),v) for k,v in M.constraints.items())
+            exprs.update((".".join((M.name, k)), v) for k, v in M.constraints.items())
         if exprs:
-            symtab = dict((".".join((M.name,k)),p)
+            symtab = dict((".".join((M.name, k)), p)
                           for M in models
                           for k,p in M.parameters().items())
-            constraints = compile_constraints(symtab,exprs)
+            constraints = compile_constraints(symtab, exprs)
         else:
             constraints = lambda: 0
@@ -206 +208 @@
             fitted_index = [varying.index(p) for p in fitness.fitted_pars]
             R = FResult(model=fitness.model, data=fitness.data,
-                        param_list=fitness.fitted_par_names)
+                        param_list=fitness.fitted_par_names+fitness.computed_par_names)
             R.theory = fitness.theory()
             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]
+            R.stderr = numpy.hstack((result['stderr'][fitted_index],
+                                     numpy.NaN*numpy.ones(len(fitness.computed_pars))))
+            R.pvec = numpy.hstack((result['value'][fitted_index],
+                                  [p.value for p in fitness.computed_pars]))
             R.success = result['success']
             R.fitness = numpy.sum(R.residuals**2)/(fitness.numpoints() - len(fitted_index))

src/sans/perspectives/fitting/basepage.py

@@ -96 +96 @@
         self.num_points = None
         ## default fitengine type
-        self.engine_type = 'scipy'
+        self.engine_type = 'bumps'
         ## smear default
         self.current_smearer = None
@@ -2986 +2986 @@
             self.qmin.SetValue(str(self.qmin_x))
             self.qmax.SetValue(str(self.qmax_x))
-            self.set_npts2fit()
+            self.show_npts2fit()
             # At this point, some button and variables satatus (disabled?)
             # should be checked such as color that should be reset to
@@ -3874 +3874 @@
         to fit if implemented
         """
-    def set_npts2fit(self):
+    def show_npts2fit(self):
         """
         setValue Npts for fitting if implemented

src/sans/perspectives/fitting/fitpage.py

@@ -661 +661 @@
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         
-        if self.engine_type in ("park","bumps"):
-            self.text_disp_max.Show(True)
-            self.text_disp_min.Show(True)
+        self.text_disp_max.Show(True)
+        self.text_disp_min.Show(True)
 
         for item in self.model.dispersion.keys():
@@ -738 +737 @@
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
-                        if self.engine_type in ("park","bumps"):
-                            ctl3.Show(True)
-                            ctl4.Show(True)
+                        ctl3.Show(True)
+                        ctl4.Show(True)
                                                               
                     elif p == "npts":
@@ -1268 +1266 @@
         if check_float(tcrtl):
             flag = self._onparamEnter_helper()
-            self.set_npts2fit()
+            self.show_npts2fit()
             if self.fitrange:
                 temp_smearer = None
@@ -1468 +1466 @@
                     #self.data.mask = index_data
                     #self.Npts_fit.SetValue(str(len(self.data.mask)))
-                    self.set_npts2fit()
+                    self.show_npts2fit()
             else:
                 index_data = ((self.qmin_x <= self.data.x) & \
@@ -1766 +1764 @@
             # try re draw the model plot if it exists
             self._draw_model()
-            self.set_npts2fit()
+            self.show_npts2fit()
         elif self.model == None:
             self.panel.MakeModal(False)
             event.Skip()
-            self.set_npts2fit()
+            self.show_npts2fit()
             msg = "No model is found on updating MASK in the model plot... "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -2056 +2054 @@
         return npts2fit
 
-    def set_npts2fit(self):
+    def show_npts2fit(self):
         """
         setValue Npts for fitting
@@ -2093 +2091 @@
         if chisqr != None and numpy.isfinite(chisqr):
             #format chi2
-            if self.engine_type in ("park","bumps"):
-                npt_fit = float(self.get_npts2fit())
             chi2 = format_number(chisqr, True)
             self.tcChi.SetValue(chi2)

src/sans/perspectives/fitting/fitting.py

@@ -1084 +1084 @@
         batch_inputs = {}
         batch_outputs = {}
-        page = self.fit_panel.get_page_by_id(uid)
+        if fit_type == "simultaneous":
+            page = self.sim_page
+        elif fit_type == "combined_batch":
+            page = self.batch_page
+        else:
+            page = self.fit_panel.get_page_by_id(uid)
         if page.batch_on:
             calc_fit = FitThread(handler=handler,

src/sans/perspectives/fitting/simfitpage.py

@@ -139 +139 @@
                 break
 
-        ## some model or parameters can be constrained
-        self._show_constraint()
-        self.sizer3.Layout()
-        self.Layout()
-        self.Refresh()
         #self._onAdd_constraint(None)
              
@@ -820 +815 @@
                         
                     for fid in self.page_finder[id].iterkeys():
-                        self.page_finder[id].set_model_param(param,
-                                                        constraint, fid=fid)
+                        # wrap in param/constraint in str() to remove unicode
+                        self.page_finder[id].set_model_param(str(param),
+                                                        str(constraint), fid=fid)
                     break
         return True