pygama 2.3.8a1__tar.gz → 2.3.8.dev2__tar.gz

{pygama-2.3.8a1/src/pygama.egg-info → pygama-2.3.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygama
-Version: 2.3.8a1
+Version: 2.3.8.dev2
 Summary: Python package for data processing and analysis
 Author: The LEGEND collaboration
 Maintainer: The LEGEND collaboration
@@ -33,6 +33,7 @@ Requires-Dist: pylegendmeta>=0.9
 Requires-Dist: matplotlib
 Requires-Dist: numba!=0.53.*,!=0.54.*,!=0.57
 Requires-Dist: numpy>=1.21
+Requires-Dist: numexpr
 Requires-Dist: pandas>=1.4.4
 Requires-Dist: tables
 Requires-Dist: pint

{pygama-2.3.8a1 → pygama-2.3.8.dev2}/pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
     "matplotlib",
     "numba !=0.53.*,!=0.54.*,!=0.57",
     "numpy >=1.21",
+    "numexpr",
     "pandas >=1.4.4",
     "tables",
     "pint",
@@ -128,9 +129,6 @@ src = ["src"]
 force-exclude = true
 exclude = [
   "src/pygama/flow",
-  "src/pygama/pargen",
-  "docs",
-  "tests",
   "attic",
 ]
 
@@ -167,6 +165,6 @@ ignore = [
 isort.required-imports = ["from __future__ import annotations"]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**" = ["T20"]
+"tests/**" = ["T20", "PLC0415"]
 "noxfile.py" = ["T20"]
 "docs/source/notebooks/*" = ["T201", "E402"]

pygama-2.3.8.dev2/src/pygama/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '2.3.8.dev2'
+__version_tuple__ = version_tuple = (2, 3, 8, 'dev2')
+
+__commit_id__ = commit_id = 'g13d41716a'

{pygama-2.3.8a1 → pygama-2.3.8.dev2}/src/pygama/evt/modules/spms.py

@@ -111,6 +111,10 @@ def gather_pulse_data(
         chan_tcm_indexs = np.where(ak.flatten(tcm.table_key) == table_id)[0].to_numpy()
         tbl_idxs_ch = ak.flatten(tcm.row_in_table)[chan_tcm_indexs].to_numpy()
 
+        if len(tbl_idxs_ch) == 0:
+            msg = f"No entries for channel {channel}"
+            log.warning(msg)
+            continue  # would break lgdo_obj.view_as("np") otherwise
         # read the data in
         lgdo_obj = lh5.read(
             f"/{channel}/{tierinfo.group}/{column}", tierinfo.file, idx=tbl_idxs_ch

{pygama-2.3.8a1 → pygama-2.3.8.dev2}/src/pygama/math/binned_fitting.py

@@ -311,16 +311,23 @@ def gauss_mode_width_max(
             f"[0, {len(hist) - 1}] for mode_guess={mode_guess}"
         )
         raise ValueError(msg)
-    if i_0 < int(np.floor(n_bins / 2)):
-        msg = f"Fit range exceeds histogram bounds: i_0={i_0}"
-        raise ValueError(msg)
+
     amp_guess = hist[i_0]
-    i_0 -= int(np.floor(n_bins / 2))
+    center_i = i_0
+    i_0 = center_i - int(np.floor(n_bins / 2))
     i_n = i_0 + n_bins
-    if i_n >= len(hist):
-        msg = f"Fit range exceeds histogram bounds: i_n={i_n}, hist length: {len(hist)}"
+    # Recompute (i_0, i_n) together to keep the window size consistent
+    if i_0 < 0:
+        i_0 = 0
+        i_n = n_bins
+    if i_n > len(hist):
+        i_n = len(hist)
+        i_0 = len(hist) - n_bins
+    if i_0 < 0:
+        msg = f"n_bins={n_bins} exceeds histogram size {len(hist)}"
         raise ValueError(msg)
-    width_guess = bin_centers[i_n] - bin_centers[i_0]
+    # Use bins (not bin_centers) so that i_n == len(hist) is a valid index
+    width_guess = bins[i_n] - bins[i_0]
     vv = None if var is None else var[i_0:i_n]
     guess = (mode_guess, width_guess, amp_guess)
     pars, _errors, cov = fit_binned(