Changeset 92b2fd8 in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 6, 2011 5:27:27 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:

ace0e33

Parents:

cef2da8

Message:

fixed park single fit problem: putting resultant param values in wrong places

File:

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

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

@@ -803 +803 @@
         ## perform single fit
         if is_single_fit:
-            calc_fit = FitThread(handler = handler,
+            if self._fit_engine == "scipy":
+                calc_fit = FitThread(handler = handler,
                                     fn=fitter_list,
                                     pars=pars,
@@ -811 +812 @@
                                     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