Skip to content
Snippets Groups Projects
Commit ff4e7f8f authored by Alexander Heidelbach's avatar Alexander Heidelbach
Browse files

Remove manual model addition

parent db0e6bd9
Branches
No related tags found
No related merge requests found
......@@ -25,23 +25,6 @@ class BaseModel(ABC):
self._model = None # type: Optional[zfit.core.basepdf.BasePDF]
self._ext_model = None # type: Optional[Union[Union[zfit.core.basepdf.BasePDF,zfit.core.interfaces.ZfitPDF] , Fitparameter]]
def __add__(self, model: "BaseModel") -> "BaseModel":
assert self.obs == model.obs, Exception(
f"[BaseModel]: obs cannot be matched! Given:\nself.obs: {self.obs}\nother.obs: {model.obs}"
)
zfit.settings.changed_warnings.new_sum = False
tmp = self.__class__(self.obs)
tmp._parameters = dict(self.parameters, **model.parameters)
if self.model is not None and model.model is not None:
tmp._model = zfit.pdf.SumPDF([self.model, model.model], fracs=[1, 1])
if isinstance(self.ext_model, zfit.core.interfaces.ZfitPDF) and isinstance(
model.ext_model, zfit.core.interfaces.ZfitPDF
):
tmp._ext_model = zfit.pdf.SumPDF([self.ext_model, model.ext_model])
return tmp
def __str__(self) -> str:
string = "Model Wrapper"
string += f"\nParameters:\n{self.parameters}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment