diff --git a/topeft/data/btagSF/UL/btagMCeff_2016.pkl.gz b/topeft/data/btagSF/UL/btagMCeff_2016.pkl.gz index 49c21ac58..4fd84db41 100644 Binary files a/topeft/data/btagSF/UL/btagMCeff_2016.pkl.gz and b/topeft/data/btagSF/UL/btagMCeff_2016.pkl.gz differ diff --git a/topeft/data/btagSF/UL/btagMCeff_2016APV.pkl.gz b/topeft/data/btagSF/UL/btagMCeff_2016APV.pkl.gz index 6e6ca59f5..94252f79f 100644 Binary files a/topeft/data/btagSF/UL/btagMCeff_2016APV.pkl.gz and b/topeft/data/btagSF/UL/btagMCeff_2016APV.pkl.gz differ diff --git a/topeft/data/btagSF/UL/btagMCeff_2017.pkl.gz b/topeft/data/btagSF/UL/btagMCeff_2017.pkl.gz index 72f443584..2e4c1f173 100644 Binary files a/topeft/data/btagSF/UL/btagMCeff_2017.pkl.gz and b/topeft/data/btagSF/UL/btagMCeff_2017.pkl.gz differ diff --git a/topeft/data/btagSF/UL/btagMCeff_2018.pkl.gz b/topeft/data/btagSF/UL/btagMCeff_2018.pkl.gz index c2eb73576..e7486c6d1 100644 Binary files a/topeft/data/btagSF/UL/btagMCeff_2018.pkl.gz and b/topeft/data/btagSF/UL/btagMCeff_2018.pkl.gz differ diff --git a/topeft/modules/corrections.py b/topeft/modules/corrections.py index 15ae221fa..ad5f92201 100644 --- a/topeft/modules/corrections.py +++ b/topeft/modules/corrections.py @@ -427,23 +427,23 @@ def GetMCeffFunc(year, wp='medium', flav='b'): hnum = h.integrate('WP', wp) hden = h.integrate('WP', 'all') getnum = lookup_tools.dense_lookup.dense_lookup( - hnum.values(overflow='over')[()], + hnum.values()[()], [ - hnum.axis('pt').edges(), - hnum.axis('abseta').edges(), - hnum.axis('flav').edges() + hnum.axes['pt'].edges, + hnum.axes['abseta'].edges, + hnum.axes['flav'].edges ] ) getden = lookup_tools.dense_lookup.dense_lookup( - hden.values(overflow='over')[()], + hden.values()[()], [ - hden.axis('pt').edges(), - hnum.axis('abseta').edges(), - hden.axis('flav').edges() + hden.axes['pt'].edges, + hnum.axes['abseta'].edges, + hden.axes['flav'].edges ] ) - values = hnum.values(overflow='over')[()] - edges = [hnum.axis('pt').edges(), hnum.axis('abseta').edges(), hnum.axis('flav').edges()] + values = hnum.values()[()] + edges = [hnum.axes['pt'].edges, hnum.axes['abseta'].edges, hnum.axes['flav'].edges] fun = lambda pt, abseta, flav: getnum(pt,abseta,flav)/getden(pt,abseta,flav) return fun