Changeset 33dd2e5 in sasview for fittingview/src/sans/perspectives/fitting/fit_thread.py

Timestamp:

Sep 12, 2011 4:37:40 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:

8523a1f2

Parents:

7afcae8

Message:

working on batch

File:

• fittingview/src/sans/perspectives/fitting/fit_thread.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/fit_thread.py

@@ -20 +20 @@
                   page_id,
                    handler,
-                   batch_result, 
+                    batch_outputs,
+                    batch_inputs=None,             
                   pars=None,
                  completefn = None,
@@ -34 +35 @@
         self.fitter = fn
         self.pars = pars
-        self.batch_result = batch_result
+        self.batch_inputs = batch_inputs
+        self.batch_outputs = batch_outputs
         self.page_id = page_id
         self.starttime = 0
@@ -57 +59 @@
         msg = ""
         try:
+            import copy
             list_handler = []
             list_curr_thread = [] 
@@ -72 +75 @@
             from multiprocessing import Pool
             inputs = zip(list_map_get_attr,self.fitter, list_fit_function,
-                         list_handler, list_q, list_curr_thread,list_ftol)
+                         list_handler, list_q, list_curr_thread, list_ftol)
             result =  Pool(1).map(func=map_apply, 
                                iterable=inputs)
-            #self.handler.starting_fit()
-            self.complete(result= result,
-                          batch_result=self.batch_result,
+            self.complete(result=result,
+                          batch_inputs=self.batch_inputs,
+                           batch_outputs=self.batch_outputs,
                           page_id=self.page_id,
                           pars = self.pars)