Changeset 444c900e in sasview for park_integration/src/sans/fit/ParkFitting.py

Timestamp:

Oct 11, 2011 5:51:37 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:

6a4002d

Parents:

d59cb8c

Message:

make sure result similar for both engine

File:

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

park_integration/src/sans/fit/ParkFitting.py

@@ -25 +25 @@
 #from Loader import Load
 from sans.fit.AbstractFitEngine import FitEngine
+from sans.fit.AbstractFitEngine import FResult
   
 class SansFitResult(fitresult.FitResult):
@@ -208 +209 @@
 class MyAssembly(Assembly):
     def __init__(self, models, curr_thread=None):
-        Assembly.__init__(self, models)
+        """Build an assembly from a list of models."""
+        self.parts = []
+        for m in models:
+            self.parts.append(SansPart(m))
         self.curr_thread = curr_thread
         self.chisq = None
         self._cancel = False
         self.theory = None
+        self._reset()
         
     def fit_parameters(self):
@@ -398 +403 @@
         if handler == None:
             handler = fitresult.ConsoleUpdate(improvement_delta=0.1)
+        
+        result_list = []
         try:
             result = fit.fit(self.problem, fitter=fitter, handler=handler)
             self.problem.all_results(result)
+            
         except LinAlgError:
             raise ValueError, "SVD did not converge"
-            
-        if result != None:
-            if q != None:
-                q.put(result)
-                return q
-            return result
-        else:
-            raise ValueError, "SVD did not converge"
-            
+    
+        for m in self.problem.parts:
+            residuals, theory = m.fitness.residuals()
+            small_result = FResult(model=m.model, data=m.data.sans_data)
+            small_result.theory = theory
+            small_result.residuals = residuals
+            small_result.pvec = []
+            small_result.cov = []
+            small_result.stderr = []
+            small_result.param_list = []
+            small_result.residuals = m.residuals
+            if result is not None:
+                for p in result.parameters:
+                    if p.data.name == small_result.data.name:
+                        small_result.index = m.data.idx
+                        small_result.fitness = result.fitness
+                        small_result.pvec.append(p.value)
+                        small_result.stderr.append(p.stderr)
+                        name = p.name.split('.')[1].strip()
+                        small_result.param_list.append(name)
+            result_list.append(small_result)    
+        if q != None:
+            q.put(result)
+            return q
+        print "park", len(result_list)
+        return result_list
+