Commit dbe8eb61 authored by Nils Erik Krumnack's avatar Nils Erik Krumnack Committed by Atlas Nightlybuild
Browse files

Merge branch '21.2-UFO-AT' into '21.2'

Add MC calibration config files for new UFO large-R jet collection

See merge request atlas/athena!37849

(cherry picked from commit ebbd8a2d)

d80f85df Adding new UFO SD MC-based calibration
parent 9b5a4109
Pipeline #2063816 passed with stage
in 0 seconds
......@@ -382,9 +382,11 @@ namespace top {
calibConfigLargeR = "JES_MC16recommendation_FatJet_Trimmed_JMS_calo_12Oct2018.config";
} else if (calibChoice == "TCCMass") {
calibConfigLargeR = "JES_MC16recommendation_FatJet_TCC_JMS_calo_30Oct2018.config";
} else if (calibChoice == "UFOSDMass") {
calibConfigLargeR = "JES_MC16recommendation_R10_UFO_CSSK_SoftDrop_JMS_01April2020.config";
} else {
ATH_MSG_ERROR(
"Unknown largeRJESJMSConfig (Available options: TAMass, CaloMass, CombMass and TCCMass)) : " + calibChoice);
"Unknown largeRJESJMSConfig (Available options: TAMass, CaloMass, CombMass, TCCMass and UFOSDMass)) : " + calibChoice);
return StatusCode::FAILURE;
}
} else { //Insitu calibration for Data
......@@ -394,15 +396,19 @@ namespace top {
} else if (calibChoice == "TCCMass") {
calibConfigLargeR = "JES_MC16recommendation_FatJet_TCC_JMS_calo_30Oct2018.config"; //There's no insitu
// calibration yet
} else {
} else if (calibChoice == "UFOSDMass") {
calibConfigLargeR = "JES_MC16recommendation_R10_UFO_CSSK_SoftDrop_JMS_01April2020.config"; //There's no insitu
// calibration yet
} else {
ATH_MSG_ERROR(
"Unknown largeRJESJMSConfig (Available options: TAMass, CaloMass, CombMass and TCCMass) : " + calibChoice);
"Unknown largeRJESJMSConfig (Available options: TAMass, CaloMass, CombMass, TCCMass and UFOSDMass) : " + calibChoice);
return StatusCode::FAILURE;
}
}
std::string calibSequenceLargeR = "EtaJES_JMS";
if ((!m_config->isMC()) &&
(calibChoice != "TCCMass")) calibSequenceLargeR = "EtaJES_JMS_Insitu_InsituCombinedMass"; //For data, there's
(calibChoice != "TCCMass") &&
(calibChoice != "UFOSDMass")) calibSequenceLargeR = "EtaJES_JMS_Insitu_InsituCombinedMass"; //For data, there's
// is insitu
// calibration for
// lc-topo jets
......
......@@ -221,7 +221,7 @@ namespace top {
"Path to directory containing large-R jet uncertainties config",
"rel21/Summer2019");
registerParameter("LargeRJESJMSConfig",
"Calibration for large-R JES/JMS. CombMass, CaloMass or TCCMass (default CombMass).",
"Calibration for large-R JES/JMS. CombMass, CaloMass, TCCMass or UFOSDMass (default CombMass).",
"CombMass");
registerParameter("BoostedJetTagging",
"Boosted jet taggers to use in the analysis, separated by commas or white spaces."
......
......@@ -221,7 +221,7 @@ namespace top {
largeRsysts.insert(m_jetUncertaintiesToolLargeR->recommendedSystematics());
} else {
ATH_MSG_WARNING(
"TA Mass & Calo Mass are not supported for large-R jet uncertainties at the moment. Large-R jet systemtatics skipped!");
"TA Mass & Calo Mass & UFO SD Mass are not supported for large-R jet uncertainties at the moment. Large-R jet systemtatics skipped!");
}
}
......
Supports Markdown
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