Skip to content

GitLab

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

Merge branch '21.2-AT-PseudoDataJER' into '21.2' 

Implementing PseudoData smearing in one event loop in AnalysisTop

See merge request !44523
parents 71f6094b a61755c2
Hide whitespace changes
Inline Side-by-side
PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
View file @ c013bfd8
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TopCPTools/TopJetMETCPTools.h"
......@@ -72,6 +72,7 @@ namespace top {
declareProperty("JetCalibrationToolLargeR", m_jetCalibrationToolLargeR);
declareProperty("JetUncertaintiesTool", m_jetUncertaintiesTool);
declareProperty("JetUncertaintiesToolPseudoData", m_jetUncertaintiesToolPseudoData);
declareProperty("FFJetSmearingTool", m_FFJetSmearingTool);
declareProperty("JetUncertaintiesToolReducedNPScenario1", m_jetUncertaintiesToolReducedNPScenario1);
declareProperty("JetUncertaintiesToolReducedNPScenario2", m_jetUncertaintiesToolReducedNPScenario2);
......@@ -279,7 +280,7 @@ namespace top {
std::string calib_area = "None";
// JER string option configuration
bool JERisMC = m_config->isMC();
const bool JERisPseudoData = (m_config->jetJERSmearingModel() == "Full_PseudoData") || (m_config->jetJERSmearingModel() == "All_PseudoData");
std::string JERSmearModel = m_config->jetJERSmearingModel();
std::string JMSOption = m_config->jetJMSOption();
if (JMSOption != "None") {
......@@ -287,19 +288,17 @@ namespace top {
if (JMSOption == "JMS_frozen") JMSOption = "_JMS_frozen";
else if (JMSOption == "JMS_scaled") JMSOption = "_JMS_scaled";
else {
ATH_MSG_ERROR("Incorrect JMS option: None, JMS_frozen, JMS_scaled");
return StatusCode::FAILURE;
ATH_MSG_ERROR("Incorrect JMS option: None, JMS_frozen, JMS_scaled");
return StatusCode::FAILURE;
}
}
else JMSOption = ""; // Default JMSOption
// Any PseudoData Option (Smear MC as data)
if (JERSmearModel == "Full_PseudoData") {
if (JERisMC) JERisMC = false;
JERSmearModel = "Full";
ATH_MSG_INFO("JER PseudoData option provided - Treating MC as if it is data for JER uncertainty");
}
if (JERSmearModel == "All_PseudoData") {
if (JERisMC) JERisMC = false;
JERSmearModel = "All";
ATH_MSG_INFO("JER PseudoData option provided - Treating MC as if it is data for JER uncertainty");
}
......@@ -318,16 +317,34 @@ namespace top {
m_jetUncertaintiesTool = setupJetUncertaintiesTool("JetUncertaintiesTool",
jetCalibrationName,
MC_type,
JERisMC,
m_config->isMC(),
"rel21/" + conference
+ "/R4_" + m_config->jetUncertainties_NPModel()
+ JERSmearModel
+ JMSOption
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area
);
// setup the pseudodata tool when required
if (JERisPseudoData) {
m_jetUncertaintiesToolPseudoData = setupJetUncertaintiesTool("JetUncertaintiesToolPseudoData",
jetCalibrationName,
MC_type,
false, // treat MC as data
"rel21/" + conference
+ "/R4_" + m_config->jetUncertainties_NPModel()
+ JERSmearModel
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area
);
}
} else {
// Strong reductions now enabled. If you want to run a single scenario please note the new config file names
// R4_SR_Scenario*_SimpleJER
......@@ -335,12 +352,12 @@ namespace top {
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario1",
jetCalibrationName,
MC_type,
JERisMC,
m_config->isMC(),
"rel21/"
+ conference
+ "/R4_SR_Scenario1_SimpleJER"
+ JMSOption
+ ".config",
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area);
......@@ -348,12 +365,12 @@ namespace top {
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario2",
jetCalibrationName,
MC_type,
JERisMC,
m_config->isMC(),
"rel21/"
+ conference
+ "/R4_SR_Scenario2_SimpleJER"
+ JMSOption
+ ".config",
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area);
......@@ -361,12 +378,12 @@ namespace top {
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario3",
jetCalibrationName,
MC_type,
JERisMC,
m_config->isMC(),
"rel21/"
+ conference
+ "/R4_SR_Scenario3_SimpleJER"
+ JMSOption
+ ".config",
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area);
......@@ -374,12 +391,12 @@ namespace top {
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario4",
jetCalibrationName,
MC_type,
JERisMC,
m_config->isMC(),
"rel21/"
+ conference
+ "/R4_SR_Scenario4_SimpleJER"
+ JMSOption
+ ".config",
+ JMSOption
+ ".config",
nullptr,
m_config->jetUncertainties_QGFracFile(),
calib_area);
......@@ -660,13 +677,10 @@ namespace top {
"Failed to set VariablesToShift for LargeR Jes Uncertainty " + name);
}
if (analysis_file != "None") {
if (m_config->jetUncertainties_QGHistPatterns().size() == 0 || analysis_file == "") { // no histogram pattern to
// look for, or empty
// analysis_file argument
if (m_config->jetUncertainties_QGHistPatterns().size() == 0 || analysis_file == "") { // no histogram pattern to look for, or empty analysis_file argument
top::check(asg::setProperty(tool, "AnalysisFile", analysis_file),
"Failed to set AnalysisFile for " + name);
} else if (m_config->jetUncertainties_QGHistPatterns().size() == 1) { // a single pattern was specified - let's
// use it for all DSIDs
} else if (m_config->jetUncertainties_QGHistPatterns().size() == 1) { // a single pattern was specified - let's use it for all DSIDs
top::check(asg::setProperty(tool, "AnalysisFile", analysis_file),
"Failed to set AnalysisFile for " + name);
top::check(asg::setProperty(tool, "AnalysisHistPattern", m_config->jetUncertainties_QGHistPatterns()[0]),
......
PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h
View file @ c013bfd8
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TOPCPTOOLS_TOPJETMETCPTOOLS_H_
......@@ -86,6 +86,7 @@ namespace top {
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolLargeR;
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesTool;
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolPseudoData;
ToolHandle<ICPJetCorrectionTool> m_FFJetSmearingTool;
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolReducedNPScenario1;
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolReducedNPScenario2;
......
PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
View file @ c013bfd8
......@@ -238,7 +238,7 @@ namespace top {
"None");
registerParameter("JetJERSmearingModel",
"All (inc. data smearing), All_PseudoData (use MC as pseudo-data), Full (inc. data smearing), Full_PseudoData (use MC as pseudo-data) or Simple (MC only - default)",
"Simple");
"Full_PseudoData", {"All", "All_PseudoData", "Full", "Full_PseudoData", "Simple"});
registerParameter("JetJMSOption",
"None (default),"
"JMS_frozen (The shape and magnitude of the uncertainties at m/pT = 0.25 are also used for m/pT > 0.25),"
......
PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
View file @ c013bfd8
......@@ -40,6 +40,7 @@ namespace top {
m_jetCalibrationToolLargeR("JetCalibrationToolLargeR"),
m_jetUncertaintiesTool("JetUncertaintiesTool"),
m_jetUncertaintiesToolPseudoData("JetUncertaintiesToolPseudoData"),
m_jetUncertaintiesToolReducedNPScenario1("JetUncertaintiesToolReducedNPScenario1"),
m_jetUncertaintiesToolReducedNPScenario2("JetUncertaintiesToolReducedNPScenario2"),
m_jetUncertaintiesToolReducedNPScenario3("JetUncertaintiesToolReducedNPScenario3"),
......@@ -53,6 +54,7 @@ namespace top {
m_jetSubstructure(nullptr),
m_systMap_AllNP(),
m_systMap_JERPseudo(),
m_systMap_ReducedNPScenario1(),
m_systMap_ReducedNPScenario2(),
m_systMap_ReducedNPScenario3(),
......@@ -64,6 +66,7 @@ namespace top {
declareProperty("JetCalibrationToolLargeR", m_jetCalibrationToolLargeR);
declareProperty("JetUncertaintiesTool", m_jetUncertaintiesTool);
declareProperty("JetUncertaintiesToolPseudoData", m_jetUncertaintiesToolPseudoData);
declareProperty("JetUncertaintiesToolReducedNPScenario1", m_jetUncertaintiesToolReducedNPScenario1);
declareProperty("JetUncertaintiesToolReducedNPScenario2", m_jetUncertaintiesToolReducedNPScenario2);
declareProperty("JetUncertaintiesToolReducedNPScenario3", m_jetUncertaintiesToolReducedNPScenario3);
......@@ -92,8 +95,8 @@ namespace top {
top::check(m_jetCalibrationToolLargeR.retrieve(),
"Failed to retrieve JetCalibrationToolLargeR");
if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
top::check(m_jetUncertaintiesToolLargeR.retrieve(),
"Failed to retrieve JetUncertaintiesToolLargeR");
top::check(m_jetUncertaintiesToolLargeR.retrieve(),
"Failed to retrieve JetUncertaintiesToolLargeR");
top::check(m_FFJetSmearingTool.retrieve(),
"Failed to retrieve FFJetSmearingTool");
}
......@@ -126,6 +129,9 @@ namespace top {
if (m_isMC || m_doFull_JER) {
if (!m_doMultipleJES) {
top::check(m_jetUncertaintiesTool.retrieve(), "Failed to retrieve JetUncertaintiesTool");
if (m_doFull_JER_Pseudodata) {
top::check(m_jetUncertaintiesToolPseudoData.retrieve(), "Failed to retrieve JetUncertaintiesTool for pseudo data");
}
} else {
top::check(
m_jetUncertaintiesToolReducedNPScenario1.retrieve(),
......@@ -178,7 +184,6 @@ namespace top {
}
}
///-- JES systematics --///
if (m_isMC || m_doFull_JER) {
std::string allNP(""),
......@@ -187,20 +192,27 @@ namespace top {
bool onlyJER = ((!m_isMC) && m_doFull_JER) || (m_isMC && m_doFull_JER_Pseudodata);
if (!m_doMultipleJES) {
addSystematics(syst, m_jetUncertaintiesTool->recommendedSystematics(), m_systMap_AllNP, allNP, false, onlyJER);
if (!m_isMC && m_doFull_JER) { // full JER on data = only JER systematics
addSystematics(syst, m_jetUncertaintiesTool->recommendedSystematics(), m_systMap_AllNP, allNP, false, true, false);
} else { // if it is MC run all JES/JER
addSystematics(syst, m_jetUncertaintiesTool->recommendedSystematics(), m_systMap_AllNP, allNP, false, false, false);
}
if (m_doFull_JER_Pseudodata) { // if it is PseudoData JER run extra PD smearing
addSystematics(syst, m_jetUncertaintiesToolPseudoData->recommendedSystematics(), m_systMap_JERPseudo, allNP, false, true, true);
}
} else {
addSystematics(syst,
m_jetUncertaintiesToolReducedNPScenario1->recommendedSystematics(), m_systMap_ReducedNPScenario1, np1, false,
onlyJER);
onlyJER, false);
addSystematics(syst,
m_jetUncertaintiesToolReducedNPScenario2->recommendedSystematics(), m_systMap_ReducedNPScenario2, np2, false,
onlyJER);
onlyJER, false);
addSystematics(syst,
m_jetUncertaintiesToolReducedNPScenario3->recommendedSystematics(), m_systMap_ReducedNPScenario3, np3, false,
onlyJER);
onlyJER, false);
addSystematics(syst,
m_jetUncertaintiesToolReducedNPScenario4->recommendedSystematics(), m_systMap_ReducedNPScenario4, np4, false,
onlyJER);
onlyJER, false);
}
}
......@@ -224,26 +236,26 @@ namespace top {
ToolHandle<ICPJetUncertaintiesTool> tmp_SF_uncert_tool("JetSFuncert_" + name.first);
if (tmp_SF_uncert_tool.retrieve()) {
m_tagSFUncorrelatedSystematics[name.first].clear();
CP::SystematicSet correlatedSys,uncorrelatedSys;
const CP::SystematicSet& recommendedSys = tmp_SF_uncert_tool->recommendedSystematics();
for (const CP::SystematicVariation& sys : recommendedSys) {
// Splitting uncertainties into two categories
// correlated will get a special tree
// uncorrelated SFs will be stored in the nominal tree
bool res = ((sys.name().find("TopTag") == std::string::npos) &&
(sys.name().find("WTag") == std::string::npos) &&
(sys.name().find("ZTag") == std::string::npos) &&
(sys.name().find("JetTag") == std::string::npos) &&
(sys.name().find("bTag") == std::string::npos));
res ? correlatedSys.insert(sys) : uncorrelatedSys.insert(sys);
}
m_tagSFUncorrelatedSystematics[name.first] = CP::make_systematics_vector(uncorrelatedSys);
for(const CP::SystematicSet& sys : m_tagSFUncorrelatedSystematics[name.first]) {
if(sys.name()!="") m_tagSFSysNames[name.first].push_back(name.first + "_" + sys.name());
}
m_tagSFUncorrelatedSystematics[name.first].clear();
CP::SystematicSet correlatedSys,uncorrelatedSys;
const CP::SystematicSet& recommendedSys = tmp_SF_uncert_tool->recommendedSystematics();
for (const CP::SystematicVariation& sys : recommendedSys) {
// Splitting uncertainties into two categories
// correlated will get a special tree
// uncorrelated SFs will be stored in the nominal tree
bool res = ((sys.name().find("TopTag") == std::string::npos) &&
(sys.name().find("WTag") == std::string::npos) &&
(sys.name().find("ZTag") == std::string::npos) &&
(sys.name().find("JetTag") == std::string::npos) &&
(sys.name().find("bTag") == std::string::npos));
res ? correlatedSys.insert(sys) : uncorrelatedSys.insert(sys);
}
m_tagSFUncorrelatedSystematics[name.first] = CP::make_systematics_vector(uncorrelatedSys);
for(const CP::SystematicSet& sys : m_tagSFUncorrelatedSystematics[name.first]) {
if(sys.name()!="") m_tagSFSysNames[name.first].push_back(name.first + "_" + sys.name());
}
largeRsysts.insert(correlatedSys);
......@@ -258,7 +270,7 @@ namespace top {
// add the merged set of systematics for large-R jets including the tagging SF systs
if ((m_config->isMC() || m_doOnly_JER_largeR) && (m_config->useLargeRJets()) && (!skip_systs)) {
std::string allNPlargeR("");
addSystematics(systLargeR, largeRsysts, m_systMap_LargeR, allNPlargeR, true, m_doOnly_JER_largeR);
addSystematics(systLargeR, largeRsysts, m_systMap_LargeR, allNPlargeR, true, m_doOnly_JER_largeR, false);
}
///-- Large R jet substructure --///
......@@ -360,7 +372,10 @@ namespace top {
///-- JES --///
if (m_isMC || m_doFull_JER) {
if (!m_doMultipleJES) {
top::check(applySystematic(m_jetUncertaintiesTool, m_systMap_AllNP), "Failed to apply JES");
top::check(applySystematic(m_jetUncertaintiesTool, m_systMap_AllNP, false), "Failed to apply JES");
if (m_doFull_JER_Pseudodata) {
top::check(applySystematic(m_jetUncertaintiesToolPseudoData, m_systMap_JERPseudo, false), "Failed to apply JES for pseudodata");
}
}
if (m_doMultipleJES) {
top::check(applySystematic(m_jetUncertaintiesToolReducedNPScenario1,
......@@ -378,7 +393,7 @@ namespace top {
// for systematically-shifted shallow copies as well
top::check(tagNominalLargeRJets(), "Failed to tag large-R jets");
if (m_isMC || m_doOnly_JER_largeR) {
top::check(applyTaggingSFSystematic(),"Failed to apply large-R tagging SFs syst.");
top::check(applyTaggingSFSystematic(),"Failed to apply large-R tagging SFs syst.");
top::check(applySystematic(m_jetUncertaintiesToolLargeR, m_systMap_LargeR,
true), "Failed to apply large-R syst.");
}
......@@ -486,13 +501,13 @@ namespace top {
if (!isLargeR && (m_config->doForwardJVTinMET() || m_config->getfJVTWP() != "None")) {
static bool checked_track_MET = false;
if (!checked_track_MET) {
if (evtStore()->contains<xAOD::MissingETContainer>("MET_Track")) {
m_do_fjvt = true;
} else {
ATH_MSG_ERROR(" Cannot retrieve MET_Track, fJVT values can't be calculated correctly!!");
return StatusCode::FAILURE;
}
checked_track_MET = true;
if (evtStore()->contains<xAOD::MissingETContainer>("MET_Track")) {
m_do_fjvt = true;
} else {
ATH_MSG_ERROR(" Cannot retrieve MET_Track, fJVT values can't be calculated correctly!!");
return StatusCode::FAILURE;
}
checked_track_MET = true;
}
}
if (m_do_fjvt) {
......@@ -571,18 +586,18 @@ namespace top {
auto shallowJets = std::make_pair(std::unique_ptr<xAOD::JetContainer>{shallow_xaod_copy.first},
std::unique_ptr<xAOD::ShallowAuxContainer>{shallow_xaod_copy.second});
top::check(tool->applySystematicVariation(sys), "Failed to applySystematicVariation");
const std::string sfNameShifted = fullName + "_" + sys.name();
for(size_t i=0;i<njets;i++) {
xAOD::Jet* shallowJet = shallowJets.first->at(i);
const xAOD::Jet* jet = ljets->at(i);
if(accRange.isAvailable(*shallowJet) && accRange(*shallowJet)) {
top::check(tool->applyCorrection(*shallowJet), "Failed to applyCorrection");
float sf = accSF.isAvailable(*shallowJet) ? accSF(*shallowJet) : -999.;
jet->auxdecor<float>(sfNameShifted.c_str()) = sf;
top::check(tool->applySystematicVariation(sys), "Failed to applySystematicVariation");
const std::string sfNameShifted = fullName + "_" + sys.name();
for(size_t i=0;i<njets;i++) {
xAOD::Jet* shallowJet = shallowJets.first->at(i);
const xAOD::Jet* jet = ljets->at(i);
if(accRange.isAvailable(*shallowJet) && accRange(*shallowJet)) {
top::check(tool->applyCorrection(*shallowJet), "Failed to applyCorrection");
float sf = accSF.isAvailable(*shallowJet) ? accSF(*shallowJet) : -999.;
jet->auxdecor<float>(sfNameShifted.c_str()) = sf;
// decorate efficiencies for inefficiency SF variations
if (sys.name().find("TagEffUnc") != std::string::npos) {
......@@ -590,8 +605,8 @@ namespace top {
jet->auxdecor<float>(fullName + "_" + sys.name() + "_efficiency") = accEff(*shallowJet);
}
}
}
}
}
}
}
}
......@@ -613,7 +628,6 @@ namespace top {
m_nominalSystematicSet.hash())), "Failed to retrieve Jets");
}
///-- Loop over the systematics --///
for (Itr syst = map.begin(); syst != map.end(); ++syst) {
///-- Don't do the nominal, we've already done that --///
......@@ -662,21 +676,18 @@ namespace top {
if (!calibratable_jet) continue;
///-- Apply large-R jet tagging SF uncertainties --///
for (std::pair<const std::string, ToolHandle<ICPJetUncertaintiesTool> >& tagSF : m_tagSFuncertTool) {
std::string fullName=tagSF.first;
std::replace(std::begin(fullName),std::end(fullName),':','_');
const SG::AuxElement::Accessor< char > acc("passedRangeCheck_" + fullName);
if(acc.isAvailable(*jet) && acc(*jet)) {
top::check(tagSF.second->applyCorrection(*jet), "Failed to applyCorrection");
}
///-- Apply large-R jet tagging SF uncertainties --///
for (std::pair<const std::string, ToolHandle<ICPJetUncertaintiesTool> >& tagSF : m_tagSFuncertTool) {
std::string fullName=tagSF.first;
std::replace(std::begin(fullName),std::end(fullName),':','_');
const SG::AuxElement::Accessor< char > acc("passedRangeCheck_" + fullName);
if(acc.isAvailable(*jet) && acc(*jet)) {
top::check(tagSF.second->applyCorrection(*jet), "Failed to applyCorrection");
}
}
}
///-- Apply Corrrection --///
if (!isJMR) top::check(tool->applyCorrection(*jet), "Failed to applyCorrection");
else top::check(m_FFJetSmearingTool->applyCorrection(*jet), "Failed to applyCorrection");
......@@ -686,25 +697,24 @@ namespace top {
if (!isLargeR) jet->auxdecor<float>("AnalysisTop_JVT") = m_jetUpdateJvtTool->updateJvt(*jet);
///-- Decorate fJVT for systematics too --///
// Check if the derivation we are running on contains
// MET_Track (once) before applying the fJVT decoration
if (!isLargeR && (m_config->doForwardJVTinMET() || m_config->getfJVTWP() != "None")) {
static bool checked_track_MET = false;
if (!checked_track_MET) {
if (evtStore()->contains<xAOD::MissingETContainer>("MET_Track")) {
m_do_fjvt = true;
} else {
ATH_MSG_ERROR(" Cannot retrieve MET_Track, fJVT values can't be calculated correctly!!");
return StatusCode::FAILURE;
}
checked_track_MET = true;
}
}
if (m_do_fjvt) {
top::check(!m_jetSelectfJvtTool->modify(*shallow_xaod_copy.first),
"Failed to apply fJVT decoration");
}
// Check if the derivation we are running on contains
// MET_Track (once) before applying the fJVT decoration
if (!isLargeR && (m_config->doForwardJVTinMET() || m_config->getfJVTWP() != "None")) {
static bool checked_track_MET = false;
if (!checked_track_MET) {
if (evtStore()->contains<xAOD::MissingETContainer>("MET_Track")) {
m_do_fjvt = true;
} else {
ATH_MSG_ERROR(" Cannot retrieve MET_Track, fJVT values can't be calculated correctly!!");
return StatusCode::FAILURE;
}
checked_track_MET = true;
}
}
if (m_do_fjvt) {
top::check(!m_jetSelectfJvtTool->modify(*shallow_xaod_copy.first),
"Failed to apply fJVT decoration");
}
}
///-- set links to original objects- needed for MET calculation --///
......@@ -804,39 +814,45 @@ namespace top {
void JetObjectCollectionMaker::addSystematics(const std::set<std::string>& specifiedSystematics,
const CP::SystematicSet& recommendedSysts,
std::unordered_map<CP::SystematicSet, CP::SystematicSet>& map,
const std::string& modName, bool isLargeR, bool onlyJER) {
const std::string& modName,
bool isLargeR,
bool onlyJER,
bool isPseudoData) {
if (isPseudoData && m_config->isSystNominal(m_config->systematics())) return;
///-- Get the recommended systematics from the tool, in std::vector format --///
const std::vector<CP::SystematicSet> systList = CP::make_systematics_vector(recommendedSysts);
for (const CP::SystematicSet& s : systList) {
if (s.size() == 1) {
CP::SystematicSet::const_iterator ss = s.begin();
if(!m_config->getTreeFilter()->filterTree(modName + ss->name())) continue; // Applying tree filter
if (onlyJER && ss->name().find("JER") == std::string::npos) continue;
CP::SystematicSet modSet(modName + ss->name());
m_recommendedSystematics.push_back(modSet);
if (!m_config->isSystNominal(m_config->systematics())) {
if (specifiedSystematics.size() == 0) {
if (!isLargeR) m_specifiedSystematics.push_back(modSet);
else m_specifiedSystematicsLargeR.push_back(modSet);
map.insert(std::make_pair(modSet, s));
} else if (specifiedSystematics.size() > 0) {
for (std::string i : specifiedSystematics) {
TreeFilter filter(i);
if (!filter.filterTree(modSet.name())) {
if (!isLargeR) m_specifiedSystematics.push_back(modSet);
else m_specifiedSystematicsLargeR.push_back(modSet);
map.insert(std::make_pair(modSet, s));
}
if (s.size() != 1) continue;
CP::SystematicSet::const_iterator ss = s.begin();
if(!m_config->getTreeFilter()->filterTree(modName + ss->name())) continue; // Applying tree filter
if (onlyJER && ss->name().find("JER") == std::string::npos) continue;
const std::string name = isPseudoData ? modName + ss->name() + "_PseudoData" : modName + ss->name();
CP::SystematicSet modSet(name);
m_recommendedSystematics.push_back(modSet);
if (!m_config->isSystNominal(m_config->systematics())) {
if (specifiedSystematics.size() == 0) {
if (!isLargeR) m_specifiedSystematics.push_back(modSet);
else m_specifiedSystematicsLargeR.push_back(modSet);
map.insert(std::make_pair(modSet, s));
} else {
for (const std::string& i : specifiedSystematics) {
TreeFilter filter(i);
if (!filter.filterTree(modSet.name())) {
if (!isLargeR) m_specifiedSystematics.push_back(modSet);
else m_specifiedSystematicsLargeR.push_back(modSet);
map.insert(std::make_pair(modSet, s));
}
} // User has specified a systematic
} // Don't do anything if the user requests nominal only
} // size() == 1 -- this means that there is a CP::SystematicVariation
}
} // User has specified a systematic
} // Don't do anything if the user requests nominal only
} // Loop over systList
m_recommendedSystematics.sort();
......
PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h
View file @ c013bfd8
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id: JetObjectCollectionMaker.h 809674 2017-08-23 14:10:24Z iconnell $
......@@ -94,7 +94,8 @@ namespace top {