Changeset 6963aa3 in sasview


Ignore:
Timestamp:
Apr 27, 2009 3:50:35 PM (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:
8077fc4
Parents:
43d00c4
Message:

remove stop option

Location:
park_integration
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • park_integration/AbstractFitEngine.py

    r90db8e8 r6963aa3  
    395395        self.model.setParams(self.paramlist,params) 
    396396        self.res= self.data.residuals(self.model.eval) 
    397         if self.curr_thread != None : 
    398             try: 
    399                 self.curr_thread.isquit() 
    400             except: 
    401                 raise FitAbort,"stop leastsqr optimizer" 
    402                  
     397        #if self.curr_thread != None : 
     398        #    try: 
     399        #        self.curr_thread.isquit() 
     400        #    except: 
     401        #        raise FitAbort,"stop leastsqr optimizer"  
    403402        return self.res 
    404403     

  • park_integration/ScipyFitting.py

    r88b5e83 r6963aa3  
    103103        except FitAbort: 
    104104            ## fit engine is stop 
    105             print "fitabort====>" 
    106             #raise 
    107             return 
     105            return None 
    108106         
    109107        except: 
Note: See TracChangeset for help on using the changeset viewer.