Changeset 511c6810 in sasview

Timestamp:

Mar 18, 2011 6:20:07 PM (14 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:

66ff250

Parents:

5080cda

Message:

working fit stop

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• Fitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (4 diffs)

park_integration/AbstractFitEngine.py

@@ -403 +403 @@
     Exception raise to stop the fit
     """
-    #print"Creating fit abort Exception"
 
 
@@ -450 +449 @@
         
         """
-        #import thread
         self.model.set_params(self.paramlist,params)
         self.res = self.data.residuals(self.model.eval)
         if self.fitresult is not None and  self.handler is not None:
             self.fitresult.set_model(model=self.model)
-            #fitness = self.chisq(params=params)
             fitness = self.chisq()
+            self.fitresult.pvec = params
             self.fitresult.set_fitness(fitness=fitness)
             self.handler.set_result(result=self.fitresult)
-            self.handler.update_fit()
-        
-        #if self.curr_thread != None :
-        #    try:
-        #        self.curr_thread.isquit()
-        #    except:
-        #        raise FitAbort,"stop leastsqr optimizer"    
+            #self.handler.update_fit()
+            if self.curr_thread != None :
+                try:
+                    self.curr_thread.isquit()
+                except:
+                    raise FitAbort,"stop leastsqr optimizer"        
         return self.res
     

park_integration/Fitting.py

@@ -52 +52 @@
     def fit(self, q=None, handler=None, curr_thread=None):
         """Perform the fit """
-        #try:
         return self._engine.fit(q, handler, curr_thread=curr_thread)
-        #except:
-        #    raise
-    
+     
     def set_model(self, model, id, pars=[], constraints=[]):
         """

park_integration/ScipyFitting.py

@@ -8 +8 @@
 
 import numpy 
+import sys
 from scipy import optimize
 
 from sans.fit.AbstractFitEngine import FitEngine
 from sans.fit.AbstractFitEngine import SansAssembly
-#from sans.fit.AbstractFitEngine import FitAbort
+from sans.fit.AbstractFitEngine import FitAbort
+
 
 class fitresult(object):
@@ -98 +100 @@
         self.param_list = []
         self.curr_thread = None
+        self.result = None
     #def fit(self, *args, **kw):
     #    return profile(self._fit, *args, **kw)
@@ -122 +125 @@
         data = listdata
         self.curr_thread = curr_thread
-        result = fitresult(model=model, param_list=self.param_list)
-        if handler is not None:
-            handler.set_result(result=result)
+        self.result = fitresult(model=model, param_list=self.param_list)
+        self.handler = handler
+        if self.handler is not None:
+            self.handler.set_result(result=self.result)
         #try:
-        functor = SansAssembly(self.param_list, model, data, handler=handler,
-                         fitresult=result, curr_thread= self.curr_thread)
-        out, cov_x, _, mesg, success = optimize.leastsq(functor,
+        functor = SansAssembly(self.param_list, model, data, handler=self.handler,
+                         fitresult=self.result, curr_thread= self.curr_thread)
+    
+        try:
+            out, cov_x, _, mesg, success = optimize.leastsq(functor,
                                             model.get_params(self.param_list),
                                                     ftol = 0.001,
                                                     full_output=1,
                                                     warning=True)
-  
+        except:
+            if sys.last_type == FitAbort:
+                if self.handler is not None:
+                    msg = "Fit Stop!"
+                    #self.handler.error(msg)
+                    self.result = self.handler.get_result()
+                    return self.result
+            else:
+                raise 
+       
         chisqr = functor.chisq()
         if cov_x is not None and numpy.isfinite(cov_x).all():
@@ -139 +154 @@
         else:
             stderr = None
+        
+        if (out is not None) and not (numpy.isnan(out).any()) \
+            and (cov_x != None):
+            self.result.fitness = chisqr
+            self.result.stderr  = stderr
+            self.result.pvec = out
+            self.result.success = success
+        else:  
+            msg = "SVD did not converge " + str(mesg)
+            #handler.error(msg)
+        return self.result
 
-        if not (numpy.isnan(out).any()) and (cov_x != None):
-            result.fitness = chisqr
-            result.stderr  = stderr
-            result.pvec = out
-            result.success = success
-            if q is not None:
-                q.put(result)
-                return q
-            return result
-        else:  
-            raise ValueError, "SVD did not converge" + str(mesg)
+