Changeset ba7dceb in sasview for park_integration/src/sans/fit/AbstractFitEngine.py

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

File:

• park_integration/src/sans/fit/AbstractFitEngine.py (modified) (3 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 :