legend-dataflow-scripts 0.3.0a4__tar.gz → 0.3.0a5__tar.gz

{legend_dataflow_scripts-0.3.0a4/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.3.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.0a4
+Version: 0.3.0a5
 Summary: Python package for the processing scripts for LEGEND-200 data
 Author-email: George Marshall <ggmarsh@uw.edu>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration

{legend_dataflow_scripts-0.3.0a4 → legend_dataflow_scripts-0.3.0a5/src/legend_dataflow_scripts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.0a4
+Version: 0.3.0a5
 Summary: Python package for the processing scripts for LEGEND-200 data
 Author-email: George Marshall <ggmarsh@uw.edu>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration

legend_dataflow_scripts-0.3.0a5/src/legenddataflowscripts/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.3.0a5'
+__version_tuple__ = version_tuple = (0, 3, 0, 'a5')
+
+__commit_id__ = commit_id = 'g2f2cce849'

{legend_dataflow_scripts-0.3.0a4 → legend_dataflow_scripts-0.3.0a5}/src/legenddataflowscripts/par/geds/hit/aoe.py

@@ -56,6 +56,7 @@ def run_aoe_calibration(
     plot_dicts,
     config,
     debug_mode=False,
+    override_dict=None,
 ):
     if isinstance(config, str | list):
         config = Props.read_from(config)
@@ -136,7 +137,7 @@ def run_aoe_calibration(
                 }
             }
         )
-        aoe.calibrate(data, "AoE_Uncorr")
+        aoe.calibrate(data, "AoE_Uncorr", override_dict=override_dict)
 
         msg = f"A/E calibration completed in {time.time() - start:.2f} seconds"
         log.info(msg)
@@ -213,6 +214,11 @@ def par_geds_hit_aoe() -> None:
 
     argparser.add_argument("--table-name", help="table name", type=str, required=True)
 
+    argparser.add_argument("--detector", help="detector name", type=str)
+    argparser.add_argument(
+        "--override-files", help="override files", nargs="*", type=str
+    )
+
     argparser.add_argument("--plot-file", help="plot_file", type=str, required=False)
     argparser.add_argument("--hit-pars", help="hit_pars", type=str)
     argparser.add_argument("--aoe-results", help="aoe_results", type=str)
@@ -288,6 +294,10 @@ def par_geds_hit_aoe() -> None:
 
         data["run_timestamp"] = args.timestamp
 
+        if args.override.files:
+            override_dict = Props.read_from(args.override.files)
+            override_dict = override_dict.get(args.detector, None)
+
         cal_dict, results_dicts, object_dicts, plot_dicts = run_aoe_calibration(
             data,
             {args.timestamp: cal_dict},
@@ -296,6 +306,7 @@ def par_geds_hit_aoe() -> None:
             {args.timestamp: out_plot_dict},
             kwarg_dict,
             debug_mode=args.debug,
+            override_dict=override_dict,
         )
         cal_dict = cal_dict[args.timestamp]
         results_dict = results_dicts[args.timestamp]

{legend_dataflow_scripts-0.3.0a4 → legend_dataflow_scripts-0.3.0a5}/src/legenddataflowscripts/utils/log.py

@@ -39,6 +39,9 @@ def build_log(
     log_file
         The path to the log file.
     """
+    if log_file is None:
+        return logging.getLogger(fallback)
+
     # Accept either:
     # - a str pointing to a logging properties file
     # - a plain logging dict (handlers/formatters/etc.)
@@ -60,39 +63,35 @@ def build_log(
         if isinstance(log_config, str):
             log_config = Props.read_from(log_config)
 
-        if log_file is not None:
-            Path(log_file).parent.mkdir(parents=True, exist_ok=True)
-            # Ensure the logging config has a handlers->dataflow entry; create
-            # minimal structure if needed so we can set the filename.
-            if isinstance(log_config, dict):
-                handlers = log_config.setdefault("handlers", {})
-                dataflow = handlers.setdefault("dataflow", {})
-                # Set the filename for the dataflow handler
-                dataflow["filename"] = log_file
-                dataflow.setdefault("class", "logging.FileHandler")
-                dataflow.setdefault("level", "INFO")
-                log_config.setdefault("version", 1)
-                if (
-                    "handlers" in log_config
-                    and "dataflow" in log_config["handlers"]
-                    and "root" not in log_config
-                    and "loggers" not in log_config
-                ):
-                    dataflow_level = log_config["handlers"]["dataflow"].get(
-                        "level", "INFO"
-                    )
-                    log_config["root"] = {
-                        "level": dataflow_level,
-                        "handlers": ["dataflow"],
-                    }
+        Path(log_file).parent.mkdir(parents=True, exist_ok=True)
+        # Ensure the logging config has a handlers->dataflow entry; create
+        # minimal structure if needed so we can set the filename.
+        if isinstance(log_config, dict):
+            handlers = log_config.setdefault("handlers", {})
+            dataflow = handlers.setdefault("dataflow", {})
+            # Set the filename for the dataflow handler
+            dataflow["filename"] = log_file
+            dataflow.setdefault("class", "logging.FileHandler")
+            dataflow.setdefault("level", "INFO")
+            log_config.setdefault("version", 1)
+            if (
+                "handlers" in log_config
+                and "dataflow" in log_config["handlers"]
+                and "root" not in log_config
+                and "loggers" not in log_config
+            ):
+                dataflow_level = log_config["handlers"]["dataflow"].get("level", "INFO")
+                log_config["root"] = {
+                    "level": dataflow_level,
+                    "handlers": ["dataflow"],
+                }
 
         dictConfig(log_config)
         log = logging.getLogger(config_dict["options"].get("logger", "prod"))
 
     else:
-        if log_file is not None:
-            Path(log_file).parent.mkdir(parents=True, exist_ok=True)
-            logging.basicConfig(level=logging.INFO, filename=log_file, filemode="w")
+        Path(log_file).parent.mkdir(parents=True, exist_ok=True)
+        logging.basicConfig(level=logging.INFO, filename=log_file, filemode="w")
 
         log = logging.getLogger(fallback)
 

legend_dataflow_scripts-0.3.0a4/src/legenddataflowscripts/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.3.0a4'
-__version_tuple__ = version_tuple = (0, 3, 0, 'a4')
-
-__commit_id__ = commit_id = 'g753e798bf'