legend-dataflow-scripts 0.2.2__tar.gz → 0.2.4__tar.gz

{legend_dataflow_scripts-0.2.2/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.2.4}/PKG-INFO

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

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

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
-__commit_id__ = commit_id = 'g512d89c35'
+__commit_id__ = commit_id = 'g24654af65'

{legend_dataflow_scripts-0.2.2 → legend_dataflow_scripts-0.2.4}/src/legenddataflowscripts/par/geds/hit/aoe.py

@@ -251,14 +251,13 @@ def par_geds_hit_aoe() -> None:
         ]
 
         if "dt_param" in kwarg_dict:
-            params += kwarg_dict["dt_param"]
+            params.append(kwarg_dict["dt_param"])
         else:
             params.append("dt_eff")
 
         if "dt_cut" in kwarg_dict and kwarg_dict["dt_cut"] is not None:
             cal_dict.update(kwarg_dict["dt_cut"]["cut"])
             params.append(kwarg_dict["dt_cut"]["out_param"])
-
         # load data in
         data, threshold_mask = load_data(
             files,
@@ -271,9 +270,12 @@ def par_geds_hit_aoe() -> None:
         msg = f"Loaded {len(data)} events"
         log.info(msg)
 
-        mask = get_pulser_mask(
-            pulser_file=args.pulser_file,
-        )
+        if args.pulser_file is not None:
+            mask = get_pulser_mask(
+                pulser_file=args.pulser_file,
+            )
+        else:
+            mask = np.zeros(len(threshold_mask), dtype=bool)
 
         data["is_pulser"] = mask[threshold_mask]
 

{legend_dataflow_scripts-0.2.2 → legend_dataflow_scripts-0.2.4}/src/legenddataflowscripts/par/geds/hit/ecal.py

@@ -532,9 +532,12 @@ def par_geds_hit_ecal() -> None:
         cal_energy_param="trapTmax",
     )
 
-    mask = get_pulser_mask(
-        pulser_file=args.pulser_file,
-    )
+    if args.pulser_file is not None:
+        mask = get_pulser_mask(
+            pulser_file=args.pulser_file,
+        )
+    else:
+        mask = np.zeros(len(threshold_mask), dtype=bool)
 
     data["is_pulser"] = mask[threshold_mask]
 

{legend_dataflow_scripts-0.2.2 → legend_dataflow_scripts-0.2.4}/src/legenddataflowscripts/par/geds/hit/lq.py

@@ -288,9 +288,12 @@ def par_geds_hit_lq() -> None:
         msg = f"Loaded {len(data)} events"
         log.info(msg)
 
-        mask = get_pulser_mask(
-            pulser_file=args.pulser_file,
-        )
+        if args.pulser_file is not None:
+            mask = get_pulser_mask(
+                pulser_file=args.pulser_file,
+            )
+        else:
+            mask = np.zeros(len(threshold_mask), dtype=bool)
 
         data["is_pulser"] = mask[threshold_mask]
 

{legend_dataflow_scripts-0.2.2 → legend_dataflow_scripts-0.2.4}/src/legenddataflowscripts/par/geds/hit/qc.py

@@ -39,17 +39,18 @@ def build_qc(
 ):
     search_name = table_name if table_name[-1] == "/" else table_name + "/"
 
-    kwarg_dict_fft = config["fft_fields"]
+    kwarg_dict_fft = config.get("fft_fields", None)
     kwarg_dict_cal = config["cal_fields"]
 
     cut_fields = get_keys(
         [key.replace(search_name, "") for key in ls(cal_files[0], search_name)],
         kwarg_dict_cal["cut_parameters"],
     )
-    cut_fields += get_keys(
-        [key.replace(search_name, "") for key in ls(cal_files[0], search_name)],
-        kwarg_dict_fft["cut_parameters"],
-    )
+    if kwarg_dict_fft is not None:
+        cut_fields += get_keys(
+            [key.replace(search_name, "") for key in ls(cal_files[0], search_name)],
+            kwarg_dict_fft["cut_parameters"],
+        )
 
     if "initial_cal_cuts" in config:
         init_cal = config["initial_cal_cuts"]
@@ -147,9 +148,12 @@ def build_qc(
         cal_energy_param="trapTmax",
     )
 
-    mask = get_pulser_mask(
-        pulser_file=pulser_file,
-    )
+    if pulser_file is not None:
+        mask = get_pulser_mask(
+            pulser_file=pulser_file,
+        )
+    else:
+        mask = np.zeros(len(threshold_mask), dtype=bool)
 
     data["is_pulser"] = mask[threshold_mask]
 
@@ -289,7 +293,9 @@ def build_qc(
 def par_geds_hit_qc() -> None:
     argparser = argparse.ArgumentParser()
     argparser.add_argument("--cal-files", help="cal_files", nargs="*", type=str)
-    argparser.add_argument("--fft-files", help="fft_files", nargs="*", type=str)
+    argparser.add_argument(
+        "--fft-files", help="fft_files", nargs="*", type=str, default=[]
+    )
 
     argparser.add_argument(
         "--tcm-filelist", help="tcm_filelist", type=str, required=False

{legend_dataflow_scripts-0.2.2 → legend_dataflow_scripts-0.2.4}/src/legenddataflowscripts/utils/log.py

@@ -39,11 +39,14 @@ def build_log(
     log_file
         The path to the log file.
     """
-    if isinstance(config_dict, str):
+    if isinstance(config_dict, str | dict):
         config_dict = {"options": {"logging": config_dict}}
+
     if "logging" in config_dict["options"]:
         log_config = config_dict["options"]["logging"]
-        log_config = Props.read_from(log_config)
+        # if it's a str, interpret it as a path to a file
+        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)