Changeset 5044543 in sasview for src/sans

Timestamp:

May 22, 2014 8:52:39 AM (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:

ddfe1eb7

Parents:

278e86f

Message:

fix batch fit support for bumps

File:

• src/sans/fit/BumpsFitting.py (modified) (5 diffs)

src/sans/fit/BumpsFitting.py

@@ -62 +62 @@
     Wrap SAS model as a bumps fitness object
     """
-    def __init__(self, model, data, fitted=[], constraints={}, **kw):
+    def __init__(self, model, data, fitted=[], constraints={},
+                 initial_values=None, **kw):
         self.name = model.name
         self.model = model.model
@@ -68 +69 @@
         self._define_pars()
         self._init_pars(kw)
+        if initial_values is not None:
+            self._reset_pars(fitted, initial_values)
         self.constraints = dict(constraints)
         self.set_fitted(fitted)
-        self._dirty = True
+        self.update()
+
+    def _reset_pars(self, names, values):
+        for k,v in zip(names, values):
+            self._pars[k].value = v
 
     def _define_pars(self):
@@ -103 +110 @@
             else:
                 self._pars[k].value = v
-        self.update()
 
     def set_fitted(self, param_list):
@@ -168 +174 @@
                              data=M.get_data(),
                              constraints=M.constraints,
-                             fitted=M.pars)
+                             fitted=M.pars,
+                             initial_values=M.vals if reset_flag else None)
                   for M in self.fit_arrange_dict.values()
                   if M.get_to_fit()]
@@ -211 +218 @@
             R.theory = fitness.theory()
             R.residuals = fitness.residuals()
+            R.index = fitness.data.idx
             R.fitter_id = self.fitter_id
             # TODO: should scale stderr by sqrt(chisq/DOF) if dy is unknown