Changeset acfff8b in sasview

Timestamp:

May 22, 2011 10:49:16 AM (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:

247873a

Parents:

66141a0

Message:

made let minpack raise: this way is more stable than handle it by our fitengine

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (1 diff)
• ScipyFitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -474 +474 @@
                     self.curr_thread.isquit()
                 except:
-                    msg = "Fitting Aborted...  Please ignore the '" 
-                    msg += "Functor Error' recoded in the log file."
+                    msg = "Fitting: Terminated...       Note: Forcing to stop " 
+                    msg += "fitting may cause a 'Functor error message' "
+                    msg += "being recorded in the log file....."
                     self.handler.error(msg)
                     raise

park_integration/ScipyFitting.py

@@ -144 +144 @@
                                                     full_output=1,
                                                     warning=True)
-        except:
-            if hasattr(sys, 'last_type') and sys.last_type == FitAbort:
+        except KeyboardInterrupt:
+            msg = "Fitting: Terminated!!!"
+            handler.error(msg)
+            raise KeyboardInterrupt, msg #<= more stable
+            #less stable below
+            """
+            if hasattr(sys, 'last_type') and sys.last_type == KeyboardInterrupt:
                 if handler is not None:
-                    msg = "Fit Stop!"
-                    #self.handler.error(msg)
+                    msg = "Fitting: Terminated!!!"
+                    handler.error(msg)
                     result = handler.get_result()
                     return result
             else:
                 raise 
-       
+            """
         chisqr = functor.chisq()
         if cov_x is not None and numpy.isfinite(cov_x).all():