Changeset 386ffe1 in sasview for src/sas/fit/Fitting.py

Timestamp:

Feb 20, 2015 3: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/fit/Fitting.py (modified) (5 diffs)

src/sas/fit/Fitting.py

@@ -1 +1 @@
 """
-Class Fit contains ScipyFit and ParkFit methods declaration
-allows to create instance of type ScipyFit or ParkFit to perform either
-a park fit or a scipy fit.
+Class Fit contains fitting engine methods declaration
 """
 
-#from scipy import optimize
-from sas.fit.ScipyFitting import ScipyFit
-from sas.fit.ParkFitting import ParkFit
 from sas.fit.BumpsFitting import BumpsFit
 
 ENGINES={
-    'scipy': ScipyFit,
-    'park': ParkFit,
     'bumps': BumpsFit,
 }
@@ -23 +16 @@
         from sas.fit.Fitting import Fit
         fitter= Fit()
-        fitter.fit_engine('scipy') or fitter.fit_engine('park')
+        fitter.fit_engine('bumps')
         engine = fitter.returnEngine()
         engine.set_data(data,id)
@@ -32 +25 @@
         
     """  
-    def __init__(self, engine='scipy', *args, **kw):
+    def __init__(self, engine='bumps', *args, **kw):
         """
         """
-        #self._engine will contain an instance of ScipyFit or ParkFit
         self._engine = None
         self.fitter_id = None
@@ -61 +53 @@
         :param word: the keyword to select the fit type 
         
-        :raise: if the user does not enter 'scipy' or 'park',
-             a valueError is raised 
-             
+        :raise: KeyError if the user does not enter an available engine
+
         """
         try:
             self._engine = ENGINES[word](*args, **kw)
         except KeyError, exc:
-            raise KeyError("fit engine should be one of scipy, park or bumps")
+            raise KeyError("fit engine should be bumps")
+            #raise KeyError("fit engine should be one of "+", ".join(sorted(ENGINES.keys())))
 
     def fit(self, msg_q=None, q=None, handler=None, 
@@ -75 +67 @@
                         reset_flag=False):
         """Perform the fit """
-        return self._engine.fit(msg_q=msg_q, 
+        return self._engine.fit(msg_q=msg_q,
                                 q=q, handler=handler, curr_thread=curr_thread,
                                 ftol=ftol, reset_flag=reset_flag)