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

Timestamp:

Apr 24, 2009 4:40:05 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:

da26c1a

Parents:

4bd557d

Message:

working on stopping scipy fit

File:

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

sansview/perspectives/fitting/fitting.py

@@ -354 +354 @@
             Stop the fit engine
         """
-        if self.calc_fit!= None and self.calc_thread.isrunning():
-            self.calc_thread.stop()
+        if self.calc_fit!= None and self.calc_fit.isrunning():
+            self.calc_fit.stop()
             wx.PostEvent(self.parent, StatusEvent(status="Fitting  \
                 is cancelled" , type="stop"))
@@ -681 +681 @@
       
         try:
+            if result ==None:
+                msg= "Simple Fitting Stop !!!"
+                wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+                return
             if numpy.any(result.pvec ==None )or not numpy.all(numpy.isfinite(result.pvec) ):
-                msg= "Fitting did not converge!!!"
+                msg= "Single Fitting did not converge!!!"
                 wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
                 return
@@ -727 +731 @@
         ## fit more than 1 model at the same time 
         try:
+            if result ==None:
+                msg= "Complex Fitting Stop !!!"
+                wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+                return
+            if numpy.any(result.pvec ==None )or not numpy.all(numpy.isfinite(result.pvec) ):
+                msg= "Single Fitting did not converge!!!"
+                wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+                return
             for page, value in self.page_finder.iteritems():
                 if value.get_scheduled()==1: