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

Remove ext model handling from BaseFitter

parent efa66531
Branches
No related tags found
No related merge requests found
......@@ -21,8 +21,6 @@ class BaseFitter(ABC):
self.model = model
self.retry = retry
self._ext_loss = False
self.result_text = [] # type: List[str]
@property
......@@ -47,14 +45,6 @@ class BaseFitter(ABC):
def gof(self) -> float:
pass
@property
def ext_loss(self) -> bool:
return self._ext_loss
@ext_loss.setter
def ext_loss(self, loss: bool) -> None:
self._ext_loss = loss
def _calc_gof(self, counts: np.ndarray, centers: np.ndarray) -> float:
limits = self.model.obs.limits
low, high = np.min(limits), np.max(limits)
......@@ -122,18 +112,6 @@ class BaseFitter(ABC):
)
)
def _reset_yield(self, model: Model) -> None:
ext_model = model.ext_model
assert isinstance(ext_model, zfit.core.interfaces.ZfitPDF)
yield_params = ext_model.get_yield()
if isinstance(yield_params, zfit.core.interfaces.ZfitParameter):
for param in yield_params.get_params():
if param.value() != param.value():
assert isinstance(param, zfit.Parameter)
param.randomize(minval=None, maxval=None, sampler=np.random.uniform)
def _randomize_parameters(self, model: Model) -> None:
for param in model.parameters.values():
modelparameter = model.get_modelparameter(param.name)
......@@ -182,9 +160,6 @@ class BaseFitter(ABC):
self._randomize_parameters(model=model)
if self.ext_loss:
self._reset_yield(model=model)
counter += 1
self._fit(model=model, shuffle_params=shuffle_params, counter=counter)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment