diff --git a/alea/examples/configs/unbinned_wimp_statistical_model_index_fitting.yaml b/alea/examples/configs/unbinned_wimp_statistical_model_index_fitting.yaml index 769bdc0..96a6979 100644 --- a/alea/examples/configs/unbinned_wimp_statistical_model_index_fitting.yaml +++ b/alea/examples/configs/unbinned_wimp_statistical_model_index_fitting.yaml @@ -54,7 +54,6 @@ likelihood_config: - name: science_run default_source_class: alea.template_source.TemplateSource likelihood_type: blueice.likelihood.UnbinnedLogLikelihood - source_wise_interpolation: false likelihood_config: {"morpher": "IndexMorpher"} analysis_space: - cs1: np.arange(0, 102, 2) diff --git a/alea/models/blueice_extended_model.py b/alea/models/blueice_extended_model.py index e550863..e6fd5d5 100644 --- a/alea/models/blueice_extended_model.py +++ b/alea/models/blueice_extended_model.py @@ -296,16 +296,9 @@ def _process_blueice_config(self, config, template_folder_list): # get blueice likelihood_config if it's given likelihood_config = config.get("likelihood_config", None) - source_wise_interpolation = config.get("source_wise_interpolation", True) - - if source_wise_interpolation and likelihood_config: - if likelihood_config.get("morpher") == "IndexMorpher": - raise ValueError("Source-wise interpolation is not yet supported for IndexMorpher.") - blueice_config = { "pdf_base_config": pdf_base_config, "likelihood_config": likelihood_config, - "source_wise_interpolation": source_wise_interpolation, } return blueice_config @@ -342,6 +335,7 @@ def _build_ll_from_config( # Iterate through each likelihood term in the configuration for config in likelihood_config["likelihood_terms"]: blueice_config = self._process_blueice_config(config, template_folder_list) + blueice_config.setdefault("source_wise_interpolation", True) likelihood_class = cast(Callable, locate(config["likelihood_type"])) if likelihood_class is None: