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

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

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

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

@@ -1,5 +1,5 @@
 lgdo/__init__.py,sha256=QMYK9HhoMi0pbahPN8mPD18gyTxscFgo7QKfCxVhy-0,3196
-lgdo/_version.py,sha256=T2YM9w8KO8zThn0UoO-QJVXyTdR0uuWyR6VszamBivY,413
+lgdo/_version.py,sha256=DTx-xWFNqQz9P95loDaKgAV4WuiaQCg5aAro9mWfGoA,413
 lgdo/cli.py,sha256=Qm2EPmoIVxENAR8BeW7oWpTdHT4GbV-owfzM5NkgjvM,9353
 lgdo/lgdo_utils.py,sha256=6a2YWEwpyEMXlAyTHZMO01aqxy6SxJzPZkGNWKNWuS0,2567
 lgdo/lh5_store.py,sha256=5BzbJA9sLcqjp8bJDc2olwOiw0VS6rmfg3cfh1kQkRY,8512
@@ -30,7 +30,7 @@ lgdo/lh5/_serializers/read/scalar.py,sha256=kwhWm1T91pXf86CqtUUD8_qheSR92gXZrQVt
 lgdo/lh5/_serializers/read/utils.py,sha256=USacxDA0eY-u9lDOZDuJHcScoSVMNeAYljmRvW0T1Jk,7587
 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/array.py,sha256=66DKnW2yqIBlUGNBPWcE-m4W0B2-nTKusDHGX9m6GY0,3223
 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
@@ -44,12 +44,12 @@ 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=KPxKeLKqKQPkC_H75XraW0c1KRAhDdyGKBktVkD-KLw,18779
-lgdo/types/vectorofvectors.py,sha256=cic9PsZ5EptQ6RMsykYeVHA8T7fh_KBZCcqeTP4i1wU,24395
+lgdo/types/vectorofvectors.py,sha256=Al9FmY44M-vnzhPdQlFOzwm06LNGBI7RSLSdU5pl9us,24663
 lgdo/types/vovutils.py,sha256=7BWPP0BSj-92ifbCIUBcfqxG5-TS8uxujTyJJuDFI04,10302
 lgdo/types/waveformtable.py,sha256=f2tS4f1OEoYaTM5ldCX9zmw8iSISCT3t3wS1SrPdu_o,9901
-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.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_pydataobj-1.11.5.dist-info/METADATA,sha256=fV8jiU0IVhLxZWz9r6MdH1v53yEecRwaWlF8jN5zxxc,44382
+legend_pydataobj-1.11.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+legend_pydataobj-1.11.5.dist-info/entry_points.txt,sha256=Uu5MTlppBZxB4QGlLv-oX8FqACWjAZDNii__TBDJwLQ,72
+legend_pydataobj-1.11.5.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
+legend_pydataobj-1.11.5.dist-info/RECORD,,

lgdo/_version.py

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

lgdo/lh5/_serializers/write/array.py

@@ -64,6 +64,11 @@ def _h5_write_array(
         if "hdf5_settings" in obj.attrs:
             h5py_kwargs |= obj.attrs["hdf5_settings"]
 
+        # HACK: a tuple is strictly requested for the "chunks" setting, but
+        # we'd like to pass a list too in some situations
+        if "chunks" in h5py_kwargs and isinstance(h5py_kwargs["chunks"], list):
+            h5py_kwargs["chunks"] = tuple(h5py_kwargs["chunks"])
+
         # create HDF5 dataset
         ds = group.create_dataset(name, data=nda, **h5py_kwargs)
 

lgdo/types/vectorofvectors.py

@@ -13,6 +13,7 @@ import awkward as ak
 import awkward_pandas as akpd
 import numpy as np
 import pandas as pd
+from numba import jit
 from numpy.typing import ArrayLike, DTypeLike, NDArray
 
 from .. import utils
@@ -560,18 +561,16 @@ class VectorOfVectors(LGDO):
             compatible one.
         """
         if self.ndim == 2:
-            ak_arr = self.view_as("ak")
-
             if max_len is None:
-                max_len = int(ak.max(ak.count(ak_arr, axis=-1)))
-
-            nda = ak.fill_none(
-                ak.pad_none(ak_arr, max_len, clip=True), fill_val
-            ).to_numpy(allow_missing=False)
-
+                lens = np.copy(self.cumulative_length)
+                lens[1:] = lens[1:] - lens[:-1]
+                max_len = int(np.max(lens))
+            nda = np.full((len(self), max_len), fill_val)
             if preserve_dtype:
                 nda = nda.astype(self.flattened_data.dtype, copy=False)
 
+            _to_aoesa(self.flattened_data.nda, self.cumulative_length.nda, nda)
+
             return aoesa.ArrayOfEqualSizedArrays(nda=nda, attrs=self.getattrs())
 
         raise NotImplementedError
@@ -664,3 +663,11 @@ class VectorOfVectors(LGDO):
 
         msg = f"{library} is not a supported third-party format."
         raise ValueError(msg)
+
+
+@jit
+def _to_aoesa(flattened_array, cumulative_length, nda):
+    prev_cl = 0
+    for i, cl in enumerate(cumulative_length):
+        nda[i, : (cl - prev_cl)] = flattened_array[prev_cl:cl]
+        prev_cl = cl