Changeset 88b5e83 in sasview for park_integration/ScipyFitting.py

Timestamp:

Apr 27, 2009 10:08:05 AM (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:

90db8e8

Parents:

da26c1a

Message:

working on stop button

File:

• park_integration/ScipyFitting.py (modified) (4 diffs)

park_integration/ScipyFitting.py

@@ -4 +4 @@
     simple fit with scipy optimizer.
 """
-#import scipy.linalg
+
 import numpy 
-
-from Loader import Load
 from scipy import optimize
 
 from AbstractFitEngine import FitEngine, sansAssembly,FitAbort
-print "in ScipyFitting fitabort",id(FitAbort),FitAbort.__class__.__module__
 
 class fitresult:
@@ -28 +25 @@
     parameters= None
     
-class old_FitAbort(Exception):
-    """
-        Exception raise to stop the fit
-    """
+
 class ScipyFit(FitEngine):
     """ 
@@ -103 +97 @@
                     result.stderr  = stderr
                     result.pvec = out
-                    result.success =success
+                    result.success = success
                     return result
             else:  
@@ -110 +104 @@
             ## fit engine is stop
             print "fitabort====>"
-            return None
+            #raise
+            return
         
         except:
-            return Fitresult()
+            raise
        
 def profile(fn, *args, **kw):