Commit b9dccb95 authored by Nils Erik Krumnack's avatar Nils Erik Krumnack
Browse files

Merge branch 'AT-disable-FFsmear-nominal' into '21.2'

AnalysisTop: Disable FFJetSmearingTool when running nominal-only

See merge request !44691
parents 80c10ddd cb5d3363
......@@ -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;
......
......@@ -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!");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment