Changeset 91a43d0 in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Oct 10, 2011 2:22:45 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

05fb6d12

Parents:

1fa4db39

Message:

fixed batchfit with park

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -803 +803 @@
         ## perform single fit
         if is_single_fit:
-            if self._fit_engine == "scipy":
-                calc_fit = FitThread(handler = handler,
+            calc_fit = FitThread(handler = handler,
                                     fn=fitter_list,
                                     pars=pars,
@@ -812 +811 @@
                                     completefn=self._single_fit_completed,
                                     ftol=self.ftol)
-            else:
-                calc_fit = FitThread(handler = handler,
-                                    fn=fitter_list,
-                                    pars=pars,
-                                    batch_inputs=batch_inputs,
-                                    batch_outputs=batch_outputs,
-                                    page_id=list_page_id,
-                                    completefn=self._simul_fit_completed,
-                                    ftol=self.ftol)
-
         else:
             current_page_id = self.sim_page.uid
@@ -1063 +1052 @@
                                                       type="stop"))
         pid = page_id[0]
+        cpage = self.fit_panel.get_page_by_id(pid)
+        batch_on = cpage.batch_on
         if batch_outputs is None:
             batch_outputs = {}
-        if self.batch_on:
+        if batch_on:
             # format batch_outputs
             batch_outputs["Chi2"] = []