legend-dataflow-scripts 0.3.0a1__tar.gz → 0.3.0a3__tar.gz

{legend_dataflow_scripts-0.3.0a1/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.3.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.0a1
+Version: 0.3.0a3
 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.0a1 → legend_dataflow_scripts-0.3.0a3/src/legend_dataflow_scripts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.0a1
+Version: 0.3.0a3
 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.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.0a1'
-__version_tuple__ = version_tuple = (0, 3, 0, 'a1')
+__version__ = version = '0.3.0a3'
+__version_tuple__ = version_tuple = (0, 3, 0, 'a3')
 
-__commit_id__ = commit_id = 'gc8848acbc'
+__commit_id__ = commit_id = 'gca936aab2'

{legend_dataflow_scripts-0.3.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/par/geds/dsp/dplms.py

@@ -65,7 +65,7 @@ def par_geds_dsp_dplms() -> None:
         energies = lh5.read_as(
             f"{args.raw_table_name}/daqenergy", fft_files, library="np"
         )
-        idxs = np.where(energies == 0)[0]
+        idxs = np.where(energies <= 10)[0]
         raw_fft = lh5.read(
             args.raw_table_name,
             fft_files,

{legend_dataflow_scripts-0.3.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/par/geds/dsp/evtsel.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import sys
 import time
 import warnings
 from bisect import bisect_left
@@ -99,6 +100,12 @@ def par_geds_dsp_evtsel() -> None:
         required=False,
     )
 
+    argparser.add_argument(
+        "--channel",
+        type=str,
+        help="Channel to process; required if --raw-cal-curve is set",
+        required="--raw-cal-curve" in sys.argv,
+    )
     argparser.add_argument("--log", help="log_file", type=str)
 
     argparser.add_argument(

{legend_dataflow_scripts-0.3.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/par/geds/dsp/nopt.py

@@ -63,7 +63,7 @@ def par_geds_dsp_nopt() -> None:
         energies = lh5.read_as(
             f"{args.raw_table_name}/daqenergy", raw_files, library="np"
         )
-        idxs = np.where(energies == 0)[0]
+        idxs = np.where(energies <= 10)[0]
         tb_data = lh5.read(
             args.raw_table_name, raw_files, n_rows=opt_dict["n_events"], idx=idxs
         )

{legend_dataflow_scripts-0.3.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/tier/dsp.py

@@ -95,6 +95,8 @@ def build_tier_dsp() -> None:
         # check if the raw tables are all existing
         if len(lh5.ls(args.input, input_tbl_name)) > 0:
             dsp_cfg_tbl_dict[input_tbl_name] = Props.read_from(file)
+            msg = f"found table {input_tbl_name} in {args.input}"
+            log.debug(msg)
         else:
             msg = f"table {input_tbl_name} not found in {args.input} skipping"
             log.info(msg)
@@ -147,6 +149,8 @@ def build_tier_dsp() -> None:
             kwargs = {
                 "raw_in": args.input,
                 "dsp_out": dsp_files[i],
+                "lh5_tables": list(config.keys()),
+                "base_group": "",
                 "chan_config": config,
                 "database": database_dict,
                 "write_mode": "r",
@@ -173,6 +177,8 @@ def build_tier_dsp() -> None:
         build_dsp(
             raw_in=args.input,
             dsp_out=args.output,
+            lh5_tables=list(dsp_cfg_tbl_dict.keys()),
+            base_group="",
             database=database_dict,
             chan_config=dsp_cfg_tbl_dict,
             write_mode="r",

{legend_dataflow_scripts-0.3.0a1 → legend_dataflow_scripts-0.3.0a3}/src/legenddataflowscripts/utils/log.py

@@ -26,7 +26,7 @@ class StreamToLogger:
 
 
 def build_log(
-    config_dict: dict, log_file: str | None = None, fallback: str = "prod"
+    config_dict: dict | str, log_file: str | None = None, fallback: str = "prod"
 ) -> logging.Logger:
     """Build a logger from a configuration dictionary.
 
@@ -39,10 +39,22 @@ def build_log(
     log_file
         The path to the log file.
     """
-    if isinstance(config_dict, str | dict):
+    # Accept either:
+    # - a str pointing to a logging properties file
+    # - a plain logging dict (handlers/formatters/etc.)
+    # - a dict already containing "options" -> {"logging": ...}
+    # If a dict is provided and it already contains an "options" key, assume
+    # caller set options explicitly (so we must not wrap it).
+    if isinstance(config_dict, str) or (
+        isinstance(config_dict, dict) and "options" not in config_dict
+    ):
         config_dict = {"options": {"logging": config_dict}}
 
-    if "logging" in config_dict["options"]:
+    if (
+        isinstance(config_dict, dict)
+        and "options" in config_dict
+        and "logging" in config_dict["options"]
+    ):
         log_config = config_dict["options"]["logging"]
         # if it's a str, interpret it as a path to a file
         if isinstance(log_config, str):
@@ -50,7 +62,29 @@ def build_log(
 
         if log_file is not None:
             Path(log_file).parent.mkdir(parents=True, exist_ok=True)
-            log_config["handlers"]["dataflow"]["filename"] = log_file
+            # 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"))