Changeset 88b5e83 in sasview


Ignore:
Timestamp:
Apr 27, 2009 10:08:05 AM (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:
90db8e8
Parents:
da26c1a
Message:

working on stop button

Location:
park_integration
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • park_integration/AbstractFitEngine.py

    r4bd557d r88b5e83  
    397397        if self.curr_thread != None : 
    398398            try: 
    399                  self.curr_thread.isquit() 
     399                self.curr_thread.isquit() 
    400400            except: 
    401401                raise FitAbort,"stop leastsqr optimizer" 

  • park_integration/ScipyFitting.py

    r4bd557d r88b5e83  
    44    simple fit with scipy optimizer. 
    55""" 
    6 #import scipy.linalg 
     6 
    77import numpy  
    8  
    9 from Loader import Load 
    108from scipy import optimize 
    119 
    1210from AbstractFitEngine import FitEngine, sansAssembly,FitAbort 
    13 print "in ScipyFitting fitabort",id(FitAbort),FitAbort.__class__.__module__ 
    1411 
    1512class fitresult: 
    … …  
    2825    parameters= None 
    2926     
    30 class old_FitAbort(Exception): 
    31     """ 
    32         Exception raise to stop the fit 
    33     """ 
     27 
    3428class ScipyFit(FitEngine): 
    3529    """  
    … …  
    10397                    result.stderr  = stderr 
    10498                    result.pvec = out 
    105                     result.success =success 
     99                    result.success = success 
    106100                    return result 
    107101            else:   
    … …  
    110104            ## fit engine is stop 
    111105            print "fitabort====>" 
    112             return None 
     106            #raise 
     107            return 
    113108         
    114109        except: 
    115             return Fitresult() 
     110            raise 
    116111        
    117112def profile(fn, *args, **kw): 
Note: See TracChangeset for help on using the changeset viewer.