Merge branch 'cesinf' of github.com:XENONnT/alea into cesinf

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
         language_version: python3.9
 
 -   repo: https://github.com/pycqa/docformatter
-    rev: v1.7.5
+    rev: master
     hooks:
     -   id: docformatter
         additional_dependencies: [tomli]

alea/models/blueice_extended_model.py

@@ -4,6 +4,7 @@
 import itertools
 from copy import deepcopy
 
+from tqdm import tqdm
 import numpy as np
 import scipy.stats as stats
 from blueice.likelihood import LogAncillaryLikelihood, LogLikelihoodSum
@@ -334,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:
@@ -399,7 +401,7 @@ def _build_data_generators(self) -> list:
         """
         # last one is AncillaryLikelihood
         data_generators = []
-        for ll_term in self.likelihood_list[:-1]:
+        for ll_term in tqdm(self.likelihood_list[:-1], desc="building data generators"):
             methods = [s.config["pdf_interpolation_method"] for s in ll_term.base_model.sources]
             # make sure that all sources have the same pdf_interpolation_method
             if len(set(methods)) != 1:

alea/submitters/htcondor.py

@@ -407,8 +407,8 @@ def make_tarballs(self):
                 logger.warning(
                     f"Using tarball of user installed package {package_name} at {tarball_path}."
                 )
-            tarballs.append(tarball)
-            tarball_paths.append(tarball_path)
+                tarballs.append(tarball)
+                tarball_paths.append(tarball_path)
         return tarballs, tarball_paths
 
     def _initialize_job(