Changeset e9b4cc4 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 15, 2009 5:39:19 PM (16 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:

633ba04

Parents:

681f0dc

Message:

add thread for fitting

File:

• sansview/perspectives/fitting/fitting.py (modified) (12 diffs)

sansview/perspectives/fitting/fitting.py

@@ -10 +10 @@
 from fitproblem import FitProblem
 from fitpanel import FitPanel
-
+from fit_thread import FitThread
 import models,modelpage
 import fitpage1D,fitpage2D
 import park
 DEFAULT_BEAM = 0.005
+import time
+import thread
+print "main",thread.get_ident()
+
 class Plugin:
     """
@@ -28 +32 @@
         ## List of panels for the simulation perspective (names)
         self.perspective = []
+        
+        self.calc_thread = None
+        self.done = False
         # Start with a good default
         self.elapsed = 0.022
@@ -222 +229 @@
             return model_name,param_name
         
-        
-    def _single_fit_completed(self,result,pars,cpage,qmin,qmax,ymin=None, ymax=None):
+   
+    def _single_fit_completed(self,result,pars,cpage,qmin,qmax,elapsed,ymin=None, ymax=None):
         """
             Display fit result on one page of the notebook.
@@ -233 +240 @@
           
         """
+        #self.done = True
+        #wx.PostEvent(self.parent, StatusEvent(status="Fitting Completed: %g" % elapsed))
         try:
             for page, value in self.page_finder.iteritems():
@@ -260 +269 @@
             
        
-    def _simul_fit_completed(self,result,qmin,qmax,ymin=None, ymax=None):
+    def _simul_fit_completed(self,result,qmin,qmax, elapsed,pars=None,cpage=None, ymin=None, ymax=None):
         """
             Parameter estimation completed, 
@@ -267 +276 @@
             @param elapsed: computation time
         """
+        wx.PostEvent(self.parent, StatusEvent(status="Fitting Completed: %g" % elapsed))
         try:
             for page, value in self.page_finder.iteritems():
@@ -291 +301 @@
              wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
             
-    
+  
     def _on_single_fit(self,id=None,qmin=None,qmax=None,ymin=None,ymax=None):
         """ 
@@ -344 +354 @@
                 #of parameter names in the list      
         try:
-            result=self.fitter.fit()
-            #self._single_fit_completed(result,pars,current_pg,qmin,qmax)
-            #print "single_fit: result",result.fitness,result.pvec,result.stderr
-            #self._single_fit_completed(result,pars,page,qmin,qmax)
-            self._single_fit_completed(result,pars,page_fitted,qmin,qmax,ymin,ymax)
+            # If a thread is already started, stop it
+            if self.calc_thread != None and self.calc_thread.isrunning():
+                self.calc_thread.stop()
+                    
+            self.calc_thread =FitThread(parent =self.parent,
+                                        fn= self.fitter,
+                                        pars= pars,
+                                        cpage= page_fitted,
+                                       qmin=qmin,
+                                       qmax=qmax,
+                                       ymin= ymin,
+                                       ymax= ymax,
+                                       completefn=self._single_fit_completed,
+                                       updatefn=None)
+            self.calc_thread.queue()
+            self.calc_thread.ready(2.5)
+            #while not self.done:
+                #print "when here"
+             #   time.sleep(1)
+            
+           
         except:
             raise
@@ -412 +438 @@
         #Do the simultaneous fit
         try:
-            result=self.fitter.fit()
-            self._simul_fit_completed(result,qmin,qmax,ymin,ymax)
+            # If a thread is already started, stop it
+            if self.calc_thread != None and self.calc_thread.isrunning():
+                self.calc_thread.stop()
+                    
+            self.calc_thread =FitThread(parent =self.parent,
+                                        fn= self.fitter,
+                                       qmin=qmin,
+                                       qmax=qmax,
+                                       ymin= ymin,
+                                       ymax= ymax,
+                                       completefn= self._simul_fit_completed,
+                                       updatefn=None)
+            self.calc_thread.queue()
+            self.calc_thread.ready(2.5)
+            
         except:
             wx.PostEvent(self.parent, StatusEvent(status="Simultaneous Fitting error: %s" % sys.exc_value))
@@ -479 +518 @@
         self.plot_helper(currpage=page,qmin= qmin,qmax= qmax)
         
-    def plot_helper(self,currpage,qmin=None,qmax=None,ymin=None,ymax=None):
+    def plot_helper(self,currpage, fitModel=None, qmin=None,qmax=None,ymin=None,ymax=None):
         """
             Plot a theory given a model and data
@@ -654 +693 @@
                 except:
                     raise
-    def update(self, output,elapsed):
-        print "Got an update", elapsed
-        wx.PostEvent(self.parent, StatusEvent(status="Plot \
-        updating ... %g sec" % elapsed))
+    def update(self, output,time):
+        pass
     
     def complete(self, output, elapsed, model, qmin, qmax):
-        #printEVT("Calc complete in %g sec" % elapsed) 
+       
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))
@@ -723 +760 @@
                                        qmax=qmax,
                             completefn=self.complete,
-                            updatefn=self.update)
+                            updatefn=None)
             self.calc_thread.queue()
             self.calc_thread.ready(2.5)