diff --git a/coffea/version.py b/coffea/version.py index a00a0f847..3f640560f 100644 --- a/coffea/version.py +++ b/coffea/version.py @@ -30,7 +30,7 @@ import re -__version__ = "2023.4.0.rc2" +__version__ = "2023.4.0.rc3" version = __version__ version_info = tuple(re.split(r"[-\.]", __version__)) diff --git a/setup.py b/setup.py index e4d81fde5..6895c915e 100644 --- a/setup.py +++ b/setup.py @@ -54,11 +54,11 @@ def get_description(): INSTALL_REQUIRES = [ - "awkward>=2.1.3", + "awkward>=2.1.4", "uproot>=5.0.7", - "dask[array]>=2022.12.1,<2023.4.0", - "dask-awkward>=2023.4.1", - "dask-histogram>=2023.4.1", + "dask[array]>=2023.4.0", + "dask-awkward>=2023.4.2", + "dask-histogram>=2023.4.4", "correctionlib>=2.0.0", "pyarrow>=6.0.0", "fsspec", diff --git a/tests/test_jetmet_tools.py b/tests/test_jetmet_tools.py index 8d82b6e59..7fccd6039 100644 --- a/tests/test_jetmet_tools.py +++ b/tests/test_jetmet_tools.py @@ -799,7 +799,7 @@ def test_corrected_jets_factory(): ) check_resosfs = resosf.getScaleFactor( - JetEta=jets.eta, + JetEta=events.Jet.eta, ).compute() # Filter out the non-deterministic (no gen pt) jets @@ -811,17 +811,22 @@ def smear_factor(jetPt, pt_gen, jersf): test_gen_pt = ak.concatenate( [ - corrected_jets.pt_gen.compute()[0, :-2], - corrected_jets.pt_gen.compute()[-1, :-1], + dak.fill_none(events.Jet.matched_gen.pt, 0).compute()[0, :-2], + dak.fill_none(events.Jet.matched_gen.pt, 0).compute()[-1, :-1], ] ) test_raw_pt = ak.concatenate( - [jets.pt_raw.compute()[0, :-2], jets.pt_raw.compute()[-1, :-1]] + [ + ((1 - events.Jet.rawFactor) * events.Jet.pt).compute()[0, :-2], + ((1 - events.Jet.rawFactor) * events.Jet.pt).compute()[-1, :-1], + ] ) test_pt = ak.concatenate( [corrected_jets.pt.compute()[0, :-2], corrected_jets.pt.compute()[-1, :-1]] ) - test_eta = ak.concatenate([jets.eta.compute()[0, :-2], jets.eta.compute()[-1, :-1]]) + test_eta = ak.concatenate( + [events.Jet.eta.compute()[0, :-2], events.Jet.eta.compute()[-1, :-1]] + ) test_jer = ak.concatenate([check_resos[0, :-2], check_resos[-1, :-1]]) test_jer_sf = ak.concatenate( [