Changeset ba7dceb in sasview

Timestamp:

Oct 18, 2011 9:16:37 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:

15f68ce

Parents:

c935fac

Message:

prepare fitting engine for multiprocessing

Location:

park_integration/src/sans/fit

Files:

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

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -416 +416 @@
     """
     def __init__(self, paramlist, model=None , data=None, fitresult=None,
-                 handler=None, curr_thread=None):
+                 handler=None, curr_thread=None, msg_q=None):
         """
         :param Model: the model wrapper fro sans -model
@@ -425 +425 @@
         self.data  = data
         self.paramlist = paramlist
+        self.msg_q = msg_q
         self.curr_thread = curr_thread
         self.handler = handler
@@ -467 +468 @@
             return self.res
         self.res = self.true_res       
-        if self.fitresult is not None and  self.handler is not None:
+        
+        if self.fitresult is not None:
             self.fitresult.set_model(model=self.model)
             self.fitresult.residuals = self.true_res
             self.fitresult.theory = theory
+           
             #fitness = self.chisq(params=params)
             fitness = self.chisq()
             self.fitresult.pvec = params
             self.fitresult.set_fitness(fitness=fitness)
-            self.handler.set_result(result=self.fitresult)
-            self.handler.update_fit()
+            if self.msg_q is not None:
+                self.msg_q.put(self.fitresult)
+                
+            if self.handler is not None:
+                self.handler.set_result(result=self.fitresult)
+                self.handler.update_fit()
 
             if self.curr_thread != None :

park_integration/src/sans/fit/Fitting.py

@@ -50 +50 @@
             raise ValueError, "enter the keyword scipy or park"
 
-    def fit(self, q=None, handler=None, 
+    def fit(self, msg_q=None, q=None, handler=None, 
                         curr_thread=None, 
                         ftol=1.49012e-8,
                         reset_flag=False):
         """Perform the fit """
-        return self._engine.fit(q, handler, curr_thread=curr_thread,
+        return self._engine.fit(msg_q=msg_q, 
+                                q=q, handler=handler, curr_thread=curr_thread,
                                 ftol=ftol, reset_flag=reset_flag)
      

park_integration/src/sans/fit/ParkFitting.py

@@ -382 +382 @@
         
   
-    def fit(self, q=None, handler=None, curr_thread=None, 
+    def fit(self, msg_q=None, 
+            q=None, handler=None, curr_thread=None, 
                                         ftol=1.49012e-8, reset_flag=False):
         """

park_integration/src/sans/fit/ScipyFitting.py

@@ -56 +56 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self, q=None, handler=None, curr_thread=None, 
+    def fit(self, msg_q=None,
+            q=None, handler=None, curr_thread=None, 
             ftol=1.49012e-8, reset_flag=False):
         """
@@ -96 +97 @@
             from scipy import optimize
             
-            functor = SansAssembly(self.param_list, model, data, handler=handler,\
-                         fitresult=result, curr_thread= curr_thread)
+            functor = SansAssembly(paramlist=self.param_list, 
+                                   model=model, 
+                                   data=data,
+                                    handler=handler,
+                                    fitresult=result,
+                                     curr_thread=curr_thread,
+                                     msg_q=msg_q)
             out, cov_x, _, mesg, success = optimize.leastsq(functor,
                                             model.get_params(self.param_list),