Changeset e3efa6b3 in sasview for src/sans/fit/Fitting.py

Timestamp:

May 15, 2014 9:23:22 AM (10 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/fit/Fitting.py (modified) (4 diffs)

src/sans/fit/Fitting.py

@@ -32 +32 @@
         
     """  
-    def __init__(self, engine='scipy'):
+    def __init__(self, engine='scipy', *args, **kw):
         """
         """
@@ -38 +38 @@
         self._engine = None
         self.fitter_id = None
-        self.set_engine(engine)
+        self.set_engine(engine, *args, **kw)
           
     def __setattr__(self, name, value):
@@ -55 +55 @@
             self.__dict__[name] = value
                 
-    def set_engine(self, word):
+    def set_engine(self, word, *args, **kw):
         """
         Select the type of Fit 
@@ -66 +66 @@
         """
         try:
-            self._engine = ENGINES[word]()
+            self._engine = ENGINES[word](*args, **kw)
         except KeyError, exc:
             raise KeyError("fit engine should be one of scipy, park or bumps")