Changeset 4e9f227 in sasview for src/sans/perspectives/fitting/fitting.py

Timestamp:

May 15, 2014 7:07:43 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:

786685e

Parents:

e3efa6b3

Message:

support simultaneous fitting in bumps

File:

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

src/sans/perspectives/fitting/fitting.py

@@ -999 +999 @@
             #simulatanous fit only one engine need to be created
             ## if simultaneous fit change automatically the engine to park
-            self._on_change_engine(engine='park')
+            if self._fit_engine not in ("park","bumps"):
+                self._on_change_engine(engine='park')
             sim_fitter = Fit(self._fit_engine)
             sim_fitter.fitter_id = self.sim_page.uid
@@ -1007 +1008 @@
             
         self.fitproblem_count = fitproblem_count
-        if self._fit_engine == "park":
+        if self._fit_engine in ("park","bumps"):
             engineType = "Simultaneous Fit"
         else: