Changeset 4e9f227 in sasview for src/sans/perspectives

Timestamp:

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

Location:

src/sans/perspectives/fitting

Files:

• fitpage.py (modified) (4 diffs)
• fitting.py (modified) (2 diffs)
• simfitpage.py (modified) (1 diff)

src/sans/perspectives/fitting/fitpage.py

@@ -661 +661 @@
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         
-        if self.engine_type == "park":
+        if self.engine_type in ("park","bumps"):
             self.text_disp_max.Show(True)
             self.text_disp_min.Show(True)
@@ -738 +738 @@
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
-                        if self.engine_type == "park":
+                        if self.engine_type in ("park","bumps"):
                             ctl3.Show(True)
                             ctl4.Show(True)
@@ -1005 +1005 @@
             return
 
-        if len(self._manager.fit_thread_list) > 0 and\
-                    self._manager._fit_engine != "park" and\
-                    self._manager.sim_page != None and \
-                    self._manager.sim_page.uid == self.uid:
+        if (len(self._manager.fit_thread_list) > 0
+                and self._manager._fit_engine not in ("park","bumps")
+                and self._manager.sim_page != None
+                and self._manager.sim_page.uid == self.uid):
             msg = "The FitEnging will be set to 'ParkMC'\n"
             msg += " to fit with more than one data set..."
@@ -2108 +2108 @@
         if chisqr != None and numpy.isfinite(chisqr):
             #format chi2
-            if self.engine_type == "park":
+            if self.engine_type in ("park","bumps"):
                 npt_fit = float(self.get_npts2fit())
             chi2 = format_number(chisqr, True)

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:

src/sans/perspectives/fitting/simfitpage.py

@@ -152 +152 @@
         ## making sure all parameters content a constraint
         ## validity of the constraint expression is own by fit engine
-        if self.parent._manager._fit_engine != "park" and flag:
+        if self.parent._manager._fit_engine not in ("park","bumps") and flag:
             msg = "The FitEnging will be set to 'Park' fit engine\n"
             msg += " for the simultaneous fit..."