Changeset 2d0756a5 in sasview for park_integration/src/sans/fit


Ignore:
Timestamp:
Apr 26, 2012 11:23:33 AM (13 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:
0318c4f
Parents:
e26719b
Message:

fixed fit/stop button behavior

File:
1 edited

Legend:

Unmodified
Added
Removed

  • park_integration/src/sans/fit/ScipyFitting.py

    r0e8fca0 r2d0756a5  
    110110                                                    ftol=ftol, 
    111111                                                    full_output=1) 
    112  
    113         except KeyboardInterrupt: 
    114             msg = "Fitting: Terminated!!!" 
    115             handler.error(msg) 
    116             raise KeyboardInterrupt, msg #<= more stable 
    117             #less stable below 
    118             """ 
     112        except: 
    119113            if hasattr(sys, 'last_type') and sys.last_type == KeyboardInterrupt: 
    120114                if handler is not None: 
    121115                    msg = "Fitting: Terminated!!!" 
    122116                    handler.error(msg) 
    123                     result = handler.get_result() 
    124                     return result 
     117                    raise KeyboardInterrupt, msg 
    125118            else: 
    126                 raise  
    127             """ 
    128         except: 
    129             raise 
     119                raise 
    130120        chisqr = functor.chisq() 
    131121 
Note: See TracChangeset for help on using the changeset viewer.