diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/CMakeLists.txt b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/CMakeLists.txt
index a0d38e5f271f6ac51be6dbef74aa7ea6ead5c377..2d37183bf2ba99cff5ed557069759da62a81ed33 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/CMakeLists.txt
@@ -34,7 +34,6 @@ atlas_depends_on_subdirs( PUBLIC
JetInterface
JetMomentTools
JetSelectorTools
- JetResolution
METInterface
METUtilities
IsolationSelection
@@ -94,7 +93,6 @@ atlas_add_library( TopCPTools Root/*.cxx Root/*.h Root/*.icc
JetInterface
JetMomentToolsLib
JetSelectorToolsLib
- JetResolutionLib
METInterface
METUtilitiesLib
IsolationSelectionLib
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
index 31ebbb36bce218f3052b6a1181f409c8bf8e323d..df664aa3e5f44113d7ba458abbc7235298ac551b 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
@@ -20,8 +20,6 @@
#include "JetMomentTools/JetVertexTaggerTool.h"
#include "JetMomentTools/JetForwardJvtTool.h"
#include "JetSelectorTools/JetCleaningTool.h"
-#include "JetResolution/JERTool.h"
-#include "JetResolution/JERSmearingTool.h"
#include "JetJvtEfficiency/JetJvtEfficiency.h"
#include "JetSelectorTools/EventCleaningTool.h"
@@ -36,34 +34,27 @@ JetMETCPTools::JetMETCPTools(const std::string& name) :
m_jetJVT_ConfigFile("JVTlikelihood_20140805.root"),
- // Updated to December 2016 recommendations
- // config names are the same for Data and FS, for EM or LC jets
+ // Calibration strings for R21 only
+ m_jetAntiKt4_Data_ConfigFile("JES_data2017_2016_2015_Recommendation_Aug2018_rel21.config"),
+ m_jetAntiKt4_Data_CalibSequence("JetArea_Residual_EtaJES_GSC_Insitu"),
- // Default calibrations for release 20.7 analyses - r21 is setup in setupJetsCalibration
- m_jetAntiKt4_Data_ConfigFile("JES_data2016_data2015_Recommendation_Dec2016.config"),
- m_jetAntiKt4_Data_CalibSequence("JetArea_Residual_Origin_EtaJES_GSC_Insitu"),
+ m_jetAntiKt4_MCFS_ConfigFile("JES_data2017_2016_2015_Recommendation_Aug2018_rel21.config"),
+ m_jetAntiKt4_MCFS_CalibSequence("JetArea_Residual_EtaJES_GSC_Smear"),
- m_jetAntiKt4_MCFS_ConfigFile("JES_data2016_data2015_Recommendation_Dec2016.config"),
- m_jetAntiKt4_MCFS_CalibSequence("JetArea_Residual_Origin_EtaJES_GSC"),
+ // Not recommended to use JER smearing (derived from FS on AF2)
+ m_jetAntiKt4_MCAFII_ConfigFile("JES_MC16Recommendation_AFII_EMTopo_April2018_rel21.config"),
+ m_jetAntiKt4_MCAFII_CalibSequence("JetArea_Residual_EtaJES_GSC"),
+
+ // Not recommended to use JER smearing (derived from FS on AF2)
+ m_jetAntiKt4_MCAFII_PFlow_ConfigFile("JES_MC16Recommendation_AFII_PFlow_April2018_rel21.config"),
+ m_jetAntiKt4_MCAFII_PFlow_CalibSequence("JetArea_Residual_EtaJES_GSC"),
- // AFII is different - still June 2015 pre-recommendations
- m_jetAntiKt4_MCAFII_ConfigFile("JES_MC15Prerecommendation_AFII_June2015.config"),
- m_jetAntiKt4_MCAFII_CalibSequence("JetArea_Residual_Origin_EtaJES_GSC"),
+ m_jetAntiKt4_PFlow_MCFS_ConfigFile("JES_data2017_2016_2015_Recommendation_PFlow_Aug2018_rel21.config"),
+ m_jetAntiKt4_PFlow_MCFS_CalibSequence("JetArea_Residual_EtaJES_GSC_Smear"),
- // AFII is different - still June 2015 pre-recommendations and not siupported for R20.7
- // TODO: Remove all this legacy R20.7 stuff !!
- m_jetAntiKt4_MCAFII_PFlow_ConfigFile("JES_MC15Prerecommendation_AFII_June2015.config"),
- m_jetAntiKt4_MCAFII_PFlow_CalibSequence("JetArea_Residual_Origin_EtaJES_GSC"),
-
-
- // Particle-Flow jets, August 2016 recommendations, no GSC
- m_jetAntiKt4_PFlow_MCFS_ConfigFile("JES_MC15cRecommendation_PFlow_Aug2016.config"),
- m_jetAntiKt4_PFlow_MCFS_CalibSequence("JetArea_Residual_EtaJES_GSC"),
-
- //PFlow has the same recommendation in data as in MC
- m_jetAntiKt4_Data_PFlow_ConfigFile("JES_MC15cRecommendation_PFlow_Aug2016.config"),
- m_jetAntiKt4_Data_PFlow_CalibSequence("JetArea_Residual_EtaJES_GSC")
- {
+ m_jetAntiKt4_Data_PFlow_ConfigFile("JES_data2017_2016_2015_Recommendation_PFlow_Aug2018_rel21.config"),
+ m_jetAntiKt4_Data_PFlow_CalibSequence("JetArea_Residual_EtaJES_GSC_Insitu")
+ {
declareProperty("config", m_config);
declareProperty("release_series", m_release_series );
@@ -84,8 +75,6 @@ JetMETCPTools::JetMETCPTools(const std::string& name) :
declareProperty( "JetEventCleaningToolLooseBad" , m_jetEventCleaningToolLooseBad );
declareProperty( "JetEventCleaningToolTightBad" , m_jetEventCleaningToolTightBad );
- declareProperty( "JetJERTool" , m_jetJERTool );
- declareProperty( "JetJERSmearingTool" , m_jetJERSmearingTool );
declareProperty( "JetUpdateJvtTool" , m_jetUpdateJvtTool );
declareProperty( "JES_data2016_data2015_Recommendation_Dec2016.config", m_jetAntiKt4_MCFS_ConfigFile);
@@ -127,31 +116,7 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
// Release 21 specific
// https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetEtmissRecommendationsR21
- // https://twiki.cern.ch/twiki/bin/view/AtlasProtected/ApplyJetCalibrationR21#Calibration_of_small_R_jets_in_M
- if(m_release_series == 25){
- ATH_MSG_INFO("Updating configuration options for Rel21");
- ATH_MSG_INFO("Applying MCJES+GSC calibration on data/MC");
- ATH_MSG_INFO("Insitu corrections for data are not yet available and not neglible");
-
- // Data
- m_jetAntiKt4_Data_ConfigFile = "JES_data2017_2016_2015_Recommendation_Feb2018_rel21.config";
- m_jetAntiKt4_Data_CalibSequence = "JetArea_Residual_EtaJES_GSC_Insitu";
- // FS EM/LC
- m_jetAntiKt4_MCFS_ConfigFile = "JES_data2017_2016_2015_Recommendation_Feb2018_rel21.config";
- m_jetAntiKt4_MCFS_CalibSequence = "JetArea_Residual_EtaJES_GSC";
- // AFII EM/LC
- m_jetAntiKt4_MCAFII_ConfigFile = "JES_MC16Recommendation_AFII_EMTopo_April2018_rel21.config";
- m_jetAntiKt4_MCAFII_CalibSequence = "JetArea_Residual_EtaJES_GSC";
-
- m_jetAntiKt4_MCAFII_PFlow_ConfigFile = "JES_MC16Recommendation_AFII_PFlow_April2018_rel21.config";
- m_jetAntiKt4_MCAFII_PFlow_CalibSequence = "JetArea_Residual_EtaJES_GSC";
- // FS PFlow
- m_jetAntiKt4_PFlow_MCFS_ConfigFile = "JES_data2017_2016_2015_Recommendation_PFlow_Feb2018_rel21.config"; // MC15c?
- m_jetAntiKt4_PFlow_MCFS_CalibSequence = "JetArea_Residual_EtaJES_GSC";
-
- m_jetAntiKt4_Data_PFlow_ConfigFile = "JES_data2017_2016_2015_Recommendation_PFlow_Feb2018_rel21.config";
- m_jetAntiKt4_Data_PFlow_CalibSequence = "JetArea_Residual_EtaJES_GSC_Insitu";
- }
+ // https://twiki.cern.ch/twiki/bin/view/AtlasProtected/ApplyJetCalibrationR21
// Get jet calibration name and erase "Jets" from the end
std::string caloJets_collection = m_config->sgKeyJets();
@@ -169,6 +134,7 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
ATH_MSG_ERROR("Unable to calibrate jets with JMS calib sequence in release 21: No recommendations! ");
return StatusCode::FAILURE;
+ // If this is functional, remove the error above and reconfigure the calibration sequence
m_jetAntiKt4_MCFS_ConfigFile.erase(m_jetAntiKt4_MCFS_ConfigFile.length() - 7);//erase ".config" at the end
m_jetAntiKt4_MCFS_ConfigFile += "_JMS.config";
m_jetAntiKt4_MCFS_CalibSequence += "_JMS";
@@ -183,21 +149,22 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
// AFII
if (m_config->isAFII()) {
if(m_config->useParticleFlowJets()){
- calibConfig = m_jetAntiKt4_MCAFII_PFlow_ConfigFile;
+ calibConfig = m_jetAntiKt4_MCAFII_PFlow_ConfigFile;
calibSequence = m_jetAntiKt4_MCAFII_PFlow_CalibSequence;
- }else{
- calibConfig = m_jetAntiKt4_MCAFII_ConfigFile;
+ }
+ else{
+ calibConfig = m_jetAntiKt4_MCAFII_ConfigFile;
calibSequence = m_jetAntiKt4_MCAFII_CalibSequence;
}
}
// FS - PFlow
else if (m_config->useParticleFlowJets()) {
- calibConfig = m_jetAntiKt4_PFlow_MCFS_ConfigFile;
- calibSequence = m_jetAntiKt4_PFlow_MCFS_CalibSequence;
+ calibConfig = m_jetAntiKt4_PFlow_MCFS_ConfigFile;
+ calibSequence = m_jetAntiKt4_PFlow_MCFS_CalibSequence;
}
// FS
else {
- calibConfig = m_jetAntiKt4_MCFS_ConfigFile;
+ calibConfig = m_jetAntiKt4_MCFS_ConfigFile;
calibSequence = m_jetAntiKt4_MCFS_CalibSequence;
}
}
@@ -206,11 +173,16 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
calibConfig = m_jetAntiKt4_Data_PFlow_ConfigFile;
calibSequence = m_jetAntiKt4_Data_PFlow_CalibSequence;
}else{
- calibConfig = m_jetAntiKt4_Data_ConfigFile;
+ calibConfig = m_jetAntiKt4_Data_ConfigFile;
calibSequence = m_jetAntiKt4_Data_CalibSequence;
}
}
+ // Print out some information
+ ATH_MSG_INFO("Configuration JES tools with ");
+ ATH_MSG_INFO("JES Calibration Configuration : " << calibConfig);
+ ATH_MSG_INFO("JES Calibration Sequence : " << calibSequence);
+
JetCalibrationTool* jetCalibrationTool = new JetCalibrationTool("JetCalibrationTool");
top::check(asg::setProperty(jetCalibrationTool, "JetCollection", jetCalibrationName),
"Failed to set JetCollection " + jetCalibrationName);
@@ -266,53 +238,88 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
// Uncertainties
// Is our MC full or fast simulation?
std::string MC_type = (m_config->isAFII()) ? "AFII" : "MC16";
- std::string conference = "Moriond2018";
- // interpret uncertainty model aliases
- if (m_config->jetUncertainties_NPModel() == "GlobalReduction")
- m_config->jetUncertainties_NPModel("GlobalReduction");
- else if (m_config->jetUncertainties_NPModel() == "CategoryReduction")
- m_config->jetUncertainties_NPModel("CategoryReduction");
+ // Moriond2018 - AF2 JES
+ // Summer2018 - JER update
+ std::string conference = "Summer2018";
- std::string JMS_Uncertainty="";
+ // If JMS is allowed then there should also be extrapolation and frozen uncertainties configured
+ std::string JMS_Uncertainty = "";
if ( m_config->jetCalibSequence() == "JMS" )
JMS_Uncertainty = "_JMSExtrap";
- // Rel21 calibrations used to be stored in a non-default area - therefore configure
- // the tool to look for the calibration in the correct fille.
- // Now it is default area, so back to not configuring it
+ // By setting calib_area to "None" we pick up the default from the JES group
std::string calib_area = "None";
+
+ // JER string option configuration
+ bool JERisMC = m_config->isMC();
+ std::string JERSmearModel = m_config->jetJERSmearingModel();
+ // 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");
+ }
+
+ // Strings need to be defined clearly for jet tool
+ if( JERSmearModel == "All") JERSmearModel = "_AllJERNP";
+ else if( JERSmearModel == "Full") JERSmearModel = "_FullJER";
+ else if( JERSmearModel == "Simple") JERSmearModel = "_SimpleJER";
+ else {
+ ATH_MSG_ERROR("Incorrect JER option: All, All_PseudoData, Full, Full_PseudoData, Simple");
+ return StatusCode::FAILURE;
+ }
// Are we doing multiple JES for the reduced NP senarios?
if (!m_config->doMultipleJES()) {
- m_jetUncertaintiesTool
- = setupJetUncertaintiesTool("JetUncertaintiesTool",
- jetCalibrationName,
- MC_type,
- "rel21/" + conference +"/R4_" + m_config->jetUncertainties_NPModel() + ".config",
- nullptr,
- m_config->jetUncertainties_QGFracFile(),
- calib_area
- );
+ m_jetUncertaintiesTool = setupJetUncertaintiesTool("JetUncertaintiesTool",
+ jetCalibrationName,
+ MC_type,
+ JERisMC,
+ "rel21/" + conference
+ + "/R4_" + m_config->jetUncertainties_NPModel()
+ + JMS_Uncertainty
+ + JERSmearModel
+ + ".config",
+ nullptr,
+ m_config->jetUncertainties_QGFracFile(),
+ calib_area
+ );
// Implement additional tool for frozen config when using JMS
if (JMS_Uncertainty == "_JMSExtrap"){
JMS_Uncertainty = "_JMSFrozen";
m_jetUncertaintiesToolFrozenJMS = setupJetUncertaintiesTool("JetUncertaintiesToolFrozenJMS",
- jetCalibrationName, MC_type,
- "JES_2016/"
- + conference
- +"/JES2016_"
- + m_config->jetUncertainties_NPModel()
- + ".config",nullptr,m_config->jetUncertainties_QGFracFile());
+ jetCalibrationName,
+ MC_type,
+ JERisMC,
+ "rel21/" + conference
+ + "/R4_" + m_config->jetUncertainties_NPModel()
+ + JMS_Uncertainty
+ + ".config",
+ nullptr,
+ m_config->jetUncertainties_QGFracFile(),
+ calib_area
+ );
}
- } else {
+ }
+ else {
+ ATH_MSG_ERROR("There are not multiple reduced NP scenarios available at the current time");
+ return StatusCode::FAILURE;
+
+ // This is legacy code to allow for reduced NP scenarios but currently in R21 they are not functional
+ // However, if they become available we need only change the code here
m_jetUncertaintiesToolReducedNPScenario1
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario1",
- jetCalibrationName, MC_type,
+ jetCalibrationName, MC_type,JERisMC,
"rel21/"
+ conference
+ "/R4_StrongReduction_Scenario1.config",
@@ -320,7 +327,7 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
calib_area);
m_jetUncertaintiesToolReducedNPScenario2
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario2",
- jetCalibrationName, MC_type,
+ jetCalibrationName, MC_type,JERisMC,
"rel21/"
+ conference
+ "/R4_CategoryReduction.config",
@@ -329,7 +336,7 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
calib_area);
m_jetUncertaintiesToolReducedNPScenario3
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario3",
- jetCalibrationName, MC_type,
+ jetCalibrationName, MC_type,JERisMC,
"rel21/"
+ conference
+ "/R4_GlobalReduction.config",nullptr,
@@ -337,49 +344,13 @@ StatusCode JetMETCPTools::setupJetsCalibration() {
calib_area);
m_jetUncertaintiesToolReducedNPScenario4
= setupJetUncertaintiesTool("JetUncertaintiesToolReducedNPScenario4",
- jetCalibrationName, MC_type,
+ jetCalibrationName, MC_type,JERisMC,
"rel21/"
+ conference
+ "/R4_AllNuisanceParameters.config",nullptr,m_config->jetUncertainties_QGFracFile(),
calib_area);
}
- // JER Tool
- if (asg::ToolStore::contains<IJERTool>("JetJERTool")) {
- m_jetJERTool = asg::ToolStore::get<IJERTool>("JetJERTool");
- } else {
- IJERTool* jetJERTool = new JERTool("JetJERTool");
- top::check(asg::setProperty(jetJERTool, "CollectionName", "AntiKt4EMTopoJets"),
- "Failed to set CollectionName to JetJERTool");
- top::check(jetJERTool->initialize(), "Failed to initialize");
- m_jetJERTool = jetJERTool;
- }
-
- bool JERisMC = m_config->isMC();
- std::string JERSmearModel = m_config->jetJERSmearingModel();
- if (JERSmearModel == "Full_PseudoData") {
- if (JERisMC) JERisMC = false;// consider MC as pseudo-data
- JERSmearModel = "Full";// this is the Full model
- }
- // JER Smearing
- const std::string jersmear_name = "JetJERSmearingTool";
- if (asg::ToolStore::contains<IJERSmearingTool>(jersmear_name)) {
- m_jetJERSmearingTool = asg::ToolStore::get<IJERSmearingTool>(jersmear_name);
- } else {
- IJERSmearingTool* jetJERSmearingTool = new JERSmearingTool(jersmear_name);
- top::check(asg::setProperty(jetJERSmearingTool, "JERTool" , m_jetJERTool),
- "Failed to JERTool to " + jersmear_name);
- top::check(asg::setProperty(jetJERSmearingTool, "ApplyNominalSmearing", false),
- "Failed to ApplyNominalSmearing for " + jersmear_name);
- top::check(asg::setProperty(jetJERSmearingTool, "isMC", JERisMC),
- "Failed to isMC to " + jersmear_name);
- top::check(asg::setProperty(jetJERSmearingTool, "SystematicMode", JERSmearModel),
- "Failed to SystematicMode for " + jersmear_name);
- top::check(jetJERSmearingTool->initialize(),
- "Failed to initialize " + jersmear_name);
- m_jetJERSmearingTool = jetJERSmearingTool;
- }
-
return StatusCode::SUCCESS;
}
@@ -459,17 +430,17 @@ StatusCode JetMETCPTools::setupLargeRJetsCalibration() {
m_jetUncertaintiesToolLargeR_strong
= setupJetUncertaintiesTool("JetUncertaintiesToolLargeR_Strong",
- jetCalibrationNameLargeR, MC_type,
+ jetCalibrationNameLargeR, MC_type, false,
configDir+"/"+conference
+ "/R10_"+largeRJES_config+"_strong.config",variables,"",calibArea);
m_jetUncertaintiesToolLargeR_medium
= setupJetUncertaintiesTool("JetUncertaintiesToolLargeR_Medium",
- jetCalibrationNameLargeR, MC_type,
+ jetCalibrationNameLargeR, MC_type, false,
configDir+"/"+conference
+ "/R10_"+largeRJES_config+"_medium.config",variables,"",calibArea);
m_jetUncertaintiesToolLargeR_weak
= setupJetUncertaintiesTool("JetUncertaintiesToolLargeR_Weak",
- jetCalibrationNameLargeR, MC_type,
+ jetCalibrationNameLargeR, MC_type, false,
configDir+"/"+conference
+ "/R10_"+largeRJES_config+"_weak.config",variables,"",calibArea);
@@ -558,13 +529,14 @@ StatusCode JetMETCPTools::setupMET()
ICPJetUncertaintiesTool*
JetMETCPTools::setupJetUncertaintiesTool(const std::string& name,
- const std::string& jet_def,
- const std::string& mc_type,
- const std::string& config_file,
- std::vector<std::string>* variables,
- const std::string& analysis_file,
- const std::string& calib_area
- ) {
+ const std::string& jet_def,
+ const std::string& mc_type,
+ bool isMC,
+ const std::string& config_file,
+ std::vector<std::string>* variables,
+ const std::string& analysis_file,
+ const std::string& calib_area
+ ) {
ICPJetUncertaintiesTool* tool = nullptr;
if (asg::ToolStore::contains<ICPJetUncertaintiesTool>(name)) {
tool = asg::ToolStore::get<ICPJetUncertaintiesTool>(name);
@@ -574,6 +546,8 @@ JetMETCPTools::setupJetUncertaintiesTool(const std::string& name,
"Failed to set JetDefinition for " + name);
top::check(asg::setProperty(tool, "MCType", mc_type),
"Failed to set MCType for " + name);
+ top::check(asg::setProperty(tool, "IsData", !isMC),
+ "Failed to set IsData (for JER only)");
top::check(asg::setProperty(tool, "ConfigFile", config_file),
"Failed to set ConfigFile for " + name);
if (variables != nullptr){
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h
index e382bdf3d74708c03da4a04c1de581eb6f5f4734..b751efcb275267a75fe591a01d02577e471b0e88 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h
@@ -22,8 +22,6 @@
#include "JetInterface/IJetUpdateJvt.h"
#include "JetInterface/IJetSelector.h"
#include "JetInterface/IJetModifier.h"
-#include "JetResolution/IJERTool.h"
-#include "JetResolution/IJERSmearingTool.h"
#include "JetAnalysisInterfaces/IJetJvtEfficiency.h"
#include "JetSelectorTools/IEventCleaningTool.h"
@@ -88,8 +86,6 @@ class JetMETCPTools final : public asg::AsgTool {
ToolHandle<ECUtils::IEventCleaningTool> m_jetEventCleaningToolLooseBad;
ToolHandle<ECUtils::IEventCleaningTool> m_jetEventCleaningToolTightBad;
- ToolHandle<IJERTool> m_jetJERTool;
- ToolHandle<IJERSmearingTool> m_jetJERSmearingTool;
ToolHandle<IJetUpdateJvt> m_jetUpdateJvtTool;
ToolHandle<IJetModifier> m_fjvtTool;
@@ -109,6 +105,7 @@ class JetMETCPTools final : public asg::AsgTool {
setupJetUncertaintiesTool(const std::string& name,
const std::string& jet_def,
const std::string& mc_type,
+ bool isMC,
const std::string& config_file,
std::vector<std::string>* variables,
const std::string& analysis_file = "",
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
index 3cb8962617d9518067f90c3aa18de6003c51d496..22ecca30e1d4a8781bf93ed5f192d5726a1b8434 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
@@ -92,7 +92,7 @@ ConfigurationSettings::ConfigurationSettings() : m_configured(false) {
registerParameter("LargeRSmallRCorrelations",
"Do large-small R jet correlation systematics - True or False (default)",
"False");
- registerParameter("JetJERSmearingModel","Full (inc data smearing), Full_PseudoData (use MC as pseudo-data) or Simple (1NP, MC only - default)","Simple");
+ 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");
registerParameter("JetCalibSequence","Jet calibaration sequence, GSC (default) or JMS","GSC");
registerParameter("JVTinMETCalculation", "Perfom a JVT cut on the jets in the MET recalculation? True (default) or False.", "True" );
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
index d24ab58b242c7b6566409069edf8527de7e96630..2656889b663e172783917f8d836eae66f29ec5a1 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
@@ -47,7 +47,6 @@ JetObjectCollectionMaker::JetObjectCollectionMaker( const std::string& name ) :
m_jetUncertaintiesToolLargeR_medium("JetUncertaintiesToolLargeR_Medium"),
m_jetUncertaintiesToolLargeR_weak("JetUncertaintiesToolLargeR_Weak"),
- m_jetJERSmearingTool("JetJERSmearingTool"),
m_jetUpdateJvtTool("JetUpdateJvtTool"),
m_fjvtTool("fJVTTool"),
@@ -59,8 +58,7 @@ JetObjectCollectionMaker::JetObjectCollectionMaker( const std::string& name ) :
m_systMap_ReducedNPScenario2(),
m_systMap_ReducedNPScenario3(),
m_systMap_ReducedNPScenario4(),
- m_systMap_LargeR_strong(),
- m_systMap_JER()
+ m_systMap_LargeR_strong()
{
declareProperty( "config" , m_config );
@@ -75,7 +73,6 @@ JetObjectCollectionMaker::JetObjectCollectionMaker( const std::string& name ) :
declareProperty( "JetUncertaintiesToolReducedNPScenario3" , m_jetUncertaintiesToolReducedNPScenario3 );
declareProperty( "JetUncertaintiesToolReducedNPScenario4" , m_jetUncertaintiesToolReducedNPScenario4 );
- declareProperty( "JetJERSmearingTool" , m_jetJERSmearingTool );
declareProperty( "JetUpdateJvtTool" , m_jetUpdateJvtTool );
declareProperty( "TruthJetCollectionForHSTagging" , m_truthJetCollForHS = "AntiKt4TruthJets" );
@@ -108,7 +105,7 @@ StatusCode JetObjectCollectionMaker::initialize() {
// don't have any uncertainties so skip the retrieval.
if (!m_config->useParticleFlowJets()) {
///-- JER uncertainties model --///
- if (m_config->jetJERSmearingModel() == "Full")
+ if (m_config->jetJERSmearingModel() == "Full" || m_config->jetJERSmearingModel() == "All")
m_doFull_JER = true;
if (m_config->jetJERSmearingModel() == "Simple")
m_doFull_JER = false;
@@ -123,9 +120,9 @@ StatusCode JetObjectCollectionMaker::initialize() {
if (m_config->isMC()) {
if (!m_config->doMultipleJES()) {
- top::check( m_jetUncertaintiesTool.retrieve() , "Failed to retrieve JetUncertaintiesToolAllNP" );
+ top::check( m_jetUncertaintiesTool.retrieve() , "Failed to retrieve JetUncertaintiesTool" );
if ( m_config->jetCalibSequence() == "JMS" ){
- top::check( m_jetUncertaintiesToolFrozenJMS.retrieve() , "Failed to retrieve JetUncertaintiesToolAllNP" );
+ top::check( m_jetUncertaintiesToolFrozenJMS.retrieve() , "Failed to retrieve JetUncertaintiesTool (FrozenJMS)" );
}
}
if (m_config->doMultipleJES()) {
@@ -135,8 +132,6 @@ StatusCode JetObjectCollectionMaker::initialize() {
top::check( m_jetUncertaintiesToolReducedNPScenario4.retrieve() , "Failed to retrieve JetUncertaintiesToolReducedNPScenario4" );
}
}
-
- top::check( m_jetJERSmearingTool.retrieve() , "Failed to retrieve JetJERSmearingTool" );
}
top::check( m_jetUpdateJvtTool.retrieve() , "Failed to retrieve JetUpdateJvtTool" );
@@ -173,7 +168,8 @@ StatusCode JetObjectCollectionMaker::initialize() {
if (!m_config->useParticleFlowJets()) {
///-- JES systematics --///
if (m_config->isMC()) {
- std::string allNP("JET_"+m_config->jetUncertainties_NPModel()+"_"),np1("JET_SR_Scenario1_"),np2("JET_SR_Scenario2_"),np3("JET_SR_Scenario3_"),np4("JET_SR_Scenario4_");
+ std::string allNP("JET_"+m_config->jetUncertainties_NPModel()+"_"),
+ np1("JET_SR_Scenario1_"),np2("JET_SR_Scenario2_"),np3("JET_SR_Scenario3_"),np4("JET_SR_Scenario4_");
std::string allNP_FrozenJMS("JET_"+m_config->jetUncertainties_NPModel()+"_FrozenJMS_");
std::string largeR_strong("LARGERJET_Strong_"),
largeR_medium("LARGERJET_Medium_"),
@@ -198,9 +194,6 @@ StatusCode JetObjectCollectionMaker::initialize() {
}
}
- ///-- JER systematics --///
- if (m_doJER)
- specifiedSystematics( syst , m_jetJERSmearingTool , m_systMap_JER );
}
// See http://cern.ch/go/nHF6 for more information
@@ -281,12 +274,7 @@ StatusCode JetObjectCollectionMaker::execute( const bool isLargeR, bool executeN
}
///-- Systematics from here --///
-
- // No uncertainties yet for pflow
- // - return SUCCESS after calibration
- if (m_config->useParticleFlowJets())
- return StatusCode::SUCCESS;
-
+
///-- JES, JER regular atk4 for now --///
if (!isLargeR) {
///-- JES --///
@@ -304,11 +292,8 @@ StatusCode JetObjectCollectionMaker::execute( const bool isLargeR, bool executeN
top::check( applySystematic( m_jetUncertaintiesToolReducedNPScenario4 , m_systMap_ReducedNPScenario4 ) , "Failed to apply JES");
}
}
-
- ///-- JER --///
- if (m_doJER)
- top::check( applySystematic ( m_jetJERSmearingTool , m_systMap_JER ) , "Failed to apply JER" );
- } else {
+ }
+ else {
if (m_config->isMC()) {
top::check( applySystematic( m_jetUncertaintiesToolLargeR_strong , m_systMap_LargeR_strong, true ) , "Failed to apply large-R syst.");
top::check( applySystematic( m_jetUncertaintiesToolLargeR_medium , m_systMap_LargeR_medium, true ) , "Failed to apply large-R syst.");
@@ -511,56 +496,6 @@ StatusCode JetObjectCollectionMaker::applySystematic(ToolHandle<ICPJetUncertaint
}
-
-StatusCode JetObjectCollectionMaker::applySystematic(ToolHandle<IJERSmearingTool>& tool,
- const std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map ) {
- ///-- Get calibrated jets --///
- const xAOD::JetContainer* xaod(nullptr);
- top::check( evtStore()->retrieve( xaod , m_config->sgKeyJetsStandAlone( 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 --///
- if ((*syst).second.hash() != m_nominalSystematicSet.hash()) {
-
- ///-- Tell the tool which systematic to use --///
- ///-- Here we use the second, original CP::SystematicSet --///
- top::check( tool->applySystematicVariation( (*syst).second ) , "Failed to apply systematic" );
-
- ///-- Shallow copy of the xAOD --///
- std::pair< xAOD::JetContainer*, xAOD::ShallowAuxContainer* > shallow_xaod_copy = xAOD::shallowCopyContainer( *xaod );
-
- ///-- Loop over the xAOD Container --///
- for( auto jet : *(shallow_xaod_copy.first) ){
- ///-- Apply Corrrection --///
- top::check( tool->applyCorrection( *jet ) , "Failed to applyCorrection" );
- ///-- Update JVT --///
- jet->auxdecor<float>("AnalysisTop_JVT") = m_jetUpdateJvtTool->updateJvt( *jet );
- }
-
- ///-- set links to original objects- needed for MET calculation --///
- bool setLinks = xAOD::setOriginalObjectLink( *xaod, *shallow_xaod_copy.first );
- if (!setLinks)
- ATH_MSG_ERROR(" Cannot set original object links for jets, MET recalculation may struggle" );
-
- ///-- Save corrected xAOD Container to StoreGate / TStore --///
- ///-- Here we use the first, AnalysisTop modified CP::SystematicSer --///
- ///-- This allows us to run multiple JES scenarios, which all have the same hash values --///
- std::string outputSGKey = m_config->sgKeyJetsStandAlone( (*syst).first.hash() );
- std::string outputSGKeyAux = outputSGKey + "Aux.";
-
- xAOD::TReturnCode save = evtStore()->tds()->record( shallow_xaod_copy.first , outputSGKey );
- xAOD::TReturnCode saveAux = evtStore()->tds()->record( shallow_xaod_copy.second , outputSGKeyAux );
- if( !save || !saveAux ){
- return StatusCode::FAILURE;
- }
- }
- }
-
- return StatusCode::SUCCESS;
-}
-
StatusCode JetObjectCollectionMaker::executeTrackJets(bool executeNominal) {
///-- No calibrations or systematics yet --///
///-- Only run this on the nominal execution --///
@@ -669,43 +604,6 @@ void JetObjectCollectionMaker::specifiedSystematics(const std::set<std::string>&
}
-
-
-///-- Don't really need to do this, but would rather stay consistent with JetObjectCollectionMaker --///
-///-- This could be done like all the other xyzObjectCollectionMakers, but would need to change the way execute() works --///
-void JetObjectCollectionMaker::specifiedSystematics( const std::set<std::string>& specifiedSystematics,
- const ToolHandle<IJERSmearingTool>& tool,
- std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map ) {
- ///-- Get the recommended systematics from the tool, in std::vector format --///
- const std::vector<CP::SystematicSet> systList = CP::make_systematics_vector( tool->recommendedSystematics() );
-
- for (auto s : systList) {
- m_recommendedSystematics.push_back(s);
-
- ///-- Are we doing JER? Are we only doing Nominal? Did the user specify specific systematics to use? --///
- if (m_doJER) {
- if (!m_config->isSystNominal( m_config->systematics() )) {
- if (specifiedSystematics.size() == 0) {
- m_specifiedSystematics.push_back(s);
- map.insert( std::make_pair(s,s) );
- }
- if (specifiedSystematics.size() > 0) {
- for (auto i : specifiedSystematics) {
- if ( i == s.name() ) {
- m_specifiedSystematics.push_back(s);
- map.insert( std::make_pair(s,s) );
- }
- }
- }
- }
- }
- }
- m_recommendedSystematics.sort();
- m_recommendedSystematics.unique();
- m_specifiedSystematics.sort();
- m_specifiedSystematics.unique();
-}
-
StatusCode JetObjectCollectionMaker::decorateBJets(xAOD::Jet& jet) {
// initialise decorator and accessor
static SG::AuxElement::Decorator<char> isbjet("IsBjet");
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h
index 919339b48dc067749114cbd242a1f323da0880d0..f3bcdd42b13e65fa843a4d5963cff63901afd2b1 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h
@@ -42,7 +42,6 @@
// CP Tool include(s):
#include "JetCalibTools/IJetCalibrationTool.h"
#include "JetCPInterfaces/ICPJetUncertaintiesTool.h"
-#include "JetResolution/IJERSmearingTool.h"
#include "JetInterface/IJetUpdateJvt.h"
#include "TopJetSubstructure/TopJetSubstructure.h"
@@ -87,14 +86,12 @@ namespace top{
protected:
// specify Systematic
- virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<ICPJetUncertaintiesTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , const std::string& modName , bool isLargeR = false);
- virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<IJERSmearingTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map );
+ virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<ICPJetUncertaintiesTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , const std::string& modName , bool isLargeR = false);
StatusCode execute( const bool isLargeR, bool executeNominal );
StatusCode calibrate( const bool isLargeR );
virtual StatusCode applySystematic( ToolHandle<ICPJetUncertaintiesTool>& tool, const std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , bool isLargeR = false);
- virtual StatusCode applySystematic( ToolHandle<IJERSmearingTool>& tool, const std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map );
StatusCode printout( const bool isLargeR );
@@ -137,7 +134,6 @@ namespace top{
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolLargeR_medium;
ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolLargeR_weak;
- ToolHandle<IJERSmearingTool> m_jetJERSmearingTool;
ToolHandle<IJetUpdateJvt> m_jetUpdateJvtTool;
ToolHandle<IJetModifier> m_fjvtTool;
@@ -154,7 +150,7 @@ namespace top{
systMap m_systMap_LargeR_strong;
systMap m_systMap_LargeR_medium;
systMap m_systMap_LargeR_weak;
- systMap m_systMap_JER;
+
typedef std::unordered_map<CP::SystematicSet,CP::SystematicSet>::const_iterator Itr;
StatusCode decorateBJets(xAOD::Jet& jet);