Changeset dc613d6 in sasview

Timestamp:

Jun 15, 2011 3:44:29 PM (14 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:

2446b66

Parents:

dfb6d38

Message:

fixed multi fitting

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (10 diffs)
• simfitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -952 +952 @@
         Allow to fit
         """
+        if len(self.parent._manager.fit_thread_list)>0 and\
+                    self.parent._manager._fit_engine != "park":
+            msg = "The FitEnging will be set to 'ParkMC'\n"
+            msg += " to fit with more than one data set..."
+            wx.MessageBox(msg, 'Info')
+            #wx.PostEvent(self._manager.parent, StatusEvent(status=\
+            #                "Fitting: %s"%msg))
+            
         if self.data is None:
             msg = "Please get Data first..."
@@ -989 +997 @@
         self.qmin_x = float(self.qmin.GetValue())
         self.qmax_x = float( self.qmax.GetValue())
-        self._manager._reset_schedule_problem(value=0)
+        self._manager._reset_schedule_problem(value=0, uid=self.uid)
         self._manager.schedule_for_fit(uid=self.uid,value=1, fitproblem =None) 
         self._manager.set_fit_range(uid=self.uid,qmin= self.qmin_x, 
@@ -995 +1003 @@
         
         #single fit 
-        self._manager.onFit()
+        self._manager.onFit(uid=self.uid)
         self.btFit.SetLabel("Stop")
         self.bind_fit_button()

sansview/perspectives/fitting/fitting.py

@@ -34 +34 @@
 from sans.guiframe.plugin_base import PluginBase 
 
-from .console import ConsoleUpdate
+#from .console import ConsoleUpdate
 from .fitproblem import FitProblem
 from .fitpanel import FitPanel
@@ -563 +563 @@
                                 update_chisqr=update_chisqr)
             
-    def onFit(self):
+    def onFit(self, uid=None):
         """
         perform fit 
-        """
+        
+        : param type: uid for single fit, None for simultaneous fit
+        """
+        from sans.fit.Fitting import Fit
         from .fit_thread import FitThread
+        from .console import ConsoleUpdate
         ##  count the number of fitproblem schedule to fit 
+        #if uid == None or self._fit_engine == "park":
         fitproblem_count = 0
         for value in self.page_finder.values():
@@ -575 +580 @@
                 
         ## if simultaneous fit change automatically the engine to park
-        if fitproblem_count > 1:
+        # scipy can not handle two thread running at the same time
+        if fitproblem_count > 1 or len(self.fit_thread_list)>0:
             self._on_change_engine(engine='park')
             
         self.fitproblem_count = fitproblem_count  
-          
-        from sans.fit.Fitting import Fit
+
         fitter = Fit(self._fit_engine)
-        
         if self._fit_engine == "park":
             engineType = "Simultaneous Fit"
@@ -592 +596 @@
         list_page_id = []
         for page_id, value in self.page_finder.iteritems():
+            # For simulfit (uid give with None), do for-loop
+            # if uid is specified (singlefit), do it only on the page.
+            if engineType == "Single Fit":
+                if page_id != uid:
+                    continue
             try:
                 if value.get_scheduled() == 1:
@@ -651 +660 @@
                                     completefn=self._simul_fit_completed,
                                     ftol=self.ftol)
+
         self.fit_thread_list[current_page_id] = calc_fit
         time.sleep(0.3)
@@ -817 +827 @@
                     break
     
-    def _reset_schedule_problem(self, value=0):
+    def _reset_schedule_problem(self, value=0, uid=None):
         """
         unschedule or schedule all fitproblem to be fit
         """
-        for page_id in self.page_finder.keys():
-            self.page_finder[page_id].schedule_tofit(value)
-            
+        # case that uid is not specified
+        if uid == None:
+            for page_id in self.page_finder.keys():
+                self.page_finder[page_id].schedule_tofit(value)
+        # when uid is given
+        else:
+            self.page_finder[uid].schedule_tofit(value)
+                
     def _fit_helper(self, pars, value, fitproblem_id,fitter, title="Single Fit " ):
         """
@@ -897 +912 @@
           
         """  
+        del self.fit_thread_list[page_id[0]]
         time.sleep(0.2)   
         try:
@@ -917 +933 @@
                 self._update_fit_button(page_id)
                 return
+            
             for uid in page_id:
                 value = self.page_finder[uid]   
@@ -962 +979 @@
         
         """
+        self.fit_thread_list = {}
         if page_id is None:
             page_id = []
@@ -1114 +1132 @@
         ## send the current engine type to fitpanel
         self.fit_panel._on_engine_change(name=self._fit_engine)
+
        
     def _on_model_panel(self, evt):

sansview/perspectives/fitting/simfitpage.py

@@ -52 +52 @@
         ##Font size
         self.SetWindowVariant(variant = FONT_VARIANT)
-        self.id = None
+        self.uid = None
         self.parent = parent
         ## store page_finder
@@ -67 +67 @@
         ## number of constraint
         self.nb_constraint= 0
-        self.id = wx.NewId()
+        self.uid = wx.NewId()
         ## draw page
         self.define_page_structure()
@@ -146 +146 @@
             for item in self.model_list:
                 if item[0].GetValue():
-                    self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
-            self.manager.onFit()
+                    self.manager.schedule_for_fit( value=1, fitproblem =item[1]) 
+            self.manager.onFit(None)
         else:
             msg= "Select at least one model to fit "