legend-pydataobj 1.6.0__tar.gz → 1.6.2__tar.gz

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/PKG-INFO

@@ -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 → legend_pydataobj-1.6.2}/src/legend_pydataobj.egg-info/PKG-INFO

@@ -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 → legend_pydataobj-1.6.2}/src/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)

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/src/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 (

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/src/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(

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/src/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"""

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/src/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:

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/tests/conftest.py

@@ -26,5 +26,5 @@ def pytest_sessionfinish(session, exitstatus):  # noqa: ARG001
 @pytest.fixture(scope="session")
 def lgnd_test_data():
     ldata = LegendTestData()
-    ldata.checkout("5097863")
+    ldata.checkout("8f55832")
     return ldata

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/tests/lh5/conftest.py

@@ -19,6 +19,7 @@ def lh5_file(tmptestdir):
     struct = lgdo.Struct()
     struct.add_field("scalar", lgdo.Scalar(value=10, attrs={"sth": 1}))
     struct.add_field("array", types.Array(nda=np.array([1, 2, 3, 4, 5])))
+    struct.add_field("array2d", types.Array(shape=(23, 56), fill_val=69, dtype=int))
     struct.add_field(
         "aoesa",
         types.ArrayOfEqualSizedArrays(shape=(5, 5), dtype=np.float32, fill_val=42),

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/tests/lh5/test_lh5_store.py

@@ -84,6 +84,10 @@ def test_read_array(lh5_file):
             is DEFAULT_HDF5_SETTINGS["compression"]
         )
 
+    lh5_obj, n_rows = store.read("/data/struct_full/array2d", lh5_file)
+    assert isinstance(lh5_obj, types.Array)
+    assert lh5_obj == types.Array(shape=(23, 56), fill_val=69, dtype=int)
+
 
 def test_read_array_slice(lh5_file):
     store = lh5.LH5Store()
@@ -351,6 +355,7 @@ def test_read_with_field_mask(lh5_file):
     assert sorted(lh5_obj.keys()) == [
         "aoesa",
         "array",
+        "array2d",
         "empty_struct",
         "scalar",
         "table",

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/tests/types/test_table_eval.py

@@ -22,6 +22,7 @@ def test_eval_dependency():
                 ],
             ),
             "e": lgdo.VectorOfVectors([[1, 2, 3], [4], [], [8, 6]]),
+            "ee": lgdo.VectorOfVectors([[[1], [2, 3]], [[], [4]], [[]], [[8, 6]]]),
             "tbl": lgdo.Table(
                 col_dict={
                     "z": lgdo.Array([1, 1, 1, 1]),
@@ -60,6 +61,10 @@ def test_eval_dependency():
     assert isinstance(r, lgdo.VectorOfVectors)
     assert r == lgdo.VectorOfVectors([[3, 5, 7], [9], [], [17, 13]])
 
+    r = obj.eval("2*ee + 1")
+    assert isinstance(r, lgdo.VectorOfVectors)
+    assert r == lgdo.VectorOfVectors([[[3], [5, 7]], [[], [9]], [[]], [[17, 13]]])
+
     r = obj.eval("e > 2")
     assert isinstance(r, lgdo.VectorOfVectors)
     assert r == lgdo.VectorOfVectors([[False, False, True], [True], [], [True, True]])

{legend_pydataobj-1.6.0 → legend_pydataobj-1.6.2}/tests/types/test_vectorofvectors.py

@@ -11,7 +11,7 @@ import pint
 import pytest
 
 import lgdo
-from lgdo import Array, VectorOfVectors
+from lgdo import Array, VectorOfVectors, lh5
 
 VovColl = namedtuple("VovColl", ["v2d", "v3d", "v4d"])
 
@@ -414,3 +414,13 @@ def test_view_as(testvov):
     assert ak.is_valid(ak_arr)
     assert len(ak_arr) == len(v3d)
     assert ak.all(ak_arr == [[[1, 2], [3, 4, 5]], [[2], [4, 8, 9, 7]], [[5, 3, 1]]])
+
+
+def test_lh5_iterator_view_as(lgnd_test_data):
+    it = lh5.LH5Iterator(
+        lgnd_test_data.get_path("lh5/l200-p03-r000-phy-20230312T055349Z-tier_psp.lh5"),
+        "ch1067205/dsp/energies",
+    )
+
+    for obj, _, _ in it:
+        assert ak.is_valid(obj.view_as("ak"))