From 39e8a2a1841e436f7b72ae93adb1115ad99b10a9 Mon Sep 17 00:00:00 2001
From: Nils Erik Krumnack <nils.erik.krumnack@cern.ch>
Date: Fri, 6 Nov 2020 15:17:27 +0000
Subject: [PATCH] Merge branch '21.2-UFO-sys-fix' into '21.2'
Don't setup JetUncertaintiesTool for UFO jets
See merge request atlas/athena!37982
(cherry picked from commit 15d6bd36079e5ce357bfb6253ef5d0ab32091d83)
594ea863 Don't setup JetUncertaintiesTool for UFO jets
---
.../TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx | 10 ++++++----
.../Root/JetObjectCollectionMaker.cxx | 6 ++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
index bbc12e482ac..f5649401e52 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
@@ -445,10 +445,12 @@ namespace top {
// jets) are applied
bool JERisMC = true;
- m_jetUncertaintiesToolLargeR
- = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
- jetCalibrationNameLargeR, MC_type, JERisMC,
- configDir + "/R10_" + largeRJESJMS_config + ".config", nullptr, "", calibArea);
+ if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
+ m_jetUncertaintiesToolLargeR
+ = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
+ jetCalibrationNameLargeR, MC_type, JERisMC,
+ configDir + "/R10_" + largeRJESJMS_config + ".config", nullptr, "", calibArea);
+ }
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
index 03b216796bf..741fd788bc6 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
@@ -94,8 +94,10 @@ namespace top {
if (m_config->useLargeRJets()) {
top::check(m_jetCalibrationToolLargeR.retrieve(),
"Failed to retrieve JetCalibrationToolLargeR");
- top::check(m_jetUncertaintiesToolLargeR.retrieve(),
- "Failed to retrieve JetUncertaintiesToolLargeR");
+ if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
+ top::check(m_jetUncertaintiesToolLargeR.retrieve(),
+ "Failed to retrieve JetUncertaintiesToolLargeR");
+ }
}
if (m_config->getDerivationStream() == "PHYS") {
--
GitLab