legend-dataflow-scripts 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

{legend_dataflow_scripts-0.1.3.dist-info → legend_dataflow_scripts-0.1.4.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 legenddataflowscripts/__init__.py,sha256=hlpvTxSBjOyXlZUyOyYx3VwT5LS6zNzhAZnTmfT3NjU,303
-legenddataflowscripts/_version.py,sha256=NIzzV8ZM0W-CSLuEs1weG4zPrn_-8yr1AwwI1iuS6yo,511
+legenddataflowscripts/_version.py,sha256=hcPkC9vIGgfrKK6ft7ysLT7iOCjpFmCBmyKLmXiaZ1g,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
@@ -14,7 +14,7 @@ legenddataflowscripts/par/geds/hit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 legenddataflowscripts/par/geds/hit/aoe.py,sha256=4sXRz6UaPD7phihAO3_C42l7fJT8UrhhOZswzO8rAqw,11387
 legenddataflowscripts/par/geds/hit/ecal.py,sha256=tsIL9FP-aXgM2B1K8ygjcsLeNZ9Yv7je84fT-K7m3vQ,26194
 legenddataflowscripts/par/geds/hit/lq.py,sha256=td0qVvVRwYbhiA-IhAZYLgTdW6xpTeeE3mrSoWeLw2U,11307
-legenddataflowscripts/par/geds/hit/qc.py,sha256=6PpA6aVjd9Gysfz_up7cuWw-ftwDA8F8gNKBcPPq4lc,12409
+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
@@ -25,13 +25,13 @@ legenddataflowscripts/utils/convert_np.py,sha256=8q_K3w3jAREG-9CJlErP3Vca0OYTYAY
 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=p-57OklNpVYqwMaLctLO8zMvhpXaTILkd3j4CaS_Juk,394
+legenddataflowscripts/workflow/__init__.py,sha256=JhudKYhBT8bXtX4LCqxQCHzUiITpugAtFxePWEtphC4,474
 legenddataflowscripts/workflow/execenv.py,sha256=O6Z6EH6Yp0JXnwX2wTzduHC9Q9gu-_d1RuuE2pQ5caE,9061
 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.3.dist-info/METADATA,sha256=ajopD8KYE0gSC2mRkgv3Dc4SCkb5MFc8vhRMLh9WH9A,3122
-legend_dataflow_scripts-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-legend_dataflow_scripts-0.1.3.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
-legend_dataflow_scripts-0.1.3.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
-legend_dataflow_scripts-0.1.3.dist-info/RECORD,,
+legend_dataflow_scripts-0.1.4.dist-info/METADATA,sha256=kCV4uTOiqJBCGvMteN0O5b0YGwLCMrZR8DF3LytqCF4,3122
+legend_dataflow_scripts-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_dataflow_scripts-0.1.4.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
+legend_dataflow_scripts-0.1.4.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
+legend_dataflow_scripts-0.1.4.dist-info/RECORD,,

legenddataflowscripts/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)

legenddataflowscripts/par/geds/hit/qc.py

@@ -129,6 +129,7 @@ def build_qc(
     else:
         hit_dict_fft = {}
         plot_dict_fft = {}
+        fft_data = None
 
     if overwrite is not None:
         for name in kwarg_dict_fft["cut_parameters"]:
@@ -234,7 +235,7 @@ def build_qc(
         exp = info["expression"]
         for key in info.get("parameters", None):
             exp = re.sub(f"(?<![a-zA-Z0-9]){key}(?![a-zA-Z0-9])", f"@{key}", exp)
-        if outname not in fft_data:
+        if fft_data is not None and outname not in fft_data:
             fft_data[outname] = fft_data.eval(
                 exp, local_dict=info.get("parameters", None)
             )
@@ -251,24 +252,34 @@ def build_qc(
                 ((sf_cal) * (1 - sf_cal))
                 / len(data.query("~is_pulser & ~is_recovering"))
             )
-            sf_fft = len(fft_data.query(f"{entry} & ~is_recovering")) / len(
-                fft_data.query("~is_recovering")
-            )
-            sf_fft_err = 100 * np.sqrt(
-                ((sf_fft) * (1 - sf_fft)) / len(fft_data.query("~is_recovering"))
-            )
             sf_cal *= 100
-            sf_fft *= 100
-
-            msg = f"{entry} cut applied: {sf_cal:.2f}% of events passed the cut for cal data, {sf_fft:.2f}% for fft data"
+            msg = f"{entry} cut applied: {sf_cal:.2f}% of events passed the cut for cal data"
             log.info(msg)
+
             qc_results[entry] = {
                 "sf_cal": sf_cal,
                 "sf_cal_err": sf_cal_err,
-                "sf_fft": sf_fft,
-                "sf_fft_err": sf_fft_err,
             }
 
+            if fft_data is not None:
+                sf_fft = len(fft_data.query(f"{entry} & ~is_recovering")) / len(
+                    fft_data.query("~is_recovering")
+                )
+                sf_fft_err = 100 * np.sqrt(
+                    ((sf_fft) * (1 - sf_fft)) / len(fft_data.query("~is_recovering"))
+                )
+                sf_fft *= 100
+                msg = f"{entry} cut applied: {sf_fft:.2f}% of events passed the cut for fft data"
+
+                log.info(msg)
+
+                qc_results[entry].update(
+                    {
+                        "sf_fft": sf_fft,
+                        "sf_fft_err": sf_fft_err,
+                    }
+                )
+
     out_dict = convert_dict_np_to_float(
         {"operations": hit_dict, "results": {"qc": qc_results}}
     )

legenddataflowscripts/workflow/__init__.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from .execenv import execenv_prefix, execenv_pyexe
+from .pre_compile_catalog import pre_compile_catalog
 from .utils import (
     as_ro,
     set_last_rule_name,
@@ -13,6 +14,7 @@ __all__ = [
     "as_ro",
     "execenv_prefix",
     "execenv_pyexe",
+    "pre_compile_catalog",
     "set_last_rule_name",
     "subst_vars",
     "subst_vars_impl",