Changeset e03a14e in sasview for park_integration/src/sans/fit


Ignore:
Timestamp:
Oct 6, 2011 11:44:52 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:
763bec8
Parents:
e68bfef
Message:

think batch fit with park fixed

File:
1 edited

Legend:

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

    r425e49ca re03a14e  
    6767        # Compute the parameter uncertainties from the jacobian 
    6868        res.calc_cov(fitness) 
    69         res.theory = result.fx 
    7069        return res 
    7170       
     
    205204        self.chisq = None 
    206205        self._cancel = False 
     206        self.theory = None 
    207207         
    208208    def fit_parameters(self): 
     
    237237        calcpars = [SansFitParameter(p.path,p.range,p.value, p.model, p.data) 
    238238                    for p in self.parameterset.computed] 
    239         #print "all_results", calcpars 
    240239        result.parameters += calcpars 
     240        result.theory = self.theory 
    241241 
    242242    def eval(self): 
     
    274274            if self._cancel: return numpy.inf 
    275275            if m.isfitted and m.weight != 0: 
    276                 m.residuals, _ = m.fitness.residuals() 
     276                m.residuals, self.theory = m.fitness.residuals() 
    277277                N = len(m.residuals) 
    278278                m.degrees_of_freedom = N-k if N>k else 1 
Note: See TracChangeset for help on using the changeset viewer.