Changeset e3efa6b3 in sasview for src/sans/perspectives/fitting

Timestamp:

May 15, 2014 11:23:22 AM (11 years ago)

Author:

pkienzle

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:

4e9f227

Parents:

76f132a

Message:

restructure bumps wrapper and add levenberg-marquardt

File:

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

src/sans/perspectives/fitting/fit_thread.py

@@ -18 +18 @@
     
     def __init__(self, 
-                  fn,
-                  page_id,
-                   handler,
-                    batch_outputs,
-                    batch_inputs=None,             
-                  pars=None,
+                 fn,
+                 page_id,
+                 handler,
+                 batch_outputs,
+                 batch_inputs=None,
+                 pars=None,
                  completefn = None,
                  updatefn   = None,
@@ -30 +30 @@
                  ftol       = None,
                  reset_flag = False):
-        CalcThread.__init__(self,completefn,
+        CalcThread.__init__(self,
+                 completefn,
                  updatefn,
                  yieldtime,
@@ -80 +81 @@
                 list_map_get_attr.append(map_getattr)
             #from multiprocessing import Pool
-            inputs = zip(list_map_get_attr,self.fitter, list_fit_function,
-                          list_q, list_q, list_handler,list_curr_thread,list_ftol,
+            inputs = zip(list_map_get_attr, self.fitter, list_fit_function,
+                         list_q, list_q, list_handler,list_curr_thread,list_ftol,
                          list_reset_flag)
             result =  map(map_apply, inputs)
@@ -87 +88 @@
             self.complete(result=result,
                           batch_inputs=self.batch_inputs,
-                           batch_outputs=self.batch_outputs,
+                          batch_outputs=self.batch_outputs,
                           page_id=self.page_id,
                           pars = self.pars,