Skip to content

Commit

Permalink
check 'models' in dict_attrs.keys()
Browse files Browse the repository at this point in the history
  • Loading branch information
patquem committed Jan 20, 2024
1 parent 004c3ea commit 8772030
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions fitspy/spectrum.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,20 @@ def set_attributes(self, dict_attrs, **fit_kwargs):
if key in fit_kwargs:
setattr(self, key, fit_kwargs[key])

self.models = []
for _, dict_model in dict_attrs['models'].items():
for model_name, param_hints in dict_model.items():
index = next(self.models_index)
model = MODELS[model_name]
prefix = f'm{index:02d}_'
if isinstance(model, Model):
model.name = model_name
model.prefix = prefix
else:
model = Model(model, independent_vars=['x'], prefix=prefix)
model.param_hints = param_hints
self.models.append(model)
if 'models' in keys:
self.models = []
for _, dict_model in dict_attrs['models'].items():
for model_name, param_hints in dict_model.items():
index = next(self.models_index)
model = MODELS[model_name]
pfx = f'm{index:02d}_'
if isinstance(model, Model):
model.name = model_name
model.prefix = pfx
else:
model = Model(model, independent_vars=['x'], prefix=pfx)
model.param_hints = param_hints
self.models.append(model)

if 'bkg_model' in keys and dict_attrs['bkg_model']:
model_name, param_hints = list(dict_attrs['bkg_model'].items())[0]
Expand All @@ -135,7 +136,6 @@ def set_attributes(self, dict_attrs, **fit_kwargs):
self.bkg_model = model
self.bkg_model.name2 = model_name
self.bkg_model.param_hints = param_hints
print(self.bkg_model)

if 'baseline' in keys:
self.baseline = BaseLine()
Expand Down

0 comments on commit 8772030

Please sign in to comment.