Changes in src/sans/fit/Fitting.py [e3efa6b3:5777106] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sans/fit/Fitting.py
re3efa6b3 r5777106 8 8 from sans.fit.ScipyFitting import ScipyFit 9 9 from sans.fit.ParkFitting import ParkFit 10 from sans.fit.BumpsFitting import BumpsFit11 10 12 ENGINES={13 'scipy': ScipyFit,14 'park': ParkFit,15 'bumps': BumpsFit,16 }17 11 18 12 class Fit(object): … … 32 26 33 27 """ 34 def __init__(self, engine='scipy' , *args, **kw):28 def __init__(self, engine='scipy'): 35 29 """ 36 30 """ … … 38 32 self._engine = None 39 33 self.fitter_id = None 40 self.set_engine(engine , *args, **kw)34 self.set_engine(engine) 41 35 42 36 def __setattr__(self, name, value): … … 55 49 self.__dict__[name] = value 56 50 57 def set_engine(self, word , *args, **kw):51 def set_engine(self, word): 58 52 """ 59 53 Select the type of Fit … … 65 59 66 60 """ 67 try: 68 self._engine = ENGINES[word](*args, **kw) 69 except KeyError, exc: 70 raise KeyError("fit engine should be one of scipy, park or bumps") 61 if word == "scipy": 62 self._engine = ScipyFit() 63 elif word == "park": 64 self._engine = ParkFit() 65 else: 66 raise ValueError, "enter the keyword scipy or park" 71 67 72 68 def fit(self, msg_q=None, q=None, handler=None,
Note: See TracChangeset
for help on using the changeset viewer.