Changeset 634ca14 in sasview

Timestamp:

Oct 5, 2011 11:15:32 AM (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

Location:

park_integration/src/sans/fit

Files:

• AbstractFitEngine.py (modified) (4 diffs)
• Fitting.py (modified) (1 diff)
• ParkFitting.py (modified) (3 diffs)
• ScipyFitting.py (modified) (5 diffs)

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -170 +170 @@
     a way to get residuals from data.
     """
-    def __init__(self, x, y, dx=None, dy=None, smearer=None):
+    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None):
         """
         :param smearer: is an object of class QSmearer or SlitSmearer
@@ -191 +191 @@
         """
         Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
-        
+        self.sans_data = data
         self.smearer = smearer
         self._first_unsmeared_bin = None
@@ -309 +309 @@
         self.radius = 0
         self.res_err_data = []
+        self.sans_data = sans_data2d
         self.set_data(sans_data2d)
 
@@ -625 +626 @@
             fitdata = FitData1D(x=data.x, y=data.y ,
                                  dx=data.dx, dy=data.dy, smearer=smearer)
+        fitdata.sans_data = data
        
         fitdata.set_fit_range(qmin=qmin, qmax=qmax)

park_integration/src/sans/fit/Fitting.py

@@ -55 +55 @@
                                 ftol=ftol)
      
-    def set_model(self, model, id, pars=[], constraints=[]):
+    def set_model(self, model, id, pars=[], constraints=[], data=None):
         """
         store a model model to fit at the position id of the fit engine
         """
-        self._engine.set_model(model, id, pars, constraints)
+        self._engine.set_model(model, id, pars, constraints, data=data)
    
     def set_data(self, data, id, smearer=None, qmin=None, qmax=None):

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:

park_integration/src/sans/fit/ScipyFitting.py

@@ -14 +14 @@
 from sans.fit.AbstractFitEngine import SansAssembly
 from sans.fit.AbstractFitEngine import FitAbort
+from sans.fit.AbstractFitEngine import Model
 IS_MAC = True
 if sys.platform.count("win32") > 0:
@@ -22 +23 @@
     Storing fit result
     """
-    def __init__(self, model=None, param_list=None):
+    def __init__(self, model=None, param_list=None, data=None):
         self.calls = None
         self.fitness = None
@@ -34 +35 @@
         self.parameters = None
         self.is_mac = IS_MAC
+        if issubclass(model.__class__, Model):
+            model = model.model
         self.model = model
+        self.data = data
         self.param_list = param_list
         self.iterations = 0
+        
+        self.inputs = [(self.model, self.data)]
      
     def set_model(self, model):
@@ -139 +145 @@
         self._check_param_range(model)
         
-        result = fitresult(model=model, param_list=self.param_list)
+        result = fitresult(model=model, data=data.sans_data, param_list=self.param_list)
         if handler is not None:
             handler.set_result(result=result)
@@ -182 +188 @@
             result.pvec = out
             result.success = success
+            print "scipy", result.inputs
             if q is not None:
                 q.put(result)