legend-dataflow-scripts 0.1.5__tar.gz → 0.1.7__tar.gz

{legend_dataflow_scripts-0.1.5/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.1.7}/PKG-INFO

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

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

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.5'
-__version_tuple__ = version_tuple = (0, 1, 5)
+__version__ = version = '0.1.7'
+__version_tuple__ = version_tuple = (0, 1, 7)

{legend_dataflow_scripts-0.1.5 → legend_dataflow_scripts-0.1.7}/src/legenddataflowscripts/par/geds/hit/ecal.py

@@ -680,18 +680,32 @@ def par_geds_hit_ecal() -> None:
         hit_dict.update(
             {cal_energy_param: full_object_dict[cal_energy_param].gen_pars_dict()}
         )
-        if "ctc" in cal_energy_param:
-            no_ctc_dict = full_object_dict[cal_energy_param].gen_pars_dict()
-            no_ctc_dict["expression"] = no_ctc_dict["expression"].replace("_ctc", "")
-            hit_dict.update({cal_energy_param.replace("ctc", "noctc"): no_ctc_dict})
-            hit_dict.update(
-                {
-                    cal_energy_param.replace("_ctc", ""): {
-                        "expression": f"where({cal_energy_param.replace('ctc', 'noctc')}>{kwarg_dict.get('dt_theshold_kev', 100)}, {cal_energy_param}, {cal_energy_param.replace('ctc', 'noctc')})",
-                        "parameters": {},
-                    }
-                }
-            )
+        if "copy_calibration" in kwarg_dict:
+            for copy_cal_param, _copy_to_cal_param in kwarg_dict[
+                "copy_calibration"
+            ].items():
+                if copy_cal_param not in full_object_dict:
+                    msg = f"copy_calibration parameter {copy_cal_param} not found in full_object_dict"
+                    raise ValueError(msg)
+                if isinstance(_copy_to_cal_param, str):
+                    copy_to_cal_param = [_copy_to_cal_param]
+                else:
+                    copy_to_cal_param = _copy_to_cal_param
+                for cal_par in copy_to_cal_param:
+                    if cal_par in full_object_dict:
+                        msg = f"copy_calibration parameter {cal_par} already exists in full_object_dict"
+                        raise ValueError(msg)
+                    copy_dict = {cal_par: full_object_dict[cal_par].gen_pars_dict()}
+                    copy_dict["expression"] = copy_dict[cal_par]["expression"].replace(
+                        copy_cal_param, cal_par
+                    )
+                    hit_dict.update({cal_par: copy_dict[cal_par]})
+        if "extra_blocks" in kwarg_dict:
+            if isinstance(kwarg_dict["extra_blocks"], dict):
+                kwarg_dict["extra_blocks"] = [kwarg_dict["extra_blocks"]]
+            for extra_block in kwarg_dict["extra_blocks"]:
+                hit_dict.update(extra_block)
+
         if args.plot_path:
             param_plot_dict = {}
             if ~np.isnan(full_object_dict[cal_energy_param].pars).all():

legend_dataflow_scripts-0.1.7/src/legenddataflowscripts/utils/alias_table.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import h5py
+
+
+def convert_parents_to_structs(h5group):
+    if h5group.parent.name != "/" and len(h5group.parent.attrs) == 0:
+        h5group.parent.attrs.update(
+            {"datatype": "struct{" + h5group.name.split("/")[-1] + "}"}
+        )
+    elif (
+        len(h5group.parent.attrs) > 0
+        and h5group.name.split("/")[-1] not in h5group.parent.attrs["datatype"]
+    ):
+        h5group.parent.attrs.update(
+            {
+                "datatype": h5group.parent.attrs["datatype"][:-1]
+                + ","
+                + h5group.name.split("/")[-1]
+                + "}"
+            }
+        )
+    else:
+        return
+    convert_parents_to_structs(h5group.parent)
+    return
+
+
+def alias_table(file: str | Path, mapping: str):
+    """
+    Create an alias table for the given file and mapping.
+
+    Args:
+        file (str): Path to the input file.
+        mapping (dict): Mapping of current table name and alias table name.
+
+    """
+    if isinstance(mapping, str):
+        mapping = json.loads(mapping)
+    if isinstance(mapping, list):
+        for m in mapping:
+            alias_table(file, m)
+        return
+    with h5py.File(file, "a") as f:
+        for raw_id, alias in mapping.items():
+            if raw_id in f:
+                if isinstance(alias, list | tuple):
+                    for a in alias:
+                        f[a] = f[raw_id]
+                        convert_parents_to_structs(f[a])
+                else:
+                    f[alias] = f[raw_id]
+                    convert_parents_to_structs(f[alias])

{legend_dataflow_scripts-0.1.5 → legend_dataflow_scripts-0.1.7}/src/legenddataflowscripts/workflow/execenv.py

@@ -316,10 +316,16 @@ def cmdexec(args) -> None:
     )
     config_dict["execenv"] = config_dict["execenv"][args.system]
 
+    exe_path = Path(config_dict.paths.install).resolve() / "bin"
+
     cmd_prefix, cmd_env = execenv_prefix(config_dict, as_string=False)
     cmd_expr = [*cmd_prefix, *args.command]
 
     msg = "running: " + _execenv2str(cmd_expr, cmd_env)
     log.debug(msg)
 
-    subprocess.run(cmd_expr, env=os.environ | cmd_env, check=True)
+    env_dict = os.environ | cmd_env
+    env_dict["PATH"] = (
+        f"{exe_path}:{env_dict['PATH']}"  # prepend the virtualenv bin dir
+    )
+    subprocess.run(cmd_expr, env=env_dict, check=True)

legend_dataflow_scripts-0.1.5/src/legenddataflowscripts/utils/alias_table.py

@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import h5py
-
-
-def alias_table(file: str | Path, mapping: str):
-    """
-    Create an alias table for the given file and mapping.
-
-    Args:
-        file (str): Path to the input file.
-        mapping (dict): Mapping of current table name and alias table name.
-
-    """
-    if isinstance(mapping, str):
-        mapping = json.loads(mapping)
-    if isinstance(mapping, list):
-        for m in mapping:
-            alias_table(file, m)
-    with h5py.File(file, "a") as f:
-        for raw_id, alias in mapping.items():
-            if raw_id in f:
-                if isinstance(alias, list | tuple):
-                    for a in alias:
-                        f[a] = f[raw_id]
-                else:
-                    f[alias] = f[raw_id]