Skip to content

Commit 3030e7c

Browse files
authored
Merge pull request #3 from ssl-hep/testing
Update from issue review
2 parents a4ba329 + 35e0621 commit 3030e7c

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pip install servicex-analysis-utils
1818
1919
2020
Returns:
21-
dict: keys are sample names and values are awkward arrays or dask-awkward arrays.
21+
dict: keys are sample names and values are awkward arrays, uproot generator objects or dask-awkward arrays.
2222
```
2323

2424
## Documentation

servicex_analysis_utils/materialization.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def to_awk(deliver_dict, dask=False, **kwargs):
4242
4343
4444
Returns:
45-
dict: keys are sample names and values are awkward arrays or dask-awkward arrays.
45+
dict: keys are sample names and values are awkward arrays, uproot generator objects or dask-awkward arrays.
4646
"""
4747

4848
awk_arrays = {}
@@ -69,9 +69,7 @@ def to_awk(deliver_dict, dask=False, **kwargs):
6969
else:
7070
if is_root==True:
7171
# Use uproot.iterate to handle URLs and local paths files in chunks
72-
tmp_arrays = list(uproot.iterate(paths, library="ak", **kwargs))
73-
# Merge arrays
74-
awk_arrays[sample] = ak.concatenate(tmp_arrays)
72+
awk_arrays[sample]=uproot.iterate(paths, library="ak", **kwargs) # not an ak array but a generator
7573
else:
7674
#file is parquet
7775
awk_arrays[sample] = ak.from_parquet(paths, **kwargs)

tests/test_materialization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ def test_to_awk(build_test_samples):
6969

7070
#Collecting all samples
7171
assert list(result.keys())==["Test-Sample1", "Test-Sample2"]
72-
arr1=result["Test-Sample1"]
73-
arr2=result["Test-Sample2"]
72+
arr1 = ak.concatenate(list(result["Test-Sample1"])) # Materialize the generator from uproot.iterate
73+
arr2 = ak.concatenate(list(result["Test-Sample2"]))
7474

7575
#Collecting all branches
7676
assert ak.fields(arr1) == ['branch1', 'branch2']

0 commit comments

Comments
 (0)