Skip to content
Snippets Groups Projects
Commit 15d6bd36 authored by Nils Erik Krumnack's avatar Nils Erik Krumnack
Browse files

Merge branch '21.2-UFO-sys-fix' into '21.2'

Don't setup JetUncertaintiesTool for UFO jets

See merge request atlas/athena!37982
parents 4dc0c978 594ea863
No related branches found
No related tags found
15 merge requests!76035Updated rel21 number,!63304adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad),!62053Merge branch 'sh_xrd_warning' into 'master',!61521fix maxPVrefit,!59663fixed a typo in HIGG8D1 format (followup of https://gitlab.cern.ch/atlas/athena/-/merge_requests/59575),!50754Return TruthTaus from truth matching tool in SUSY tools,!48850Added new HDBS derivation (HDBS3),!46643Draft:Adding MET Significance in AT,!46320Draft: Adding support for Leading3SignalJets strategy,!45689Bug fix: Use wrong vector to calculate largest bin number in findBin(),!45211Update in the FFJetSmearingTool,!44864Draft: WIP- MuonUncorrelateSystematics,!43718Modification of EXOT17.py for fractionally charged particle search,!40581Fix crash in egamma topocluster decorator,!37982Don't setup JetUncertaintiesTool for UFO jets
......@@ -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;
}
......
......@@ -92,8 +92,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") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment