diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx index 95831ca1bff50b00f44b87f77ac7a034b5e1fdb7..09cfceaa0f4e3fa5d6de4dbf2921670757568024 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx @@ -23,7 +23,6 @@ #include "JetSelectorTools/JetCleaningTool.h" #include "JetJvtEfficiency/JetJvtEfficiency.h" #include "JetSelectorTools/EventCleaningTool.h" -#include "JetUncertainties/FFJetSmearingTool.h" // MET include(s): @@ -495,7 +494,8 @@ namespace top { = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR", jetCalibrationNameLargeR, MC_type, JERisMC, configDir + "/R10_" + largeRJESJERJMS_unc_config + ".config", nullptr, "", calibArea); - m_FFJetSmearingTool = setupFFJetSmearingTool(calibChoice,configDir + "/R10_" + largeRJMR_unc_config + ".config"); + if (!m_config->isSystNominal(m_config->systematics())) + m_FFJetSmearingTool = setupFFJetSmearingTool(calibChoice,configDir + "/R10_" + largeRJMR_unc_config + ".config"); } return StatusCode::SUCCESS; diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx index 0b763532dd7e7e216a0d1041378112bdc53e4884..9bac5a0a8421b9f4537c8885c08b317925f8d00c 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx @@ -97,8 +97,9 @@ namespace top { if(m_config->largeRJESJMSConfig() != "UFOSDMass"){ top::check(m_jetUncertaintiesToolLargeR.retrieve(), "Failed to retrieve JetUncertaintiesToolLargeR"); - top::check(m_FFJetSmearingTool.retrieve(), - "Failed to retrieve FFJetSmearingTool"); + if (!m_config->isSystNominal(m_config->systematics())) + top::check(m_FFJetSmearingTool.retrieve(), + "Failed to retrieve FFJetSmearingTool"); } } @@ -222,7 +223,8 @@ namespace top { if ((m_config->isMC() || m_doOnly_JER_largeR) && m_config->useLargeRJets()) { if (m_config->largeRJESJMSConfig() == "CombMass") { // Only CombMass is supported for large-R JES/JER/JMS/JMR systematics at the moment largeRsysts.insert(m_jetUncertaintiesToolLargeR->recommendedSystematics()); - largeRsysts.insert(m_FFJetSmearingTool->recommendedSystematics()); + if (!m_config->isSystNominal(m_config->systematics())) + largeRsysts.insert(m_FFJetSmearingTool->recommendedSystematics()); } else { ATH_MSG_WARNING( "TA Mass & Calo Mass & TCCMass & UFO SD Mass are not supported for large-R jet uncertainties at the moment. Large-R jet systemtatics skipped!");