Changeset 2f4b430 in sasview for src/sas/perspectives/fitting/fit_thread.py

Timestamp:

Mar 4, 2015 3:39:45 PM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

74f419d

Parents:

2f732b0

Message:

Take care of white spaces (pylint)

File:

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

src/sas/perspectives/fitting/fit_thread.py

@@ -9 +9 @@
     Execute class.function and return result
     """
-    return  getattr(classInstance,classFunc)(*args)
+    return  getattr(classInstance, classFunc)(*args)
 
 def map_apply(arguments):
@@ -16 +16 @@
 class FitThread(CalcThread):
     """Thread performing the fit """
-    
-    def __init__(self, 
+
+    def __init__(self,
                  fn,
                  page_id,
@@ -24 +24 @@
                  batch_inputs=None,
                  pars=None,
-                 completefn = None,
-                 updatefn   = None,
-                 yieldtime  = 0.03,
-                 worktime   = 0.03,
-                 reset_flag = False):
+                 completefn=None,
+                 updatefn=None,
+                 yieldtime=0.03,
+                 worktime=0.03,
+                 reset_flag=False):
         CalcThread.__init__(self,
                  completefn,
@@ -44 +44 @@
         #Relative error desired in the sum of squares.
         self.reset_flag = reset_flag
-   
+
     def isquit(self):
         """
         :raise KeyboardInterrupt: when the thread is interrupted
-        
+
         """
         try:
@@ -55 +55 @@
             msg = "Fitting: terminated by the user."
             raise KeyboardInterrupt, msg
-       
+
     def compute(self):
         """
-        Perform a fit 
+        Perform a fit
         """
         msg = ""
@@ -64 +64 @@
             import copy
             list_handler = []
-            list_curr_thread = [] 
+            list_curr_thread = []
             list_reset_flag = []
             list_map_get_attr = []
@@ -78 +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_q, list_q, list_handler, list_curr_thread,
                          list_reset_flag)
-            result =  map(map_apply, inputs)
-    
+            result = map(map_apply, inputs)
+
             self.complete(result=result,
                           batch_inputs=self.batch_inputs,
                           batch_outputs=self.batch_outputs,
                           page_id=self.page_id,
-                          pars = self.pars,
-                          elapsed=time.time()-self.starttime)
-           
+                          pars=self.pars,
+                          elapsed=time.time() - self.starttime)
+
         except KeyboardInterrupt, msg:
             # Thread was interrupted, just proceed and re-raise.
@@ -95 +95 @@
             #Stop on exception during fitting. Todo: need to put 
             #some mssg and reset progress bar.
-            
+
             if self.handler is not None:
                 self.handler.stop(msg=msg)
@@ -102 +102 @@
             if self.handler is not None:
                 self.handler.error(msg=traceback.format_exc())
-           
-        
-    
+
+
+