legend-pydataobj 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

{legend_pydataobj-1.6.0.dist-info → legend_pydataobj-1.6.2.dist-info}/METADATA

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

{legend_pydataobj-1.6.0.dist-info → legend_pydataobj-1.6.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lgdo/__init__.py,sha256=nv9kORuX2FCA6rQLbH959E0fuGMfZvHb0H5uyrLr2WI,3046
-lgdo/_version.py,sha256=Ry70pc5l-IBhT9gahlkNwZPp4g0CzVEWqsat9H-UASY,411
+lgdo/_version.py,sha256=ay9A4GSmtr3NioHirRgXvWfXtjwRjzXIO_WPuFobCoI,411
 lgdo/cli.py,sha256=hHc0Cz4ZXEOwo55oIukHAhHUkw09ePr4m3sO7eUbWHA,8018
 lgdo/lgdo_utils.py,sha256=6a2YWEwpyEMXlAyTHZMO01aqxy6SxJzPZkGNWKNWuS0,2567
 lgdo/lh5_store.py,sha256=xHwzbKNueEtFwScxrgfvCo2_bWKS6j7ojrpeF9kQflc,8483
@@ -14,7 +14,7 @@ lgdo/compression/utils.py,sha256=W2RkBrxPpXlat84dnU9Ad7d_tTws0irtGl7O1dNWjnk,114
 lgdo/compression/varlen.py,sha256=6ZZUItyoOfygDdE0DyoISeFZfqdbH6xl7T0eclfarzg,15127
 lgdo/lh5/__init__.py,sha256=KzWF6HI-6N1NqQUm8LAxMmDbg0rgRY4DAaJ2s7w2tLM,811
 lgdo/lh5/core.py,sha256=ap7K6GrbjdF4n-hvPPVeXOk76OF0S4uBclbP3mNHk04,10780
-lgdo/lh5/datatype.py,sha256=6OfLmoqrfPxZLSmGXIF9xFIwyY6u0yoXT_lr1k_5NcM,1619
+lgdo/lh5/datatype.py,sha256=VhPWeWv3FW8XM6ZOFOdTZOYK3_hRZ3i0fYsBOEOIF5U,1623
 lgdo/lh5/exceptions.py,sha256=QWStQD27Qrm4oYs5Z3UAIoq4y7X-f_Z6QWCBCH0DXwE,1006
 lgdo/lh5/iterator.py,sha256=eqH9a_ZjEhgqJUZbMj36jXK_1Xbx86450DVw7LHNB3Y,12369
 lgdo/lh5/store.py,sha256=sYX1harVGRyP0oq1LGq2qrFhorutkev9MOovwhzEWZ4,6670
@@ -28,9 +28,9 @@ lgdo/lh5/_serializers/read/encoded.py,sha256=LTdSqEH5tJOdqcSCrMLWutYiQ4FwBFIPF7F
 lgdo/lh5/_serializers/read/ndarray.py,sha256=4vdgHwj_yIon1KvSiOkDSHq7CJhYtFcjjSHijsvp1aU,3481
 lgdo/lh5/_serializers/read/scalar.py,sha256=YwvA6kyNUh6H0kh2L7bzfgLkA8Et2dQFjp2nFnRmeGI,755
 lgdo/lh5/_serializers/read/utils.py,sha256=K_HDQ_H-vtbs_gEif1MTtFki4qh6lw-5HE7b-7_s-9Q,417
-lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=nlaoOuDPDQvZWslGm3YxyRkcFodfSBEXRKwY046VDvM,6318
+lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=ED4gr2Sw5TZBeww2c2kLbqn9dWYBk1VTgHiR4-5E1Mc,6665
 lgdo/lh5/_serializers/write/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgdo/lh5/_serializers/write/array.py,sha256=Gosg8rOCH_2dRMj_oNSWyXuoYXDjy0OK--GCYWswR4U,2803
+lgdo/lh5/_serializers/write/array.py,sha256=lpz0V7bvy2rWkUuSAgX3aTSUe-HLvLnmnIXZLPX_Ddw,2802
 lgdo/lh5/_serializers/write/composite.py,sha256=f3b4YeOoUr8y1wA7zsKEFT5mIwX8SD0MYQ40unMRyQc,8460
 lgdo/lh5/_serializers/write/scalar.py,sha256=gkcF2WVBR3aQYl0EynbVUocx4y3r8tvPfQYQJjkPvP4,643
 lgdo/lh5/_serializers/write/vector_of_vectors.py,sha256=mZuC7NIb-IkmJ9wgn37TTvFTLLAFR71iivrY4yiSJZM,2912
@@ -42,13 +42,13 @@ lgdo/types/fixedsizearray.py,sha256=7Fj4QS9ubaeEf2tM3HwjSs6AuG8hKSYaT6Hy7Y_VHdQ,
 lgdo/types/lgdo.py,sha256=UnJDi1emQYVgH_H29Vipfs4LelPopxG5pgZUu1eKOlw,2761
 lgdo/types/scalar.py,sha256=c5Es2vyDqyWTPV6mujzfIzMpC1jNWkEIcvYyWQUxH3Q,1933
 lgdo/types/struct.py,sha256=rLtyPthut2wjwiOqwntPrYjjt3uRQbTLWWjiewfKm20,3979
-lgdo/types/table.py,sha256=YL_71PalmGnh4YvaDlK0oY4aeypYRAETwJEkRHVOUu8,16887
+lgdo/types/table.py,sha256=-ldEt_sY-Q5GqcqrDjvCKJ5fZ79NDa9hY-gs4mYgNZQ,17153
 lgdo/types/vectorofvectors.py,sha256=9pKtPfvh0vQ-nmg68LUM8cMttoxTl0BG3QH5awQtSxo,24503
 lgdo/types/vovutils.py,sha256=7BWPP0BSj-92ifbCIUBcfqxG5-TS8uxujTyJJuDFI04,10302
 lgdo/types/waveformtable.py,sha256=f2tS4f1OEoYaTM5ldCX9zmw8iSISCT3t3wS1SrPdu_o,9901
-legend_pydataobj-1.6.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-legend_pydataobj-1.6.0.dist-info/METADATA,sha256=WuFjFye6W_q3YdhE5tHCQlcKNaOCml-TK7ItWAM_f34,44353
-legend_pydataobj-1.6.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-legend_pydataobj-1.6.0.dist-info/entry_points.txt,sha256=Uu5MTlppBZxB4QGlLv-oX8FqACWjAZDNii__TBDJwLQ,72
-legend_pydataobj-1.6.0.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
-legend_pydataobj-1.6.0.dist-info/RECORD,,
+legend_pydataobj-1.6.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_pydataobj-1.6.2.dist-info/METADATA,sha256=XON5L-CQcu1HuiKff1CoE5QqBOQtr1bHXxYvErIYdFg,44353
+legend_pydataobj-1.6.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+legend_pydataobj-1.6.2.dist-info/entry_points.txt,sha256=Uu5MTlppBZxB4QGlLv-oX8FqACWjAZDNii__TBDJwLQ,72
+legend_pydataobj-1.6.2.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
+legend_pydataobj-1.6.2.dist-info/RECORD,,

lgdo/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.2'
+__version_tuple__ = version_tuple = (1, 6, 2)

lgdo/lh5/_serializers/read/vector_of_vectors.py

@@ -168,6 +168,12 @@ def _h5_read_vector_of_vectors(
     )
 
     if obj_buf is not None:
+        # 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]
+
         return obj_buf, n_rows_read
 
     return (

lgdo/lh5/_serializers/write/array.py

@@ -10,7 +10,7 @@ from ...exceptions import LH5EncodeError
 
 log = logging.getLogger(__name__)
 
-DEFAULT_HDF5_SETTINGS: dict[str, ...] = {"shuffle": True, "compression": "gzip"}
+DEFAULT_HDF5_SETTINGS: dict[str, ...] = {"shuffle": True, "compression": "lzf"}
 
 
 def _h5_write_array(

lgdo/lh5/datatype.py

@@ -16,9 +16,9 @@ _lgdo_datatype_map: dict[str, lgdo.LGDO] = OrderedDict(
         ),
         (lgdo.Struct, r"^struct\{.*\}$"),
         (lgdo.Table, r"^table\{.*\}$"),
-        (lgdo.FixedSizeArray, r"^fixedsize_array<1>\{.+\}$"),
+        (lgdo.FixedSizeArray, r"^fixedsize_array<\d+>\{.+\}$"),
         (lgdo.ArrayOfEqualSizedArrays, r"^array_of_equalsized_arrays<1,1>\{.+\}$"),
-        (lgdo.Array, r"^array<1>\{.+\}$"),
+        (lgdo.Array, r"^array<\d+>\{.+\}$"),
     ]
 )
 """Mapping between LGDO types and regular expression defining the corresponding datatype string"""

lgdo/types/table.py

@@ -327,6 +327,9 @@ class Table(Struct):
                 else:
                     self_unwrap[obj] = flat_self[obj].view_as("np", with_units=False)
 
+        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:
             out_data = ne.evaluate(
@@ -334,6 +337,9 @@ class Table(Struct):
                 local_dict=(self_unwrap | parameters),
             )
 
+            msg = f"...the result is {out_data!r}"
+            log.debug(msg)
+
             # need to convert back to LGDO
             # np.evaluate should always return a numpy thing?
             if out_data.ndim == 0:
@@ -353,6 +359,9 @@ class Table(Struct):
         globs = {"ak": ak, "np": np}
         out_data = eval(expr, globs, (self_unwrap | parameters))
 
+        msg = f"...the result is {out_data!r}"
+        log.debug(msg)
+
         # need to convert back to LGDO
         if isinstance(out_data, ak.Array):
             if out_data.ndim == 1: