From ca18ee5734251e159ae166dc73238a31cec4c20d Mon Sep 17 00:00:00 2001
From: Nils Erik Krumnack <nils.erik.krumnack@cern.ch>
Date: Thu, 3 Dec 2020 14:13:32 +0000
Subject: [PATCH] Merge branch '21.2-JetUncertainties-fix' into '21.2'
Replace pT by energy in JetUncertainties
See merge request atlas/athena!38813
(cherry picked from commit ba2d9ed14e655c85c9d60e508ee05217446cf261)
29f1756f Replace pT by energy
---
.../Root/ELogMassEtaUncertaintyComponent.cxx | 4 ++--
.../JetUncertainties/Root/ELogMassUncertaintyComponent.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Reconstruction/Jet/JetUncertainties/Root/ELogMassEtaUncertaintyComponent.cxx b/Reconstruction/Jet/JetUncertainties/Root/ELogMassEtaUncertaintyComponent.cxx
index c2464acb0637..35b63b73d789 100644
--- a/Reconstruction/Jet/JetUncertainties/Root/ELogMassEtaUncertaintyComponent.cxx
+++ b/Reconstruction/Jet/JetUncertainties/Root/ELogMassEtaUncertaintyComponent.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "JetUncertainties/ELogMassEtaUncertaintyComponent.h"
@@ -57,7 +57,7 @@ bool ELogMassEtaUncertaintyComponent::getValidityImpl(const xAOD::Jet& jet, cons
double ELogMassEtaUncertaintyComponent::getUncertaintyImpl(const xAOD::Jet& jet, const xAOD::EventInfo&) const
{
- return m_uncHist->getValue(jet.pt()*m_energyScale,log(getMassOverE(jet,m_massDef)),m_absEta ? fabs(jet.eta()) : jet.eta());
+ return m_uncHist->getValue(jet.e()*m_energyScale,log(getMassOverE(jet,m_massDef)),m_absEta ? fabs(jet.eta()) : jet.eta());
}
} // end jet namespace
diff --git a/Reconstruction/Jet/JetUncertainties/Root/ELogMassUncertaintyComponent.cxx b/Reconstruction/Jet/JetUncertainties/Root/ELogMassUncertaintyComponent.cxx
index 8908f04b824d..162aa23eeaef 100644
--- a/Reconstruction/Jet/JetUncertainties/Root/ELogMassUncertaintyComponent.cxx
+++ b/Reconstruction/Jet/JetUncertainties/Root/ELogMassUncertaintyComponent.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "JetUncertainties/ELogMassUncertaintyComponent.h"
@@ -49,12 +49,12 @@ ELogMassUncertaintyComponent* ELogMassUncertaintyComponent::clone() const
bool ELogMassUncertaintyComponent::getValidityImpl(const xAOD::Jet& jet, const xAOD::EventInfo&) const
{
- return !m_validHist ? true : getValidBool(m_validHist->getValue(jet.pt()*m_energyScale,log(getMassOverE(jet,m_massDef))));
+ return !m_validHist ? true : getValidBool(m_validHist->getValue(jet.e()*m_energyScale,log(getMassOverE(jet,m_massDef))));
}
double ELogMassUncertaintyComponent::getUncertaintyImpl(const xAOD::Jet& jet, const xAOD::EventInfo&) const
{
- return m_uncHist->getValue(jet.pt()*m_energyScale,log(getMassOverE(jet,m_massDef)));
+ return m_uncHist->getValue(jet.e()*m_energyScale,log(getMassOverE(jet,m_massDef)));
}
} // end jet namespace
--
GitLab