Changeset 634ca14 in sasview for park_integration/src/sans/fit/ParkFitting.py

Timestamp:

Oct 5, 2011 1:15:32 PM (13 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:

d91d2c9

Parents:

41661a0

Message:

making sure each result know it data and model

File:

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

park_integration/src/sans/fit/ParkFitting.py

@@ -24 +24 @@
 from sans.fit.AbstractFitEngine import FitEngine
   
+class SansFitResult(fitresult.FitResult):
+    def __init__(self, *args, **kwrds):
+        fitresult.FitResult.__init__(self, *args, **kwrds)
+        self.inputs = []
+        
 class SansFitSimplex(FitSimplex):
     """
@@ -57 +62 @@
         fitpars = [SansFitParameter(pars[i].name,pars[i].range,v, pars[i].model, pars[i].data)
                    for i,v in enumerate(result.x)]
-        res = fitresult.FitResult(fitpars, result.calls, result.fx)
+        res = SansFitResult(fitpars, result.calls, result.fx)
+        res.inputs = [(pars[i].model, pars[i].data) for i,v in enumerate(result.x)]
         # Compute the parameter uncertainties from the jacobian
         res.calc_cov(fitness)
@@ -384 +390 @@
         self.problem.all_results(result)
         
-        #print "park------", self.problem.parts
+        #print "park------", result.inputs
+        #for (model, data) in result.inputs:
+        #    print model.name, data.name
+        #for p in result.parameters:
+        #    print "simul ----", p , p.__class__, p.model.name, p.data.name
    
         if result != None: