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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.1.7
+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.7 → legend_dataflow_scripts-0.1.8}/src/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.7'
-__version_tuple__ = version_tuple = (0, 1, 7)
+__version__ = version = '0.1.8'
+__version_tuple__ = version_tuple = (0, 1, 8)
+
+__commit_id__ = commit_id = 'g2c31549ca'

{legend_dataflow_scripts-0.1.7 → legend_dataflow_scripts-0.1.8}/src/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")

{legend_dataflow_scripts-0.1.7 → legend_dataflow_scripts-0.1.8}/src/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)

{legend_dataflow_scripts-0.1.7 → legend_dataflow_scripts-0.1.8}/src/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)