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

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

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

@@ -1,9 +1,9 @@
 legenddataflowscripts/__init__.py,sha256=hlpvTxSBjOyXlZUyOyYx3VwT5LS6zNzhAZnTmfT3NjU,303
-legenddataflowscripts/_version.py,sha256=ESbJO0YD7TYfOUv_WDIJJgWELGepEWsoyhqVifEcXPA,511
+legenddataflowscripts/_version.py,sha256=Zaz3s9gl_rzsS46-ymJOALojMxviW77EJq_agE8knLk,704
 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
-legenddataflowscripts/par/geds/dsp/dplms.py,sha256=OOvnN_OcU046zhuyNTGxcmGYLCZ7YseK4rNyMDaRsC4,5314
+legenddataflowscripts/par/geds/dsp/dplms.py,sha256=SnEz8HVRHiFir2iIsmF4L33ILlfddDgQ7sokrZccf3I,5528
 legenddataflowscripts/par/geds/dsp/eopt.py,sha256=jmljkIPamz-L1lX8kEqSdmRuZJ-a9---9Qj-1ACghNQ,13792
 legenddataflowscripts/par/geds/dsp/evtsel.py,sha256=qheFqGezjRxW9UNf9DV1n8VuZjCLGZT-WaWyhrfgPJ4,16485
 legenddataflowscripts/par/geds/dsp/nopt.py,sha256=K7R4OBfO0wek03VvhBoYXDP7lURi_Xoph9Kb3iMkfx4,4263
@@ -11,15 +11,15 @@ legenddataflowscripts/par/geds/dsp/pz.py,sha256=sucYUtsgWKYtR-GbmRh5b61EYHqNRMWG
 legenddataflowscripts/par/geds/dsp/svm.py,sha256=eDneRB_PQZp8Q4n2VheTX3kbu4ufZQ-jnuCCjvtwFpk,826
 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/aoe.py,sha256=H-WcUP3NLjCtcof6KkmhkmBtzLN2T_Rvqv6xilIEBX0,11371
 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/lq.py,sha256=X8_OQRvOG5RwPMYgppPBAELfg233DoOQo99Dy_mNbwI,11305
 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=OfET_-ZG6FfXL9JRqPJiSWUdDrDQlNnz5RsLkH2sk5Y,1605
+legenddataflowscripts/utils/alias_table.py,sha256=Im1jYnyt5pWEh8jvF_PxSi6Ur3c0E7nM62MMC-c01zE,1620
 legenddataflowscripts/utils/cfgtools.py,sha256=_1yxw_eJ08AihONhJ9sWet5HQZpOagj8Yg8y9LS3zX4,381
 legenddataflowscripts/utils/convert_np.py,sha256=qw-pX9345lhzLAwERLjEJtnikzAWWIeD9lyDre2n9P0,853
 legenddataflowscripts/utils/log.py,sha256=5v8J7PZJHHoSy12w9e9DkYmqdPvYXj6YfVaMbhvX614,2230
@@ -30,8 +30,8 @@ legenddataflowscripts/workflow/execenv.py,sha256=qTG4N9ovEPxA0QtqG0wWUIuK50BZIcY
 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.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,,
+legend_dataflow_scripts-0.1.8.dist-info/METADATA,sha256=otvBGC3Ny86Hpy2KsOtQxFq6ugbRI76bs4etw_gS_0o,3122
+legend_dataflow_scripts-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_dataflow_scripts-0.1.8.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
+legend_dataflow_scripts-0.1.8.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
+legend_dataflow_scripts-0.1.8.dist-info/RECORD,,

legenddataflowscripts/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     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.1.6'
-__version_tuple__ = version_tuple = (0, 1, 6)
+__version__ = version = '0.1.8'
+__version_tuple__ = version_tuple = (0, 1, 8)
+
+__commit_id__ = commit_id = None

legenddataflowscripts/par/geds/dsp/dplms.py

@@ -6,6 +6,7 @@ import time
 from pathlib import Path
 
 import numpy as np
+import pygama.math.distributions as pmd  # noqa: F401
 from dbetto import TextDB
 from dbetto.catalog import Props
 from lgdo import Array, Table, lh5
@@ -94,6 +95,7 @@ def par_geds_dsp_dplms() -> None:
                 dsp_config,
                 db_dict,
                 dplms_dict,
+                fom_func=eval(dplms_dict.get("fom_func", "pmd.gauss_on_step")),
                 display=1,
             )
             if args.inplots:
@@ -108,6 +110,7 @@ def par_geds_dsp_dplms() -> None:
                 dsp_config,
                 db_dict,
                 dplms_dict,
+                fom_func=eval(dplms_dict.get("fom_func", "pmd.gauss_on_step")),
             )
 
         coeffs = out_dict["dplms"].pop("coefficients")

legenddataflowscripts/par/geds/hit/aoe.py

@@ -220,7 +220,7 @@ def par_geds_hit_aoe() -> None:
 
     ecal_dict = Props.read_from(args.ecal_file)
     cal_dict = ecal_dict["pars"]
-    eres_dict = ecal_dict["results"]["ecal"]
+    eres_dict = ecal_dict["results"]
 
     with Path(args.eres_file).open("rb") as o:
         object_dict = pkl.load(o)
@@ -315,7 +315,7 @@ def par_geds_hit_aoe() -> None:
     Path(args.hit_pars).parent.mkdir(parents=True, exist_ok=True)
     final_hit_dict = {
         "pars": {"operations": cal_dict},
-        "results": dict(**ecal_dict["results"], aoe=results_dict),
+        "results": results_dict,
     }
 
     final_hit_dict = convert_dict_np_to_float(final_hit_dict)

legenddataflowscripts/par/geds/hit/lq.py

@@ -247,7 +247,7 @@ def par_geds_hit_lq() -> None:
 
     ecal_dict = Props.read_from(args.ecal_file)
     cal_dict = ecal_dict["pars"]["operations"]
-    eres_dict = ecal_dict["results"]["ecal"]
+    eres_dict = ecal_dict["results"]
 
     if args.inplots:
         with Path(args.inplots).open("rb") as r:
@@ -321,7 +321,7 @@ def par_geds_hit_lq() -> None:
     final_hit_dict = convert_dict_np_to_float(
         {
             "pars": {"operations": cal_dict},
-            "results": dict(**ecal_dict["results"], lq=results_dict),
+            "results": results_dict,
         }
     )
     Path(args.hit_pars).parent.mkdir(parents=True, exist_ok=True)

legenddataflowscripts/utils/alias_table.py

@@ -43,6 +43,7 @@ def alias_table(file: str | Path, mapping: str):
     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: