legend-dataflow-scripts 0.3.1__tar.gz → 0.3.2__tar.gz

{legend_dataflow_scripts-0.3.1/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.1
+Version: 0.3.2
 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
@@ -18,11 +18,12 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: colorlog
-Requires-Dist: dbetto>=1.2.3
-Requires-Dist: pygama>=2.3.8
-Requires-Dist: dspeed>=2.0
-Requires-Dist: pylegendmeta>=1.2.5
-Requires-Dist: legend-pydataobj>=1.16
+Requires-Dist: dbetto>=1.3.6
+Requires-Dist: pygama>=2.3.10
+Requires-Dist: dspeed>=2.1.4
+Requires-Dist: pylegendmeta>=1.4.4
+Requires-Dist: legend-pydataobj>=2.0.2
+Requires-Dist: legend-lh5io>=0.2.6
 Requires-Dist: pip
 Provides-Extra: test
 Requires-Dist: legend-dataflow-scripts; extra == "test"

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/pyproject.toml

@@ -51,11 +51,12 @@ dynamic = ["version"]
 
 dependencies = [
     "colorlog",
-    "dbetto>=1.2.3",
-    "pygama>=2.3.8",
-    "dspeed>=2.0",
-    "pylegendmeta>=1.2.5",
-    "legend-pydataobj>=1.16",
+    "dbetto>=1.3.6",
+    "pygama>=2.3.10",
+    "dspeed>=2.1.4",
+    "pylegendmeta>=1.4.4",
+    "legend-pydataobj>=2.0.2",
+    "legend-lh5io>=0.2.6",
     "pip",
 ]
 # "legend-daq2lh5 @  file:///${PROJECT_ROOT}/software/python/src/legend-daq2lh5

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2/src/legend_dataflow_scripts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.3.1
+Version: 0.3.2
 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
@@ -18,11 +18,12 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: colorlog
-Requires-Dist: dbetto>=1.2.3
-Requires-Dist: pygama>=2.3.8
-Requires-Dist: dspeed>=2.0
-Requires-Dist: pylegendmeta>=1.2.5
-Requires-Dist: legend-pydataobj>=1.16
+Requires-Dist: dbetto>=1.3.6
+Requires-Dist: pygama>=2.3.10
+Requires-Dist: dspeed>=2.1.4
+Requires-Dist: pylegendmeta>=1.4.4
+Requires-Dist: legend-pydataobj>=2.0.2
+Requires-Dist: legend-lh5io>=0.2.6
 Requires-Dist: pip
 Provides-Extra: test
 Requires-Dist: legend-dataflow-scripts; extra == "test"

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legend_dataflow_scripts.egg-info/requires.txt

@@ -1,9 +1,10 @@
 colorlog
-dbetto>=1.2.3
-pygama>=2.3.8
-dspeed>=2.0
-pylegendmeta>=1.2.5
-legend-pydataobj>=1.16
+dbetto>=1.3.6
+pygama>=2.3.10
+dspeed>=2.1.4
+pylegendmeta>=1.4.4
+legend-pydataobj>=2.0.2
+legend-lh5io>=0.2.6
 pip
 
 [dev]

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.3.1'
-__version_tuple__ = version_tuple = (0, 3, 1)
+__version__ = version = '0.3.2'
+__version_tuple__ = version_tuple = (0, 3, 2)
 
-__commit_id__ = commit_id = 'g67f81227e'
+__commit_id__ = commit_id = 'g30a72af68'

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/dplms.py

@@ -5,10 +5,11 @@ import pickle as pkl
 import time
 from pathlib import Path
 
+import lh5
 import numpy as np
 import pygama.math.distributions as pmd  # noqa: F401
 from dbetto.catalog import Props
-from lgdo import Array, Table, lh5
+from lgdo import Array, Table
 from pygama.pargen.data_cleaning import generate_cuts
 from pygama.pargen.dplms_ge_dict import dplms_ge_dict
 from pygama.pargen.dsp_optimize import run_one_dsp

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/eopt.py

@@ -6,13 +6,13 @@ import time
 import warnings
 from pathlib import Path
 
+import lh5
 import numpy as np
 import pygama.pargen.energy_optimisation as om  # noqa: F401
 import sklearn.gaussian_process.kernels as ker
 from dbetto.catalog import Props
 from dspeed import build_dsp
 from dspeed.units import unit_registry as ureg
-from lgdo import lh5
 from pygama.math.distributions import hpge_peak
 from pygama.pargen.dsp_optimize import (
     BayesianOptimizer,
@@ -371,7 +371,7 @@ def par_geds_dsp_eopt() -> None:
             n_iter=opt_dict["n_iter"],
         )
 
-        Props.add_to(db_dict, out_param_dict)
+        db_dict = Props.add_to(db_dict, out_param_dict)
 
         # db_dict.update(out_param_dict)
 

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/evtsel.py

@@ -9,12 +9,12 @@ from bisect import bisect_left
 from pathlib import Path
 
 import lgdo
+import lh5
 import numpy as np
 import pygama.math.histogram as pgh
 import pygama.pargen.energy_cal as pgc
 from dbetto.catalog import Props
 from dspeed import build_dsp
-from lgdo import lh5
 from pygama.pargen.data_cleaning import generate_cuts, get_keys
 
 from ....utils import build_log, get_pulser_mask

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/nopt.py

@@ -5,11 +5,11 @@ import pickle as pkl
 import time
 from pathlib import Path
 
+import lh5
 import numpy as np
 import pygama.pargen.noise_optimization as pno
 from dbetto.catalog import Props
 from dspeed import build_dsp
-from lgdo import lh5
 from pygama.pargen.data_cleaning import generate_cuts, get_cut_indexes
 
 from ....utils import build_log

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/pz.py

@@ -5,10 +5,10 @@ import copy
 import pickle as pkl
 from pathlib import Path
 
+import lh5
 import numpy as np
 from dbetto.catalog import Props
 from dspeed import build_dsp
-from lgdo import lh5
 from pygama.pargen.data_cleaning import get_cut_indexes
 from pygama.pargen.pz_correct import PZCorrect
 

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/dsp/svm_build.py

@@ -4,8 +4,8 @@ import argparse
 import pickle as pkl
 from pathlib import Path
 
+import lh5
 from dbetto.catalog import Props
-from lgdo import lh5
 from sklearn.svm import SVC
 
 from ....utils import build_log

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/hit/ecal.py

@@ -7,13 +7,13 @@ import warnings
 from datetime import datetime
 from pathlib import Path
 
+import lh5
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
 import pygama.math.distributions as pgf
 import pygama.math.histogram as pgh
 from dbetto.catalog import Props
-from lgdo import lh5
 from matplotlib.colors import LogNorm
 from pygama.math.distributions import nb_poly
 from pygama.pargen.data_cleaning import get_mode_stdev

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/par/geds/hit/qc.py

@@ -11,7 +11,7 @@ from pathlib import Path
 
 import numpy as np
 from dbetto.catalog import Props
-from lgdo.lh5 import ls
+from lh5 import ls
 from pygama.pargen.data_cleaning import (
     generate_cut_classifiers,
     get_keys,

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/tier/dsp.py

@@ -7,11 +7,11 @@ import warnings
 from multiprocessing import Pool
 from pathlib import Path
 
+import lh5
 import numpy as np
 from dbetto import TextDB
 from dbetto.catalog import Props
 from dspeed import build_dsp
-from lgdo import lh5
 
 from ..utils import alias_table, build_log
 

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/tier/hit.py

@@ -5,9 +5,9 @@ import json
 import time
 from pathlib import Path
 
+import lh5
+from dbetto import TextDB
 from dbetto.catalog import Props
-from legendmeta import TextDB
-from lgdo import lh5
 from pygama.hit.build_hit import build_hit
 
 from ..utils import alias_table, build_log
@@ -96,7 +96,7 @@ def build_tier_hit() -> None:
         hit_cfg = Props.read_from(file)
 
         # get pars (to override hit config)
-        Props.add_to(hit_cfg, pars_dict.get(chan, {}).copy())
+        hit_cfg = Props.add_to(hit_cfg, pars_dict.get(chan, {}).copy())
 
         if chan in table_map:
             input_tbl_name = table_map[chan] if table_map is not None else chan + "/dsp"
@@ -203,7 +203,7 @@ def build_tier_hit_single_channel() -> None:
     )
 
     hit_cfg = Props.read_from(chan_cfg_map)
-    Props.add_to(hit_cfg, pars_dict.copy())
+    hit_cfg = Props.add_to(hit_cfg, pars_dict.copy())
 
     log.info("running build_hit()...")
     start = time.time()

{legend_dataflow_scripts-0.3.1 → legend_dataflow_scripts-0.3.2}/src/legenddataflowscripts/workflow/filedb.py

@@ -4,9 +4,9 @@ import argparse
 import logging
 from pathlib import Path
 
+import lh5
 import numpy as np
 from dbetto.catalog import Props
-from lgdo import lh5
 from pygama.flow.file_db import FileDB