Changes in src/sans/fit/Fitting.py [5777106:e3efa6b3] in sasview

File:

• src/sans/fit/Fitting.py (modified) (5 diffs)

src/sans/fit/Fitting.py

@@ -8 +8 @@
 from sans.fit.ScipyFitting import ScipyFit
 from sans.fit.ParkFitting import ParkFit
+from sans.fit.BumpsFitting import BumpsFit
 
+ENGINES={
+    'scipy': ScipyFit,
+    'park': ParkFit,
+    'bumps': BumpsFit,
+}
 
 class Fit(object):
@@ -26 +32 @@
         
     """  
-    def __init__(self, engine='scipy'):
+    def __init__(self, engine='scipy', *args, **kw):
         """
         """
@@ -32 +38 @@
         self._engine = None
         self.fitter_id = None
-        self.set_engine(engine)
+        self.set_engine(engine, *args, **kw)
           
     def __setattr__(self, name, value):
@@ -49 +55 @@
             self.__dict__[name] = value
                 
-    def set_engine(self, word):
+    def set_engine(self, word, *args, **kw):
         """
         Select the type of Fit 
@@ -59 +65 @@
              
         """
-        if word == "scipy":
-            self._engine = ScipyFit()
-        elif word == "park":
-            self._engine = ParkFit()
-        else:
-            raise ValueError, "enter the keyword scipy or park"
+        try:
+            self._engine = ENGINES[word](*args, **kw)
+        except KeyError, exc:
+            raise KeyError("fit engine should be one of scipy, park or bumps")
 
     def fit(self, msg_q=None, q=None, handler=None,