legend-pydataobj 1.12.0a4__py3-none-any.whl → 1.13.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/METADATA +1 -1
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/RECORD +17 -16
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/WHEEL +1 -1
- lgdo/_version.py +2 -2
- lgdo/lh5/__init__.py +2 -2
- lgdo/lh5/_serializers/write/array.py +2 -3
- lgdo/lh5/_serializers/write/composite.py +94 -14
- lgdo/lh5/core.py +14 -6
- lgdo/lh5/datatype.py +5 -1
- lgdo/lh5/iterator.py +38 -43
- lgdo/lh5/settings.py +34 -0
- lgdo/lh5/utils.py +1 -1
- lgdo/types/struct.py +52 -2
- lgdo/types/table.py +3 -2
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/entry_points.txt +0 -0
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/licenses/LICENSE +0 -0
- {legend_pydataobj-1.12.0a4.dist-info → legend_pydataobj-1.13.0.dist-info}/top_level.txt +0 -0
@@ -1,6 +1,6 @@
|
|
1
|
-
legend_pydataobj-1.
|
1
|
+
legend_pydataobj-1.13.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
2
2
|
lgdo/__init__.py,sha256=fkRv79kdtBasw31gPVK9SdLQ2vEEajTV2t3UPDvFg9o,3206
|
3
|
-
lgdo/_version.py,sha256=
|
3
|
+
lgdo/_version.py,sha256=tH8KJgTzCjiwedQXB_0jJIzqyRjqKXz40ci9OEj6wNA,513
|
4
4
|
lgdo/cli.py,sha256=s_EWTBWW76l7zWb6gaTSTjiT-0RzzcYEmjeFEQCVxfk,4647
|
5
5
|
lgdo/lgdo_utils.py,sha256=6a2YWEwpyEMXlAyTHZMO01aqxy6SxJzPZkGNWKNWuS0,2567
|
6
6
|
lgdo/logging.py,sha256=82wIOj7l7xr3WYyeHdpSXbbjzHJsy-uRyKYUYx2vMfQ,1003
|
@@ -12,15 +12,16 @@ lgdo/compression/generic.py,sha256=tF3UhLJbUDcovLxpIzgQRxFSjZ5Fz3uDRy9kI4mFntQ,2
|
|
12
12
|
lgdo/compression/radware.py,sha256=GcNTtjuyL7VBBqziUBmSqNXuhqy1bJJgvcyvyumPtrc,23839
|
13
13
|
lgdo/compression/utils.py,sha256=W2RkBrxPpXlat84dnU9Ad7d_tTws0irtGl7O1dNWjnk,1140
|
14
14
|
lgdo/compression/varlen.py,sha256=6ZZUItyoOfygDdE0DyoISeFZfqdbH6xl7T0eclfarzg,15127
|
15
|
-
lgdo/lh5/__init__.py,sha256=
|
15
|
+
lgdo/lh5/__init__.py,sha256=smHTawINIiogHNfYJq3aPvtxleTnBMdPADRCdc1wea8,748
|
16
16
|
lgdo/lh5/concat.py,sha256=BZCgK7TWPKK8fMmha8K83d3bC31FVO1b5LOW7x-Ru1s,6186
|
17
|
-
lgdo/lh5/core.py,sha256=
|
18
|
-
lgdo/lh5/datatype.py,sha256=
|
17
|
+
lgdo/lh5/core.py,sha256=U0ZZk6EmojRRYFBEo_bMy7jZ3SKBU41MIsSulyFxZIU,13752
|
18
|
+
lgdo/lh5/datatype.py,sha256=ry3twFaosuBoskiTKqtBYRMk9PQAf403593xKaItfog,1827
|
19
19
|
lgdo/lh5/exceptions.py,sha256=3kj8avXl4eBGvebl3LG12gJEmw91W0T8PYR0AfvUAyM,1211
|
20
|
-
lgdo/lh5/iterator.py,sha256=
|
20
|
+
lgdo/lh5/iterator.py,sha256=DOx6tDaJE1NajA7klTVWeblL_k6M0JWjmBiHYhpSri0,19970
|
21
|
+
lgdo/lh5/settings.py,sha256=cmPd6ZvneAF5sFMA1qf-9g_YSSygJcQSRmZDp1_sBEU,1001
|
21
22
|
lgdo/lh5/store.py,sha256=qkBm3gPbr1R2UlQpUuDR5sGRMzpYJBWFL8fDIry6tmQ,8474
|
22
23
|
lgdo/lh5/tools.py,sha256=drtJWHY82wCFuFr6LVVnm2AQgs_wZuFmAvyOB4tcOHs,6431
|
23
|
-
lgdo/lh5/utils.py,sha256=
|
24
|
+
lgdo/lh5/utils.py,sha256=D3Cn1U7NLEkUVGpKdUzTjoNIhaMBFZPbjGsjnxpeu6A,6362
|
24
25
|
lgdo/lh5/_serializers/__init__.py,sha256=eZzxMp1SeZWG0PkEXUiCz3XyprQ8EmelHUmJogC8xYE,1263
|
25
26
|
lgdo/lh5/_serializers/read/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
26
27
|
lgdo/lh5/_serializers/read/array.py,sha256=uWfMCihfAmW2DE2ewip2qCK_kvQC_mb2zvOv26uzijc,1000
|
@@ -31,8 +32,8 @@ lgdo/lh5/_serializers/read/scalar.py,sha256=kwhWm1T91pXf86CqtUUD8_qheSR92gXZrQVt
|
|
31
32
|
lgdo/lh5/_serializers/read/utils.py,sha256=YfSqPO-83A1XvhhuULxQ0Qz2A5ODa3sb7ApNxQVJXd0,7581
|
32
33
|
lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=765P8mElGArAaEPkHTAUXFQ47t1_3-3BQAete0LckBQ,7207
|
33
34
|
lgdo/lh5/_serializers/write/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
34
|
-
lgdo/lh5/_serializers/write/array.py,sha256=
|
35
|
-
lgdo/lh5/_serializers/write/composite.py,sha256=
|
35
|
+
lgdo/lh5/_serializers/write/array.py,sha256=gAB1EjPa9YojPqohVwY_VPeuY7_bLN-lttCmfgty-qk,3175
|
36
|
+
lgdo/lh5/_serializers/write/composite.py,sha256=sZfV8aGZCH0mvMZ2dGDKt-MoepgL4PlR9ZWbT_JNIjQ,12171
|
36
37
|
lgdo/lh5/_serializers/write/scalar.py,sha256=JPt_fcdTKOSFp5hfJdcKIfK4hxhcD8vhOlvDF-7btQ8,763
|
37
38
|
lgdo/lh5/_serializers/write/vector_of_vectors.py,sha256=puGQX9XF5P_5DVbm_Cc6TvPrsDywgBLSYtkqFNltbB4,3493
|
38
39
|
lgdo/types/__init__.py,sha256=DNfOErPiAZg-7Gygkp6ZKAi20Yrm1mfderZHvKo1Y4s,821
|
@@ -43,13 +44,13 @@ lgdo/types/fixedsizearray.py,sha256=7RjUwTz1bW0pcrdy27JlfrXPAuOU89Kj7pOuSUCojK8,
|
|
43
44
|
lgdo/types/histogram.py,sha256=Jz1lLH56BfYnmcUhxUHK1h2wLDQ0Abgyd-6LznU-3-k,19979
|
44
45
|
lgdo/types/lgdo.py,sha256=21YNtJCHnSO3M60rjsAdbMO5crDjL_0BtuFpudZ2xvU,4500
|
45
46
|
lgdo/types/scalar.py,sha256=c5Es2vyDqyWTPV6mujzfIzMpC1jNWkEIcvYyWQUxH3Q,1933
|
46
|
-
lgdo/types/struct.py,sha256=
|
47
|
-
lgdo/types/table.py,sha256=
|
47
|
+
lgdo/types/struct.py,sha256=m3pYfGfKptV8ti3wb4n1nsPKMvhjdWCFoRdR5YooZBM,6353
|
48
|
+
lgdo/types/table.py,sha256=hvOwhFkm-_CkNhGmD8SJoeepZcwFY6ItYOS76LztKtA,20158
|
48
49
|
lgdo/types/vectorofvectors.py,sha256=GbAKV_ehXN4XdWSwnmKS_ErCiudRetcH_3wo7iDrVjw,26854
|
49
50
|
lgdo/types/vovutils.py,sha256=LW3ZcwECxVYxxcFadAtY3nnK-9-rk8Xbg_m8hY30lo4,10708
|
50
51
|
lgdo/types/waveformtable.py,sha256=9S_NMg894NZTGt2pLuskwH4-zQ5EbLnzWI6FVui6fXE,9827
|
51
|
-
legend_pydataobj-1.
|
52
|
-
legend_pydataobj-1.
|
53
|
-
legend_pydataobj-1.
|
54
|
-
legend_pydataobj-1.
|
55
|
-
legend_pydataobj-1.
|
52
|
+
legend_pydataobj-1.13.0.dist-info/METADATA,sha256=j_3ElXkBp__BND0nYsfGPEEwVgB_-_P4LNcffIFiv70,44443
|
53
|
+
legend_pydataobj-1.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
54
|
+
legend_pydataobj-1.13.0.dist-info/entry_points.txt,sha256=0KWfnwbuwhNn0vPUqARukjp04Ca6lzfZBSirouRmk7I,76
|
55
|
+
legend_pydataobj-1.13.0.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
|
56
|
+
legend_pydataobj-1.13.0.dist-info/RECORD,,
|
lgdo/_version.py
CHANGED
@@ -17,5 +17,5 @@ __version__: str
|
|
17
17
|
__version_tuple__: VERSION_TUPLE
|
18
18
|
version_tuple: VERSION_TUPLE
|
19
19
|
|
20
|
-
__version__ = version = '1.
|
21
|
-
__version_tuple__ = version_tuple = (1,
|
20
|
+
__version__ = version = '1.13.0'
|
21
|
+
__version_tuple__ = version_tuple = (1, 13, 0)
|
lgdo/lh5/__init__.py
CHANGED
@@ -7,7 +7,6 @@ browsed easily in python like any `HDF5 <https://www.hdfgroup.org>`_ file using
|
|
7
7
|
|
8
8
|
from __future__ import annotations
|
9
9
|
|
10
|
-
from ._serializers.write.array import DEFAULT_HDF5_SETTINGS
|
11
10
|
from .core import read, read_as, write
|
12
11
|
from .iterator import LH5Iterator
|
13
12
|
from .store import LH5Store
|
@@ -15,14 +14,15 @@ from .tools import ls, show
|
|
15
14
|
from .utils import read_n_rows
|
16
15
|
|
17
16
|
__all__ = [
|
18
|
-
"DEFAULT_HDF5_SETTINGS",
|
19
17
|
"LH5Iterator",
|
20
18
|
"LH5Store",
|
21
19
|
"concat",
|
20
|
+
"default_hdf5_settings",
|
22
21
|
"ls",
|
23
22
|
"read",
|
24
23
|
"read_as",
|
25
24
|
"read_n_rows",
|
25
|
+
"reset_default_hdf5_settings",
|
26
26
|
"show",
|
27
27
|
"write",
|
28
28
|
]
|
@@ -6,12 +6,11 @@ import h5py
|
|
6
6
|
import numpy as np
|
7
7
|
|
8
8
|
from .... import types
|
9
|
+
from ... import settings
|
9
10
|
from ...exceptions import LH5EncodeError
|
10
11
|
|
11
12
|
log = logging.getLogger(__name__)
|
12
13
|
|
13
|
-
DEFAULT_HDF5_SETTINGS: dict[str, ...] = {"shuffle": True, "compression": "gzip"}
|
14
|
-
|
15
14
|
|
16
15
|
def _h5_write_array(
|
17
16
|
obj,
|
@@ -49,7 +48,7 @@ def _h5_write_array(
|
|
49
48
|
del group[name]
|
50
49
|
|
51
50
|
# set default compression options
|
52
|
-
for k, v in DEFAULT_HDF5_SETTINGS.items():
|
51
|
+
for k, v in settings.DEFAULT_HDF5_SETTINGS.items():
|
53
52
|
h5py_kwargs.setdefault(k, v)
|
54
53
|
|
55
54
|
# compress using the 'compression' LGDO attribute, if available
|
@@ -64,6 +64,59 @@ def _h5_write_lgdo(
|
|
64
64
|
|
65
65
|
group = utils.get_h5_group(group, lh5_file)
|
66
66
|
|
67
|
+
# name already in file
|
68
|
+
if name in group or (
|
69
|
+
("datatype" in group.attrs or group == "/")
|
70
|
+
and (len(name) <= 2 or "/" not in name[1:-1])
|
71
|
+
):
|
72
|
+
pass
|
73
|
+
# group is in file but not struct or need to create nesting
|
74
|
+
else:
|
75
|
+
# check if name is nested
|
76
|
+
# if name is nested, iterate up from parent
|
77
|
+
# otherwise we just need to iterate the group
|
78
|
+
if len(name) > 2 and "/" in name[1:-1]:
|
79
|
+
group = utils.get_h5_group(
|
80
|
+
name[:-1].rsplit("/", 1)[0],
|
81
|
+
group,
|
82
|
+
)
|
83
|
+
curr_name = (
|
84
|
+
name.rsplit("/", 1)[1]
|
85
|
+
if name[-1] != "/"
|
86
|
+
else name[:-1].rsplit("/", 1)[1]
|
87
|
+
)
|
88
|
+
else:
|
89
|
+
curr_name = name
|
90
|
+
# initialize the object to be written
|
91
|
+
obj = types.Struct({curr_name.replace("/", ""): obj})
|
92
|
+
|
93
|
+
# if base group already has a child we just append
|
94
|
+
if len(group) >= 1:
|
95
|
+
wo_mode = "ac"
|
96
|
+
else:
|
97
|
+
# iterate up the group hierarchy until we reach the root or a group with more than one child
|
98
|
+
while group.name != "/":
|
99
|
+
if len(group) > 1:
|
100
|
+
break
|
101
|
+
curr_name = group.name
|
102
|
+
group = group.parent
|
103
|
+
if group.name != "/":
|
104
|
+
obj = types.Struct({curr_name[len(group.name) + 1 :]: obj})
|
105
|
+
else:
|
106
|
+
obj = types.Struct({curr_name[1:]: obj})
|
107
|
+
# if the group has more than one child, we need to append else we can overwrite
|
108
|
+
wo_mode = "ac" if len(group) > 1 else "o"
|
109
|
+
|
110
|
+
# set the new name
|
111
|
+
if group.name == "/":
|
112
|
+
name = "/"
|
113
|
+
elif group.parent.name == "/":
|
114
|
+
name = group.name[1:]
|
115
|
+
else:
|
116
|
+
name = group.name[len(group.parent.name) + 1 :]
|
117
|
+
# get the new group
|
118
|
+
group = utils.get_h5_group(group.parent if group.name != "/" else "/", lh5_file)
|
119
|
+
|
67
120
|
if wo_mode == "w" and name in group:
|
68
121
|
msg = f"can't overwrite '{name}' in wo_mode 'write_safe'"
|
69
122
|
raise LH5EncodeError(msg, lh5_file, group, name)
|
@@ -87,7 +140,7 @@ def _h5_write_lgdo(
|
|
87
140
|
lh5_file,
|
88
141
|
group=group,
|
89
142
|
start_row=start_row,
|
90
|
-
n_rows=n_rows,
|
143
|
+
n_rows=n_rows, # if isinstance(obj, types.Table | types.Histogram) else None,
|
91
144
|
wo_mode=wo_mode,
|
92
145
|
write_start=write_start,
|
93
146
|
**h5py_kwargs,
|
@@ -186,19 +239,31 @@ def _h5_write_struct(
|
|
186
239
|
write_start=0,
|
187
240
|
**h5py_kwargs,
|
188
241
|
):
|
242
|
+
# this works for structs and derived (tables)
|
189
243
|
assert isinstance(obj, types.Struct)
|
190
244
|
|
191
245
|
# In order to append a column, we need to update the
|
192
|
-
# `table{old_fields}` value in `group.attrs['datatype"]` to include
|
193
|
-
# the new fields.
|
194
|
-
#
|
195
|
-
#
|
246
|
+
# `struct/table{old_fields}` value in `group.attrs['datatype"]` to include
|
247
|
+
# the new fields. One way to do this is to override `obj.attrs["datatype"]`
|
248
|
+
# to include old and new fields. Then we can write the fields to the
|
249
|
+
# struct/table as normal.
|
196
250
|
if wo_mode == "ac":
|
251
|
+
if name not in group:
|
252
|
+
msg = "Cannot append column to non-existing struct on disk"
|
253
|
+
raise LH5EncodeError(msg, lh5_file, group, name)
|
254
|
+
|
197
255
|
old_group = utils.get_h5_group(name, group)
|
256
|
+
if "datatype" not in old_group.attrs:
|
257
|
+
msg = "Cannot append column to an existing non-LGDO object on disk"
|
258
|
+
raise LH5EncodeError(msg, lh5_file, group, name)
|
259
|
+
|
198
260
|
lgdotype = datatype.datatype(old_group.attrs["datatype"])
|
199
261
|
fields = datatype.get_struct_fields(old_group.attrs["datatype"])
|
200
|
-
if not
|
201
|
-
msg =
|
262
|
+
if lgdotype is not type(obj):
|
263
|
+
msg = (
|
264
|
+
"Trying to append columns to an object of different "
|
265
|
+
f"type {lgdotype.__name__}!={type(obj)}"
|
266
|
+
)
|
202
267
|
raise LH5EncodeError(msg, lh5_file, group, name)
|
203
268
|
|
204
269
|
# If the mode is `append_column`, make sure we aren't appending
|
@@ -211,8 +276,14 @@ def _h5_write_struct(
|
|
211
276
|
"column(s) to a table with the same field(s)"
|
212
277
|
)
|
213
278
|
raise LH5EncodeError(msg, lh5_file, group, name)
|
279
|
+
|
214
280
|
# It doesn't matter what key we access, as all fields in the old table have the same size
|
215
|
-
if
|
281
|
+
if (
|
282
|
+
isinstance(obj, types.Table)
|
283
|
+
and old_group.attrs["datatype"][:6]
|
284
|
+
!= "struct" # structs dont care about size
|
285
|
+
and old_group[next(iter(old_group.keys()))].size != obj.size
|
286
|
+
):
|
216
287
|
msg = (
|
217
288
|
f"Table sizes don't match. Trying to append column of size {obj.size} "
|
218
289
|
f"to a table of size {old_group[next(iter(old_group.keys()))].size}."
|
@@ -222,16 +293,27 @@ def _h5_write_struct(
|
|
222
293
|
# Now we can append the obj.keys() to the old fields, and then update obj.attrs.
|
223
294
|
fields.extend(list(obj.keys()))
|
224
295
|
obj.attrs.pop("datatype")
|
225
|
-
|
296
|
+
|
297
|
+
obj.attrs["datatype"] = (
|
298
|
+
obj.datatype_name() + "{" + ",".join(sorted(fields)) + "}"
|
299
|
+
)
|
300
|
+
|
301
|
+
# propagating wo_mode="ac" to nested LGDOs does not make any sense
|
302
|
+
wo_mode = "append"
|
303
|
+
|
304
|
+
# overwrite attributes of the existing struct
|
305
|
+
attrs_overwrite = True
|
306
|
+
else:
|
307
|
+
attrs_overwrite = wo_mode == "o"
|
226
308
|
|
227
309
|
group = utils.get_h5_group(
|
228
310
|
name,
|
229
311
|
group,
|
230
312
|
grp_attrs=obj.attrs,
|
231
|
-
overwrite=
|
313
|
+
overwrite=attrs_overwrite,
|
232
314
|
)
|
233
315
|
# If the mode is overwrite, then we need to peek into the file's
|
234
|
-
# table's existing fields.
|
316
|
+
# table's existing fields. If we are writing a new table to the
|
235
317
|
# group that does not contain an old field, we should delete that
|
236
318
|
# old field from the file
|
237
319
|
if wo_mode == "o":
|
@@ -260,11 +342,9 @@ def _h5_write_struct(
|
|
260
342
|
else:
|
261
343
|
obj_fld = obj[field]
|
262
344
|
|
263
|
-
# Convert keys to string for dataset names
|
264
|
-
f = str(field)
|
265
345
|
_h5_write_lgdo(
|
266
346
|
obj_fld,
|
267
|
-
|
347
|
+
str(field),
|
268
348
|
lh5_file,
|
269
349
|
group=group,
|
270
350
|
start_row=start_row,
|
lgdo/lh5/core.py
CHANGED
@@ -5,6 +5,7 @@ import inspect
|
|
5
5
|
import sys
|
6
6
|
from collections.abc import Mapping, Sequence
|
7
7
|
from contextlib import suppress
|
8
|
+
from pathlib import Path
|
8
9
|
from typing import Any
|
9
10
|
|
10
11
|
import h5py
|
@@ -268,11 +269,13 @@ def write(
|
|
268
269
|
end of array is the same as ``append``.
|
269
270
|
- ``overwrite_file`` or ``of``: delete file if present prior to
|
270
271
|
writing to it. `write_start` should be 0 (its ignored).
|
271
|
-
- ``append_column`` or ``ac``: append columns from an
|
272
|
-
:class:`~.lgdo.
|
273
|
-
:class:`~.lgdo.table.Table`
|
274
|
-
|
275
|
-
|
272
|
+
- ``append_column`` or ``ac``: append fields/columns from an
|
273
|
+
:class:`~.lgdo.struct.Struct` `obj` (and derived types such as
|
274
|
+
:class:`~.lgdo.table.Table`) only if there is an existing
|
275
|
+
:class:`~.lgdo.struct.Struct` in the `lh5_file` with the same `name`.
|
276
|
+
If there are matching fields, it errors out. If appending to a
|
277
|
+
``Table`` and the size of the new column is different from the size
|
278
|
+
of the existing table, it errors out.
|
276
279
|
write_start
|
277
280
|
row in the output file (if already existing) to start overwriting
|
278
281
|
from.
|
@@ -288,7 +291,12 @@ def write(
|
|
288
291
|
datasets. **Note: `compression` Ignored if compression is specified
|
289
292
|
as an `obj` attribute.**
|
290
293
|
"""
|
291
|
-
|
294
|
+
|
295
|
+
if (
|
296
|
+
isinstance(lh5_file, str)
|
297
|
+
and not Path(lh5_file).is_file()
|
298
|
+
and wo_mode in ("w", "write_safe", "of", "overwrite_file")
|
299
|
+
):
|
292
300
|
h5py_kwargs.update(
|
293
301
|
{
|
294
302
|
"fs_strategy": "page",
|
lgdo/lh5/datatype.py
CHANGED
@@ -2,6 +2,7 @@ from __future__ import annotations
|
|
2
2
|
|
3
3
|
import re
|
4
4
|
from collections import OrderedDict
|
5
|
+
from itertools import permutations as perm
|
5
6
|
|
6
7
|
from .. import types as lgdo
|
7
8
|
|
@@ -14,7 +15,10 @@ _lgdo_datatype_map: dict[str, lgdo.LGDO] = OrderedDict(
|
|
14
15
|
lgdo.ArrayOfEncodedEqualSizedArrays,
|
15
16
|
r"^array_of_encoded_equalsized_arrays<1,1>\{.+\}$",
|
16
17
|
),
|
17
|
-
(
|
18
|
+
(
|
19
|
+
lgdo.Histogram,
|
20
|
+
rf"^struct\{{(?:{'|'.join([','.join(p) for p in perm(['binning', 'weights', 'isdensity'])])})\}}$",
|
21
|
+
),
|
18
22
|
(lgdo.Struct, r"^struct\{.*\}$"),
|
19
23
|
(lgdo.Table, r"^table\{.*\}$"),
|
20
24
|
(lgdo.FixedSizeArray, r"^fixedsize_array<\d+>\{.+\}$"),
|
lgdo/lh5/iterator.py
CHANGED
@@ -17,48 +17,43 @@ LGDO = typing.Union[Array, Scalar, Struct, VectorOfVectors]
|
|
17
17
|
|
18
18
|
|
19
19
|
class LH5Iterator(typing.Iterator):
|
20
|
-
"""
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
>>> lh5_obj = lh5_it.read(i_entry)
|
58
|
-
|
59
|
-
to read the block of entries starting at i_entry. In case of multiple files
|
60
|
-
or the use of an event selection, i_entry refers to a global event index
|
61
|
-
across files and does not count events that are excluded by the selection.
|
20
|
+
"""Iterate over chunks of entries from LH5 files.
|
21
|
+
|
22
|
+
The iterator reads ``buffer_len`` entries at a time from one or more
|
23
|
+
files. The LGDO instance returned at each iteration is reused to avoid
|
24
|
+
reallocations, so copy the data if it should be preserved.
|
25
|
+
|
26
|
+
Examples
|
27
|
+
--------
|
28
|
+
Iterate through a table one chunk at a time::
|
29
|
+
|
30
|
+
from lgdo.lh5 import LH5Iterator
|
31
|
+
|
32
|
+
for table in LH5Iterator("data.lh5", "geds/raw/energy", buffer_len=100):
|
33
|
+
process(table)
|
34
|
+
|
35
|
+
``LH5Iterator`` can also be used for random access::
|
36
|
+
|
37
|
+
it = LH5Iterator(files, groups)
|
38
|
+
table = it.read(i_entry)
|
39
|
+
|
40
|
+
In case of multiple files or an entry selection, ``i_entry`` refers to the
|
41
|
+
global event index across all files.
|
42
|
+
|
43
|
+
When instantiating an iterator you must provide a list of files and the
|
44
|
+
HDF5 groups to read. Optional parameters allow field masking, event
|
45
|
+
selection and pairing the iterator with a "friend" iterator that is read in
|
46
|
+
parallel. Several properties are available to obtain the provenance of the
|
47
|
+
data currently loaded:
|
48
|
+
|
49
|
+
- ``current_i_entry`` -- index within the entry list of the first entry in
|
50
|
+
the buffer
|
51
|
+
- ``current_local_entries`` -- entry numbers relative to the file the data
|
52
|
+
came from
|
53
|
+
- ``current_global_entries`` -- entry number relative to the full dataset
|
54
|
+
- ``current_files`` -- file name corresponding to each entry in the buffer
|
55
|
+
- ``current_groups`` -- group name corresponding to each entry in the
|
56
|
+
buffer
|
62
57
|
"""
|
63
58
|
|
64
59
|
def __init__(
|
@@ -505,7 +500,7 @@ class LH5Iterator(typing.Iterator):
|
|
505
500
|
return self
|
506
501
|
|
507
502
|
def __next__(self) -> tuple[LGDO, int, int]:
|
508
|
-
"""Read next
|
503
|
+
"""Read the next chunk of entries and return the buffer."""
|
509
504
|
n_entries = self.n_entries
|
510
505
|
if n_entries is not None:
|
511
506
|
n_entries = min(
|
lgdo/lh5/settings.py
ADDED
@@ -0,0 +1,34 @@
|
|
1
|
+
from __future__ import annotations
|
2
|
+
|
3
|
+
from typing import Any
|
4
|
+
|
5
|
+
|
6
|
+
def default_hdf5_settings() -> dict[str, Any]:
|
7
|
+
"""Returns the HDF5 settings for writing data to disk to the pydataobj defaults.
|
8
|
+
|
9
|
+
Examples
|
10
|
+
--------
|
11
|
+
>>> from lgdo import lh5
|
12
|
+
>>> lh5.DEFAULT_HDF5_SETTINGS["compression"] = "lzf"
|
13
|
+
>>> lh5.write(data, "data", "file.lh5") # compressed with LZF
|
14
|
+
>>> lh5.DEFAULT_HDF5_SETTINGS = lh5.default_hdf5_settings()
|
15
|
+
>>> lh5.write(data, "data", "file.lh5", "of") # compressed with default settings (GZIP)
|
16
|
+
"""
|
17
|
+
|
18
|
+
return {
|
19
|
+
"shuffle": True,
|
20
|
+
"compression": "gzip",
|
21
|
+
}
|
22
|
+
|
23
|
+
|
24
|
+
DEFAULT_HDF5_SETTINGS: dict[str, ...] = default_hdf5_settings()
|
25
|
+
"""Global dictionary storing the default HDF5 settings for writing data to disk.
|
26
|
+
|
27
|
+
Modify this global variable before writing data to disk with this package.
|
28
|
+
|
29
|
+
Examples
|
30
|
+
--------
|
31
|
+
>>> from lgdo import lh5
|
32
|
+
>>> lh5.DEFAULT_HDF5_SETTINGS["compression"] = "lzf"
|
33
|
+
>>> lh5.write(data, "data", "file.lh5") # compressed with LZF
|
34
|
+
"""
|
lgdo/lh5/utils.py
CHANGED
@@ -111,7 +111,7 @@ def get_h5_group(
|
|
111
111
|
grp_attrs is not None
|
112
112
|
and len(set(grp_attrs.items()) ^ set(group.attrs.items())) > 0
|
113
113
|
):
|
114
|
-
if not overwrite:
|
114
|
+
if not overwrite and len(group.attrs) != 0:
|
115
115
|
msg = (
|
116
116
|
f"Provided {grp_attrs=} are different from "
|
117
117
|
f"existing ones {dict(group.attrs)=} but overwrite flag is not set"
|
lgdo/types/struct.py
CHANGED
@@ -5,7 +5,9 @@ utilities.
|
|
5
5
|
|
6
6
|
from __future__ import annotations
|
7
7
|
|
8
|
+
import copy
|
8
9
|
import logging
|
10
|
+
import re
|
9
11
|
from collections.abc import Mapping
|
10
12
|
from typing import Any
|
11
13
|
|
@@ -56,7 +58,21 @@ class Struct(LGDO, dict):
|
|
56
58
|
# assign
|
57
59
|
super().update({k: v})
|
58
60
|
|
59
|
-
#
|
61
|
+
# check the datatype attribute passed by the user and sort the fields
|
62
|
+
# to ensure consistent behavior
|
63
|
+
if attrs is not None and "datatype" in attrs:
|
64
|
+
_attrs = copy.copy(dict(attrs))
|
65
|
+
|
66
|
+
if not _is_struct_datatype(self.datatype_name(), _attrs["datatype"]):
|
67
|
+
msg = (
|
68
|
+
f"datatype attribute ({self.attrs['datatype']}) is not "
|
69
|
+
f"compatible with class datatype!"
|
70
|
+
)
|
71
|
+
raise ValueError(msg)
|
72
|
+
|
73
|
+
_attrs["datatype"] = _sort_datatype_fields(_attrs["datatype"])
|
74
|
+
attrs = _attrs
|
75
|
+
|
60
76
|
super().__init__(attrs)
|
61
77
|
|
62
78
|
def datatype_name(self) -> str:
|
@@ -64,7 +80,10 @@ class Struct(LGDO, dict):
|
|
64
80
|
|
65
81
|
def form_datatype(self) -> str:
|
66
82
|
return (
|
67
|
-
self.datatype_name()
|
83
|
+
self.datatype_name()
|
84
|
+
+ "{"
|
85
|
+
+ ",".join(sorted([str(k) for k in self.keys()]))
|
86
|
+
+ "}"
|
68
87
|
)
|
69
88
|
|
70
89
|
def update_datatype(self) -> None:
|
@@ -157,3 +176,34 @@ class Struct(LGDO, dict):
|
|
157
176
|
"not possible. Call view_as() on the fields instead."
|
158
177
|
)
|
159
178
|
raise NotImplementedError(msg)
|
179
|
+
|
180
|
+
|
181
|
+
def _is_struct_datatype(dt_name, expr):
|
182
|
+
return re.search("^" + dt_name + r"\{(.*)\}$", expr) is not None
|
183
|
+
|
184
|
+
|
185
|
+
def _get_struct_fields(expr: str) -> list[str]:
|
186
|
+
assert _is_struct_datatype(".*", expr)
|
187
|
+
|
188
|
+
arr = re.search(r"\{(.*)\}$", expr).group(1).split(",")
|
189
|
+
if arr == [""]:
|
190
|
+
arr = []
|
191
|
+
|
192
|
+
return sorted(arr)
|
193
|
+
|
194
|
+
|
195
|
+
def _struct_datatype_equal(dt_name, dt1, dt2):
|
196
|
+
if any(not _is_struct_datatype(dt_name, dt) for dt in (dt1, dt2)):
|
197
|
+
return False
|
198
|
+
|
199
|
+
return _get_struct_fields(dt1) == _get_struct_fields(dt2)
|
200
|
+
|
201
|
+
|
202
|
+
def _sort_datatype_fields(expr):
|
203
|
+
assert _is_struct_datatype(".*", expr)
|
204
|
+
|
205
|
+
match = re.search(r"^(.*)\{.*\}$", expr)
|
206
|
+
struct_type = match.group(1)
|
207
|
+
fields = _get_struct_fields(expr)
|
208
|
+
|
209
|
+
return struct_type + "{" + ",".join(sorted([str(k) for k in fields])) + "}"
|
lgdo/types/table.py
CHANGED
@@ -81,8 +81,9 @@ class Table(Struct, LGDOCollection):
|
|
81
81
|
col_dict = _ak_to_lgdo_or_col_dict(col_dict)
|
82
82
|
|
83
83
|
# call Struct constructor
|
84
|
-
Struct.__init__(self, obj_dict=col_dict)
|
85
|
-
LGDOCollection
|
84
|
+
Struct.__init__(self, obj_dict=col_dict, attrs=attrs)
|
85
|
+
# no need to call the LGDOCollection constructor, as we are calling the
|
86
|
+
# Struct constructor already
|
86
87
|
|
87
88
|
# if col_dict is not empty, set size according to it
|
88
89
|
# if size is also supplied, resize all fields to match it
|
File without changes
|
File without changes
|
File without changes
|