Changeset 06e7c26 in sasview for park_integration/src/sans

Timestamp:

Dec 2, 2011 12:03:01 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:

7a7dbf4

Parents:

fa4885f9

Message:

fixed combined/batch

Location:

park_integration/src/sans/fit

Files:

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

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -557 +557 @@
         #Dictionnary of fitArrange element (fit problems)
         self.fit_arrange_dict = {}
+        self.fitter_id = None
         
     def set_model(self, model,  id,  pars=[], constraints=[], data=None):
@@ -787 +788 @@
     def __init__(self, model=None, param_list=None, data=None):
         self.calls = None
+        self.pars = []
         self.fitness = None
         self.chisqr = None
@@ -805 +807 @@
         self.iterations = 0
         self.inputs = []
+        self.fitter_id = None
         if self.model is not None and self.data is not None:
             self.inputs = [(self.model, self.data)]

park_integration/src/sans/fit/Fitting.py

@@ -10 +10 @@
 
 
-class Fit:
+class Fit(object):
     """ 
     Wrap class that allows to select the fitting type.this class 
@@ -31 +31 @@
         #self._engine will contain an instance of ScipyFit or ParkFit
         self._engine = None
+        self.fitter_id = None
         self.set_engine(engine)
           
+    def __setattr__(self, name, value):
+        """
+        set fitter_id and its engine at the same time
+        """
+        if name == "fitter_id":
+            self.__dict__[name] = value
+            if hasattr(self, "_engine") and self._engine is not None:
+                self._engine.fitter_id = value    
+        elif name == "_engine":
+            self.__dict__[name] = value
+            if hasattr(self, "fitter_id") and self.fitter_id is not None:
+                self._engine.fitter_id = self.fitter_id
+        else:
+            self.__dict__[name] = value
+                
     def set_engine(self, word):
         """

park_integration/src/sans/fit/ParkFitting.py

@@ -425 +425 @@
             residuals, theory = m.fitness.residuals()
             small_result = FResult(model=m.model, data=m.data.sans_data)
+            small_result.fitter_id = self.fitter_id
             small_result.theory = theory
             small_result.residuals = residuals

park_integration/src/sans/fit/ScipyFitting.py

@@ -90 +90 @@
         
         result = FResult(model=model, data=data, param_list=self.param_list)
+        result.pars = fitproblem[0].pars
+        result.fitter_id = self.fitter_id
         if handler is not None:
             handler.set_result(result=result)