legend-pydataobj 1.11.1__py3-none-any.whl → 1.11.3__py3-none-any.whl

{legend_pydataobj-1.11.1.dist-info → legend_pydataobj-1.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: legend_pydataobj
-Version: 1.11.1
+Version: 1.11.3
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration

{legend_pydataobj-1.11.1.dist-info → legend_pydataobj-1.11.3.dist-info}/RECORD

@@ -1,26 +1,26 @@
-lgdo/__init__.py,sha256=1YUuAFQHNrOOkr3ZfrtEJOpYqgzbHRYA81ssbQZitQE,3196
-lgdo/_version.py,sha256=ViXoKdbMMGZh_eRAk57AUhm5qTprWkA8tHRRDjKZFeY,413
+lgdo/__init__.py,sha256=QMYK9HhoMi0pbahPN8mPD18gyTxscFgo7QKfCxVhy-0,3196
+lgdo/_version.py,sha256=T2YM9w8KO8zThn0UoO-QJVXyTdR0uuWyR6VszamBivY,413
 lgdo/cli.py,sha256=Qm2EPmoIVxENAR8BeW7oWpTdHT4GbV-owfzM5NkgjvM,9353
 lgdo/lgdo_utils.py,sha256=6a2YWEwpyEMXlAyTHZMO01aqxy6SxJzPZkGNWKNWuS0,2567
 lgdo/lh5_store.py,sha256=5BzbJA9sLcqjp8bJDc2olwOiw0VS6rmfg3cfh1kQkRY,8512
 lgdo/logging.py,sha256=82wIOj7l7xr3WYyeHdpSXbbjzHJsy-uRyKYUYx2vMfQ,1003
 lgdo/units.py,sha256=VQYME86_ev9S7Fq8RyCOQNqYr29MphTTYemmEouZafk,161
 lgdo/utils.py,sha256=WRTmXnaQ-h2hVxwJ27qiOigdsD3DHcaDrdDjvupCuZU,3940
-lgdo/compression/__init__.py,sha256=gqbdx4NnpCcW-C7kUXV-hVUZFiNlbCwIbs3uzFe4AFE,1127
+lgdo/compression/__init__.py,sha256=xHt_8Th0LxxNwj9iYHf5uGNTm3A_4qyW7zEVdAX3NwI,1127
 lgdo/compression/base.py,sha256=82cQJujfvoAOKBFx761dEcx_xM02TBCBBuBo6i78tuI,838
 lgdo/compression/generic.py,sha256=tF3UhLJbUDcovLxpIzgQRxFSjZ5Fz3uDRy9kI4mFntQ,2515
 lgdo/compression/radware.py,sha256=GcNTtjuyL7VBBqziUBmSqNXuhqy1bJJgvcyvyumPtrc,23839
 lgdo/compression/utils.py,sha256=W2RkBrxPpXlat84dnU9Ad7d_tTws0irtGl7O1dNWjnk,1140
 lgdo/compression/varlen.py,sha256=6ZZUItyoOfygDdE0DyoISeFZfqdbH6xl7T0eclfarzg,15127
-lgdo/lh5/__init__.py,sha256=KzWF6HI-6N1NqQUm8LAxMmDbg0rgRY4DAaJ2s7w2tLM,811
+lgdo/lh5/__init__.py,sha256=FflSA1LF3RTom1YvlGmTleJcl1ytxwez8B_Hn_o10wU,811
 lgdo/lh5/core.py,sha256=__-A6Abctzfwfo4-xJi68xs2e4vfzONEQTJVrUCOw-I,13922
 lgdo/lh5/datatype.py,sha256=O_7BqOlX8PFMyG0ppkfUT5aps5HEqX0bpuKcJO3jhu0,1691
-lgdo/lh5/exceptions.py,sha256=43fQ8MnAsylY4aG6GF6hsRclagYaMkUv8957c1uTjWE,962
+lgdo/lh5/exceptions.py,sha256=3kj8avXl4eBGvebl3LG12gJEmw91W0T8PYR0AfvUAyM,1211
 lgdo/lh5/iterator.py,sha256=ZaBBnmuNIjinwO0JUY55wLxX8Om9rVRRzXBC5uHmSKM,19772
 lgdo/lh5/store.py,sha256=3wAaQDd1Zmo0_bQ9DbB-FbKS4Uy_Tb642qKHXtZpSw4,10643
 lgdo/lh5/tools.py,sha256=T9CgHA8A3_tVBMtiNJ6hATQKhdqI61m3cX4p2wGKc6c,9937
 lgdo/lh5/utils.py,sha256=ioz8DlyXZsejwnU2qYdIccdHcF12H62jgLkZsiDOLSM,6243
-lgdo/lh5/_serializers/__init__.py,sha256=NSH8uOVY3r_Wn3t0nQHhEHhkHT7-GJYlxuS3YTDJa5Y,1263
+lgdo/lh5/_serializers/__init__.py,sha256=eZzxMp1SeZWG0PkEXUiCz3XyprQ8EmelHUmJogC8xYE,1263
 lgdo/lh5/_serializers/read/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgdo/lh5/_serializers/read/array.py,sha256=uWfMCihfAmW2DE2ewip2qCK_kvQC_mb2zvOv26uzijc,1000
 lgdo/lh5/_serializers/read/composite.py,sha256=yTm5dfTgkIL7eG9iZXxhdiRhG04cQLd_hybP4wmxCJE,11809
@@ -28,28 +28,28 @@ lgdo/lh5/_serializers/read/encoded.py,sha256=Q98c08d8LkZq2AlY4rThYECVaEqwbv4T2Ur
 lgdo/lh5/_serializers/read/ndarray.py,sha256=lFCXD6bSzmMOH7cVmvRYXakkfMCI8EoqTPNONRJ1F0s,3690
 lgdo/lh5/_serializers/read/scalar.py,sha256=kwhWm1T91pXf86CqtUUD8_qheSR92gXZrQVtssV5YCg,922
 lgdo/lh5/_serializers/read/utils.py,sha256=USacxDA0eY-u9lDOZDuJHcScoSVMNeAYljmRvW0T1Jk,7587
-lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=98P_XoXE8QWLQeSyBm9QHBF_5WGHKrfpNppLhj3QrbE,7169
+lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=Fqh2gXFqeR2y0ofQn4GoSdSAATPvHiuBzzcgL16e6ss,7205
 lgdo/lh5/_serializers/write/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgdo/lh5/_serializers/write/array.py,sha256=eyVPwwddVOR9TNNyliCNYlS-XYXsdTEA8QoTnnOYJbw,2943
 lgdo/lh5/_serializers/write/composite.py,sha256=I6lH0nWFIpAfZyG4-0rLxzg3mfazZ_FEhQVp1FZ0aA4,9254
 lgdo/lh5/_serializers/write/scalar.py,sha256=JPt_fcdTKOSFp5hfJdcKIfK4hxhcD8vhOlvDF-7btQ8,763
 lgdo/lh5/_serializers/write/vector_of_vectors.py,sha256=puGQX9XF5P_5DVbm_Cc6TvPrsDywgBLSYtkqFNltbB4,3493
-lgdo/types/__init__.py,sha256=B7qEdlD0yJ8IUHK8xUKSyhRTY5LD1B148DPXI6iaB7w,821
+lgdo/types/__init__.py,sha256=DNfOErPiAZg-7Gygkp6ZKAi20Yrm1mfderZHvKo1Y4s,821
 lgdo/types/array.py,sha256=sUxh1CNCaefrnybt5qdjmmMpVQa_RqFxUv1tJ_pyBbc,6537
 lgdo/types/arrayofequalsizedarrays.py,sha256=DOGJiTmc1QCdm7vLbE6uIRXoMPtt8uuCfmwQawgWf5s,4949
 lgdo/types/encoded.py,sha256=JW4U5ow7KLMzhKnmhdnxbC3SZJAs4bOEDZWKG4KY1uU,15293
 lgdo/types/fixedsizearray.py,sha256=7RjUwTz1bW0pcrdy27JlfrXPAuOU89Kj7pOuSUCojK8,1527
-lgdo/types/histogram.py,sha256=XuE81aRXgIY-g-rFgr9Jo7KZ-0tsNpq1lRVRyA4uTSQ,19679
-lgdo/types/lgdo.py,sha256=UnJDi1emQYVgH_H29Vipfs4LelPopxG5pgZUu1eKOlw,2761
+lgdo/types/histogram.py,sha256=y6j2VDuGYYnLy7WI4J90ApS0PAwic4kCpouZPX09Nus,19974
+lgdo/types/lgdo.py,sha256=RQ2P70N7IWMBDnLLuJI3sm6zQTIKyOMSsKZtBNzmE90,2928
 lgdo/types/scalar.py,sha256=c5Es2vyDqyWTPV6mujzfIzMpC1jNWkEIcvYyWQUxH3Q,1933
 lgdo/types/struct.py,sha256=Q0OWLVd4B0ciLb8t6VsxU3MPbmGLZ7WfQNno1lSQS0Q,4918
-lgdo/types/table.py,sha256=lB_jj6C0C5w8jbo17Lp0P8_uY8jy7opkTJc1OrbCGEI,17956
+lgdo/types/table.py,sha256=KPxKeLKqKQPkC_H75XraW0c1KRAhDdyGKBktVkD-KLw,18779
 lgdo/types/vectorofvectors.py,sha256=cic9PsZ5EptQ6RMsykYeVHA8T7fh_KBZCcqeTP4i1wU,24395
 lgdo/types/vovutils.py,sha256=7BWPP0BSj-92ifbCIUBcfqxG5-TS8uxujTyJJuDFI04,10302
 lgdo/types/waveformtable.py,sha256=f2tS4f1OEoYaTM5ldCX9zmw8iSISCT3t3wS1SrPdu_o,9901
-legend_pydataobj-1.11.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-legend_pydataobj-1.11.1.dist-info/METADATA,sha256=RWtG96_oyl1V4jeydeI7P1fOjo29UafhzV-D7oKxefU,44382
-legend_pydataobj-1.11.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-legend_pydataobj-1.11.1.dist-info/entry_points.txt,sha256=Uu5MTlppBZxB4QGlLv-oX8FqACWjAZDNii__TBDJwLQ,72
-legend_pydataobj-1.11.1.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
-legend_pydataobj-1.11.1.dist-info/RECORD,,
+legend_pydataobj-1.11.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_pydataobj-1.11.3.dist-info/METADATA,sha256=rYpLl_oH_V8OMAXKOb-0YOl_Y_GdtCfi91ZnrI7rVTU,44382
+legend_pydataobj-1.11.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+legend_pydataobj-1.11.3.dist-info/entry_points.txt,sha256=Uu5MTlppBZxB4QGlLv-oX8FqACWjAZDNii__TBDJwLQ,72
+legend_pydataobj-1.11.3.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
+legend_pydataobj-1.11.3.dist-info/RECORD,,

{legend_pydataobj-1.11.1.dist-info → legend_pydataobj-1.11.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

lgdo/__init__.py

@@ -62,23 +62,23 @@ from .types import (
 )
 
 __all__ = [
+    "LGDO",
     "Array",
-    "ArrayOfEqualSizedArrays",
     "ArrayOfEncodedEqualSizedArrays",
+    "ArrayOfEqualSizedArrays",
     "FixedSizeArray",
     "Histogram",
-    "LGDO",
+    "LH5Iterator",
+    "LH5Store",
     "Scalar",
     "Struct",
     "Table",
-    "VectorOfVectors",
     "VectorOfEncodedVectors",
+    "VectorOfVectors",
     "WaveformTable",
+    "__version__",
     "load_dfs",
     "load_nda",
     "ls",
     "show",
-    "LH5Iterator",
-    "LH5Store",
-    "__version__",
 ]

lgdo/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.1'
-__version_tuple__ = version_tuple = (1, 11, 1)
+__version__ = version = '1.11.3'
+__version_tuple__ = version_tuple = (1, 11, 3)

lgdo/compression/__init__.py

@@ -30,9 +30,9 @@ from .radware import RadwareSigcompress
 from .varlen import ULEB128ZigZagDiff
 
 __all__ = [
-    "WaveformCodec",
-    "encode",
-    "decode",
     "RadwareSigcompress",
     "ULEB128ZigZagDiff",
+    "WaveformCodec",
+    "decode",
+    "encode",
 ]

lgdo/lh5/__init__.py

@@ -20,10 +20,10 @@ __all__ = [
     "LH5Store",
     "load_dfs",
     "load_nda",
+    "ls",
     "read",
-    "write",
     "read_as",
-    "ls",
     "read_n_rows",
     "show",
+    "write",
 ]

lgdo/lh5/_serializers/__init__.py

@@ -24,22 +24,22 @@ from .write.scalar import _h5_write_scalar
 from .write.vector_of_vectors import _h5_write_vector_of_vectors
 
 __all__ = [
-    "_h5_read_lgdo",
-    "_h5_read_vector_of_vectors",
-    "_h5_read_ndarray",
     "_h5_read_array",
+    "_h5_read_array_of_encoded_equalsized_arrays",
+    "_h5_read_array_of_equalsized_arrays",
     "_h5_read_encoded_array",
     "_h5_read_fixedsize_array",
-    "_h5_read_array_of_equalsized_arrays",
-    "_h5_read_struct",
-    "_h5_read_table",
     "_h5_read_histogram",
+    "_h5_read_lgdo",
+    "_h5_read_ndarray",
     "_h5_read_scalar",
-    "_h5_read_array_of_encoded_equalsized_arrays",
+    "_h5_read_struct",
+    "_h5_read_table",
     "_h5_read_vector_of_encoded_vectors",
-    "_h5_write_scalar",
+    "_h5_read_vector_of_vectors",
     "_h5_write_array",
-    "_h5_write_vector_of_vectors",
-    "_h5_write_struct",
     "_h5_write_lgdo",
+    "_h5_write_scalar",
+    "_h5_write_struct",
+    "_h5_write_vector_of_vectors",
 ]

lgdo/lh5/_serializers/read/vector_of_vectors.py

@@ -189,8 +189,9 @@ def _h5_read_vector_of_vectors(
         # if the buffer is partially filled, cumulative_length will be invalid
         # (i.e. non monotonically increasing). Let's fix that but filling the
         # rest of the array with the length of flattened_data
-        end = obj_buf_start + n_rows_read
-        obj_buf.cumulative_length.nda[end:] = obj_buf.cumulative_length.nda[end - 1]
+        if n_rows_read > 0:
+            end = obj_buf_start + n_rows_read
+            obj_buf.cumulative_length.nda[end:] = obj_buf.cumulative_length.nda[end - 1]
 
         return obj_buf, n_rows_read
 

lgdo/lh5/exceptions.py

@@ -16,6 +16,9 @@ class LH5DecodeError(Exception):
             + super().__str__()
         )
 
+    def __reduce__(self) -> tuple:  # for pickling.
+        return self.__class__, (*self.args, self.file, self.obj)
+
 
 class LH5EncodeError(Exception):
     def __init__(
@@ -32,3 +35,6 @@ class LH5EncodeError(Exception):
             f"while writing object {self.group}/{self.name} to file {self.file}: "
             + super().__str__()
         )
+
+    def __reduce__(self) -> tuple:  # for pickling.
+        return self.__class__, (*self.args, self.file, self.group, self.name)

lgdo/types/__init__.py

@@ -15,17 +15,17 @@ from .vectorofvectors import VectorOfVectors
 from .waveformtable import WaveformTable
 
 __all__ = [
+    "LGDO",
     "Array",
-    "ArrayOfEqualSizedArrays",
     "ArrayOfEncodedEqualSizedArrays",
+    "ArrayOfEqualSizedArrays",
     "FixedSizeArray",
     "Histogram",
-    "LGDO",
     "Scalar",
     "Struct",
     "Table",
-    "VectorOfVectors",
     "VectorOfEncodedVectors",
+    "VectorOfVectors",
     "WaveformTable",
 ]
 

lgdo/types/histogram.py

@@ -418,13 +418,18 @@ class Histogram(Struct):
 
     def __setitem__(self, name: str, obj: LGDO) -> None:
         # do not allow for new attributes on this
-        msg = "histogram fields cannot be mutated"
-        raise TypeError(msg)
+        known_keys = ("binning", "weights", "isdensity")
+        if name in known_keys and not dict.__contains__(self, name):
+            # but allow initialization while unpickling (after __init__() this is unreachable)
+            dict.__setitem__(self, name, obj)
+        else:
+            msg = "histogram fields cannot be mutated "
+            raise TypeError(msg)
 
     def __getattr__(self, name: str) -> None:
         # do not allow for new attributes on this
         msg = "histogram fields cannot be mutated"
-        raise TypeError(msg)
+        raise AttributeError(msg)
 
     def add_field(self, name: str | int, obj: LGDO) -> None:  # noqa: ARG002
         """

lgdo/types/lgdo.py

@@ -11,6 +11,12 @@ import pandas as pd
 class LGDO(ABC):
     """Abstract base class representing a LEGEND Data Object (LGDO)."""
 
+    def __new__(cls, *_args, **_kwargs):
+        # allow for (un-)pickling LGDO objects.
+        obj = super().__new__(cls)
+        obj.attrs = {}
+        return obj
+
     @abstractmethod
     def __init__(self, attrs: dict[str, Any] | None = None) -> None:
         self.attrs = {} if attrs is None else dict(attrs)

lgdo/types/table.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import logging
 from collections.abc import Mapping
+from types import ModuleType
 from typing import Any
 from warnings import warn
 
@@ -40,6 +41,12 @@ class Table(Struct):
     :meth:`__len__` to access valid data, which returns the ``size`` attribute.
     """
 
+    def __new__(cls, *args, **kwargs):
+        # allow for (un-)pickling LGDO objects.
+        obj = super().__new__(cls, *args, **kwargs)
+        obj.size = None
+        return obj
+
     def __init__(
         self,
         col_dict: Mapping[str, LGDO] | pd.DataFrame | ak.Array | None = None,
@@ -266,6 +273,7 @@ class Table(Struct):
         self,
         expr: str,
         parameters: Mapping[str, str] | None = None,
+        modules: Mapping[str, ModuleType] | None = None,
     ) -> LGDO:
         """Apply column operations to the table and return a new LGDO.
 
@@ -299,6 +307,10 @@ class Table(Struct):
             a dictionary of function parameters. Passed to
             :func:`numexpr.evaluate`` as `local_dict` argument or to
             :func:`eval` as `locals` argument.
+        modules
+            a dictionary of additional modules used by the expression. If this is not `None`
+            then :func:`eval`is used and the expression can depend on any modules from this dictionary in
+            addition to awkward and numpy. These are passed to :func:`eval` as `globals` argument.
 
         Examples
         --------
@@ -339,8 +351,8 @@ class Table(Struct):
         msg = f"evaluating {expr!r} with locals={(self_unwrap | parameters)} and {has_ak=}"
         log.debug(msg)
 
-        # use numexpr if we are only dealing with numpy data types
-        if not has_ak:
+        # use numexpr if we are only dealing with numpy data types (and no global dictionary)
+        if not has_ak and modules is None:
             out_data = ne.evaluate(
                 expr,
                 local_dict=(self_unwrap | parameters),
@@ -366,6 +378,9 @@ class Table(Struct):
 
         # resort to good ol' eval()
         globs = {"ak": ak, "np": np}
+        if modules is not None:
+            globs = globs | modules
+
         out_data = eval(expr, globs, (self_unwrap | parameters))
 
         msg = f"...the result is {out_data!r}"
@@ -380,6 +395,10 @@ class Table(Struct):
         if np.isscalar(out_data):
             return Scalar(out_data)
 
+        # if out_data is already an LGDO just return it
+        if isinstance(out_data, LGDO):
+            return out_data
+
         msg = (
             f"evaluation resulted in a {type(out_data)} object, "
             "I don't know which LGDO this corresponds to"