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

Timestamp:

Oct 6, 2011 1:44:52 PM (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:

• park_integration/src/sans/fit/ParkFitting.py (modified) (4 diffs)

park_integration/src/sans/fit/ParkFitting.py

@@ -67 +67 @@
         # Compute the parameter uncertainties from the jacobian
         res.calc_cov(fitness)
-        res.theory = result.fx
         return res
       
@@ -205 +204 @@
         self.chisq = None
         self._cancel = False
+        self.theory = None
         
     def fit_parameters(self):
@@ -237 +237 @@
         calcpars = [SansFitParameter(p.path,p.range,p.value, p.model, p.data)
                     for p in self.parameterset.computed]
-        #print "all_results", calcpars
         result.parameters += calcpars
+        result.theory = self.theory
 
     def eval(self):
@@ -274 +274 @@
             if self._cancel: return numpy.inf
             if m.isfitted and m.weight != 0:
-                m.residuals, _ = m.fitness.residuals()
+                m.residuals, self.theory = m.fitness.residuals()
                 N = len(m.residuals)
                 m.degrees_of_freedom = N-k if N>k else 1