Merge branch 'cherry-pick-ba2d9ed14e6-master' into 'master'

Sweeping !38813 from 21.2 to master.
Replace pT by energy in JetUncertainties

See merge request atlas/athena!38846

Reconstruction/Jet/JetUncertainties/Root/ELogMassEtaUncertaintyComponent.cxx

 /*
-  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

Reconstruction/Jet/JetUncertainties/Root/ELogMassUncertaintyComponent.cxx

 /*
-  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