Changeset 15f68ce in sasview for park_integration/src/sans/fit


Ignore:
Timestamp:
Oct 18, 2011 10:43:19 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:
74dc0a4
Parents:
ba7dceb
Message:

trying to fix scipy result handling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • park_integration/src/sans/fit/ScipyFitting.py

    rba7dceb r15f68ce  
    128128            raise 
    129129        chisqr = functor.chisq() 
     130 
    130131        if cov_x is not None and numpy.isfinite(cov_x).all(): 
    131132            stderr = numpy.sqrt(numpy.diag(cov_x)) 
    132133        else: 
    133             stderr = None 
     134            stderr = [] 
    134135             
    135136        result.index = data.idx 
    136         if not (numpy.isnan(out).any()) and (cov_x != None): 
    137             result.fitness = chisqr 
    138             result.stderr  = stderr 
    139             result.pvec = out 
    140             result.success = success 
    141             result.theory = functor.theory 
    142             #print "scipy", result.inputs 
    143             if q is not None: 
    144                 q.put(result) 
    145                 return q 
    146             if success < 1 or success > 5: 
    147                 result = None 
     137        result.fitness = chisqr 
     138        result.stderr  = stderr 
     139        result.pvec = out 
     140        result.success = success 
     141        result.theory = functor.theory 
     142        if q is not None: 
     143            q.put(result) 
     144            return q 
     145        if success < 1 or success > 5: 
     146            result.fitness = None 
    148147        return [result] 
    149         """ 
    150         else: 
    151             return None 
    152         """ 
    153         # Error will be present to the client, not here  
    154         #else:   
    155         #    raise ValueError, "SVD did not converge" + str(mesg) 
     148 
    156149         
    157150    def _check_param_range(self, model): 
Note: See TracChangeset for help on using the changeset viewer.