Changeset 386ffe1 in sasview for src/sas/perspectives/fitting/fit_thread.py

Timestamp:

Feb 20, 2015 5:02:38 AM (9 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:

cda1cf8

Parents:

018582f

Message:

remove scipy levenburg marquardt and park from ui

File:

• src/sas/perspectives/fitting/fit_thread.py (modified) (5 diffs)

src/sas/perspectives/fitting/fit_thread.py

@@ -28 +28 @@
                  yieldtime  = 0.03,
                  worktime   = 0.03,
-                 ftol       = None,
                  reset_flag = False):
         CalcThread.__init__(self,
@@ -44 +43 @@
         self.updatefn = updatefn
         #Relative error desired in the sum of squares.
-        self.ftol = ftol
         self.reset_flag = reset_flag
    
@@ -67 +65 @@
             list_handler = []
             list_curr_thread = [] 
-            list_ftol = []
             list_reset_flag = []
             list_map_get_attr = []
@@ -76 +73 @@
                 list_q.append(None)
                 list_curr_thread.append(self)
-                list_ftol.append(self.ftol)
                 list_reset_flag.append(self.reset_flag)
                 list_fit_function.append('fit')
@@ -82 +78 @@
             #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,
+                         list_q, list_q, list_handler,list_curr_thread,
                          list_reset_flag)
             result =  map(map_apply, inputs)