legend-dataflow-scripts 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

{legend_dataflow_scripts-0.1.5.dist-info → legend_dataflow_scripts-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.1.5
+Version: 0.1.6
 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.dist-info → legend_dataflow_scripts-0.1.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 legenddataflowscripts/__init__.py,sha256=hlpvTxSBjOyXlZUyOyYx3VwT5LS6zNzhAZnTmfT3NjU,303
-legenddataflowscripts/_version.py,sha256=Y4jy4bEMmwl_qNPCmiMFnlQ2ofMoqyG37hp8uwI3m10,511
+legenddataflowscripts/_version.py,sha256=ESbJO0YD7TYfOUv_WDIJJgWELGepEWsoyhqVifEcXPA,511
 legenddataflowscripts/par/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/dsp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,26 +12,26 @@ legenddataflowscripts/par/geds/dsp/svm.py,sha256=eDneRB_PQZp8Q4n2VheTX3kbu4ufZQ-
 legenddataflowscripts/par/geds/dsp/svm_build.py,sha256=8K0NUpQqL2HUWRKjMpM5H-TienVPUzIuKED94ZZnIzA,2227
 legenddataflowscripts/par/geds/hit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/hit/aoe.py,sha256=lkA7cgSRdyDt58AYOIuPoCBxiClVJU-6wwYSImpdVFg,11413
-legenddataflowscripts/par/geds/hit/ecal.py,sha256=rSXV6t4olwxW0SVHlBgQDQH9xyndS329XT-0YxmgvZE,27125
+legenddataflowscripts/par/geds/hit/ecal.py,sha256=HogjtX-QUkwogh-jA9F0jTTvEjEfCUK5GY4cHGUBaAw,27854
 legenddataflowscripts/par/geds/hit/lq.py,sha256=TW3vu0UFYgQz2-vrb_ic8ghIpe3ukKMF4Kt-iFP7VAQ,11346
 legenddataflowscripts/par/geds/hit/qc.py,sha256=16RWhybvnODv4dUuSkO6EDtPvJJJmeFwFaPTgS9N7cs,12746
 legenddataflowscripts/tier/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/tier/dsp.py,sha256=J_ABEqbQurZHJOg8LV2aporNjZQpPg2bDZG6DkmuAL4,8633
 legenddataflowscripts/tier/hit.py,sha256=-LCfsqYAYPAuN2OKbPuh4G2P5B4uA4YmQGcqUtbZxis,4989
 legenddataflowscripts/utils/__init__.py,sha256=NPpxqapio8CeQIbG8gYnz-OPoUbOlDT6tjXV-lJrKWc,426
-legenddataflowscripts/utils/alias_table.py,sha256=JL59O4p1MX4kTb1YVa3Md8Bc6H7GvuWsDOb5I7qb6EA,809
+legenddataflowscripts/utils/alias_table.py,sha256=OfET_-ZG6FfXL9JRqPJiSWUdDrDQlNnz5RsLkH2sk5Y,1605
 legenddataflowscripts/utils/cfgtools.py,sha256=_1yxw_eJ08AihONhJ9sWet5HQZpOagj8Yg8y9LS3zX4,381
 legenddataflowscripts/utils/convert_np.py,sha256=qw-pX9345lhzLAwERLjEJtnikzAWWIeD9lyDre2n9P0,853
 legenddataflowscripts/utils/log.py,sha256=5v8J7PZJHHoSy12w9e9DkYmqdPvYXj6YfVaMbhvX614,2230
 legenddataflowscripts/utils/plot_dict.py,sha256=-wfJC5U9OTE1Asazz64kT5Ta008w6UJmDSsr3YAubRM,449
 legenddataflowscripts/utils/pulser_removal.py,sha256=kuARdp1jf-lsUWcb0_KRDp-ZXzkHNrDCXUc3h7TJm7Q,424
 legenddataflowscripts/workflow/__init__.py,sha256=JhudKYhBT8bXtX4LCqxQCHzUiITpugAtFxePWEtphC4,474
-legenddataflowscripts/workflow/execenv.py,sha256=O6Z6EH6Yp0JXnwX2wTzduHC9Q9gu-_d1RuuE2pQ5caE,9061
+legenddataflowscripts/workflow/execenv.py,sha256=qTG4N9ovEPxA0QtqG0wWUIuK50BZIcYvpVlpy-XgxPw,9257
 legenddataflowscripts/workflow/filedb.py,sha256=rbvOcXUxLbHz177QuDIDAL3aysz-bZDjHOiMsRHssZo,3434
 legenddataflowscripts/workflow/pre_compile_catalog.py,sha256=cEK0KXh-ClSE2Bo9MK471o79XG22bMY5r-2tIihtCfk,790
 legenddataflowscripts/workflow/utils.py,sha256=eKE8KIG2ffynZt9fTbI1SVQV85i3aW9GFGh1Nio1iDo,3118
-legend_dataflow_scripts-0.1.5.dist-info/METADATA,sha256=UEMkX19Dv7tt9enMDsF0BMFUNdq-3_v8Vsa7IAb2DG4,3122
-legend_dataflow_scripts-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-legend_dataflow_scripts-0.1.5.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
-legend_dataflow_scripts-0.1.5.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
-legend_dataflow_scripts-0.1.5.dist-info/RECORD,,
+legend_dataflow_scripts-0.1.6.dist-info/METADATA,sha256=PTXbBwFCBHDbdxQamprkPrSTly1YVydK5y0HUb__9Bk,3122
+legend_dataflow_scripts-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_dataflow_scripts-0.1.6.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
+legend_dataflow_scripts-0.1.6.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
+legend_dataflow_scripts-0.1.6.dist-info/RECORD,,

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.6'
+__version_tuple__ = version_tuple = (0, 1, 6)

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():

legenddataflowscripts/utils/alias_table.py

@@ -6,6 +6,29 @@ 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.
@@ -26,5 +49,7 @@ def alias_table(file: str | Path, mapping: str):
                 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])

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)