Changeset 662da312 in sasview for sansview/perspectives/fitting

Timestamp:

Jan 20, 2010 3:55:37 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

97603c0

Parents:

6d20b46

Message:

working on thread fit issues [incomplete]

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (1 diff)
• fitting.py (modified) (6 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -155 +155 @@
         except :
             #Stop on exception during fitting. Todo: need to put some mssg and reset progress bar.
-            msg= " Fit Error occurred... %s"%sys.exc_value
-            wx.PostEvent(self.parent, StatusEvent(status= msg,type="stop"))
-            #raise
+            #msg= " Fit Error occurred... %s"%sys.exc_value
+            #wx.PostEvent(self.parent, StatusEvent(status= msg,type="stop"))
+            raise
     

sansview/perspectives/fitting/fitting.py

@@ -453 +453 @@
                     self.current_pg= page
             except:
-                msg= "%s error: %s" % (engineType,sys.exc_value)
-                wx.PostEvent(self.parent, StatusEvent(status= msg ))
-                return 
+                raise
+                #msg= "%s error: %s" % (engineType,sys.exc_value)
+                #wx.PostEvent(self.parent, StatusEvent(status= msg ))
+                #return 
             
         #Do the simultaneous fit
         try:
             ## If a thread is already started, stop it
-            if self.calc_fit!= None and self.calc_fit.isrunning():
-                return
-                self.calc_fit.stop()
+            #if self.calc_fit!= None and self.calc_fit.isrunning():
+            #    self.calc_fit.stop()
             
             wx.PostEvent(self.parent, StatusEvent(status="Start the computation",
@@ -471 +471 @@
             time.sleep(0.5)
             ## perform single fit
-            if self._fit_engine=="scipy":
+            if fitproblem_count == 1:
                 #qmin, qmax= self.current_pg.get_range()
-                self.calc_fit=FitThread(parent =self.parent,
+                print "went here fitproblem_count == 1",fitproblem_count == 1
+                calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
                                        cpage=self.current_pg,
@@ -479 +480 @@
                                        completefn= self._single_fit_completed,
                                        updatefn=self._updateFit)
+                
                       
             else:
                 ## Perform more than 1 fit at the time
-                self.calc_fit=FitThread(parent =self.parent,
+                calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
                                        completefn= self._simul_fit_completed,
                                        updatefn=self._updateFit)
             
-            self.calc_fit.queue()
-            self.ready_fit()
+            calc_fit.queue()
+            self.ready_fit(calc_fit=calc_fit)
             
         except FitAbort:
             print "in pluging"
         except:
-            msg= "%s error: %s" % (engineType,sys.exc_value)
-            wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
-            return 
-        
-    def ready_fit(self):
+            raise
+        #    msg= "%s error: %s" % (engineType,sys.exc_value)
+        #    wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
+        #    return 
+        
+    def ready_fit(self, calc_fit):
         """
         Ready for another fit
         """
         if self.fitproblem_count != None and self.fitproblem_count > 1:
-            self.calc_fit.ready(2.5)
+            calc_fit.ready(2.5)
             
         else:
@@ -626 +629 @@
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )
-           
+            print "self.fitter.set_data"
             self.fitter.select_problem_for_fit(Uid= self.fit_id,
                                                value= value.get_scheduled())
             value.clear_model_param()
         except:
-            msg= title +" error: %s" % sys.exc_value
-            wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-            return
+            raise
+            #msg= title +" error: %s" % sys.exc_value
+            #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+            #return
        
     def _onSelect(self,event):
@@ -775 +779 @@
             """
         except:
-            msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
-            wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
-            return
+            raise
+            #msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
+            #wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+            #return
        
        
@@ -827 +832 @@
                     page.onsetValues(result.fitness, small_param_name,small_out,small_cov)
         except:
-             msg= "Simultaneous Fit completed"
-             msg +=" but Following error occurred:%s"%sys.exc_value
-             wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
-             return 
+            raise
+             #msg= "Simultaneous Fit completed"
+             #msg +=" but Following error occurred:%s"%sys.exc_value
+             #wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+             #return