Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: force application of to_packed in awkward binnings #1016

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix: force application of to_packed in awkward binnings #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/coffea/lookup_tools/txt_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ def _build_standard_jme_lookup(
theBins = numpy.union1d(binMins, binMaxs[-1:])
allBins = numpy.append(allBins, theBins)
counts = numpy.append(counts, theBins.size)
bins[layout[i + offset_name]] = awkward.unflatten(allBins, counts)
bins[layout[i + offset_name]] = awkward.to_packed(
awkward.unflatten(allBins, counts)
)
bin_order.append(layout[i + offset_name])
offset_col += 1

Expand All @@ -214,11 +216,15 @@ def _build_standard_jme_lookup(
for i in range(nEvalVars):
var_order.append(layout[i + offset_name])
if not interpolatedFunc:
clamp_mins[layout[i + offset_name]] = awkward.unflatten(
numpy.atleast_1d(pars[columns[i + offset_col]]), jagged_counts
clamp_mins[layout[i + offset_name]] = awkward.to_packed(
awkward.unflatten(
numpy.atleast_1d(pars[columns[i + offset_col]]), jagged_counts
)
)
clamp_maxs[layout[i + offset_name]] = awkward.unflatten(
numpy.atleast_1d(pars[columns[i + offset_col + 1]]), jagged_counts
clamp_maxs[layout[i + offset_name]] = awkward.to_packed(
awkward.unflatten(
numpy.atleast_1d(pars[columns[i + offset_col + 1]]), jagged_counts
)
)
assert awkward.is_valid(clamp_mins[layout[i + offset_name]])
assert awkward.is_valid(clamp_maxs[layout[i + offset_name]])
Expand All @@ -229,7 +235,9 @@ def _build_standard_jme_lookup(
param_order = []
offset_col = 2 * nBinnedVars + 1 + int(not interpolatedFunc) * 2 * nEvalVars
for i in range(nParams):
jag = awkward.unflatten(pars[columns[i + offset_col]], jagged_counts)
jag = awkward.to_packed(
awkward.unflatten(pars[columns[i + offset_col]], jagged_counts)
)
assert awkward.is_valid(jag)
params.append(jag)
param_order.append("p%i" % (i))
Expand Down Expand Up @@ -505,7 +513,9 @@ def convert_effective_area_file(eaFilePath):
theBins = numpy.union1d(binMins, binMaxs)
allBins = numpy.append(allBins, theBins)
counts = numpy.append(counts, theBins.size)
bins[layout[i + offset_name]] = awkward.unflatten(allBins, counts)
bins[layout[i + offset_name]] = awkward.to_packed(
awkward.unflatten(allBins, counts)
)
bin_order.append(layout[i + offset_name])
offset_col += 1

Expand Down
6 changes: 5 additions & 1 deletion tests/test_jetmet_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,12 +715,16 @@ def test_jet_resolution_sf_2d(optimization_enabled):
def test_corrected_jets_factory(optimization_enabled):
import os

from distributed import Client

from coffea.jetmet_tools import CorrectedJetsFactory, CorrectedMETFactory, JECStack

events = None
from coffea.nanoevents import NanoEventsFactory

with dask.config.set({"awkward.optimization.enabled": True}):
with Client(), dask.config.set(
{"awkward.optimization.enabled": optimization_enabled}
):
events = NanoEventsFactory.from_root(
{os.path.abspath("tests/samples/nano_dy.root"): "Events"},
metadata={},
Expand Down