diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverxAOD.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverxAOD.cxx
index 112df142902c28398df0d02b7fd5f5e5ef466673..85d3fe26f7dd4cb3374c1469b4e394213c3f6e53 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverxAOD.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverxAOD.cxx
@@ -59,11 +59,6 @@ namespace top {
//Jets
evtStore()->event()->setAuxItemList(m_prefix + m_config->sgKeyJets() + "Aux.", "pt.eta.phi.m.btaggingLink");
- //b-tagging
- const std::string btagName = "BTagging_" + m_config->sgKeyJets().substr(0, m_config->sgKeyJets().size() - 4);
- evtStore()->event()->setAuxItemList(btagName + "Aux.", "MV1_discriminant");
-
- //MET seems to be pretty small already
}
void EventSaverxAOD::saveEvent(const top::Event& event) {
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
index 407ba89f7bf16575b800f4d2baaab9b4de789182..ac125f398c298c2040718c2ab15b9b0fbe7abb8c 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
@@ -89,11 +89,9 @@ namespace top {
top::check(setTaggerWorkingPoints("AntiKtVR30Rmax4Rmin02TrackJets", false, "DL1rmu", {"FixedCutBEff_60", "FixedCutBEff_70", "FixedCutBEff_77", "FixedCutBEff_85", "Continuous"}), "Error setting AntiKtVR30Rmax4Rmin02TrackJets WP");
- std::string caloJets_type = m_config->sgKeyJetsType();
- std::string caloJets_collection = m_config->sgKeyJets();
+ const std::string caloJets_collection = m_config->sgKeyJets();
- std::string trackJets_type = m_config->sgKeyTrackJetsType();
- std::string trackJets_collection = m_config->sgKeyTrackJets();
+ const std::string trackJets_collection = m_config->sgKeyTrackJets();
const std::string calib_file_path = PathResolverFindCalibFile(m_cdi_file);
const std::string excludedSysts = m_config->bTagSystsExcludedFromEV() == "none" ? "" : m_config->bTagSystsExcludedFromEV();
@@ -110,8 +108,8 @@ namespace top {
m_tagger = TaggerBtagWP.first;
std::string btagWP = TaggerBtagWP.second;
std::string bTagWPName = m_tagger + "_" + btagWP;
- if ((caloJets_type == "AntiKt4EMTopoJets" && std::find(m_calo_WPs.begin(), m_calo_WPs.end(), bTagWPName) == m_calo_WPs.end()) ||
- (caloJets_type == "AntiKt4EMPFlowJets" && std::find(m_pflow_WPs.begin(), m_pflow_WPs.end(), bTagWPName) == m_pflow_WPs.end())) {
+ if ((caloJets_collection == "AntiKt4EMTopoJets" && std::find(m_calo_WPs.begin(), m_calo_WPs.end(), bTagWPName) == m_calo_WPs.end()) ||
+ (caloJets_collection == "AntiKt4EMPFlowJets" && std::find(m_pflow_WPs.begin(), m_pflow_WPs.end(), bTagWPName) == m_pflow_WPs.end())) {
ATH_MSG_WARNING("top::FlavorTaggingCPTools::initialize");
ATH_MSG_WARNING(" b-tagging WP: " + bTagWPName + " not supported for jet collection " + caloJets_collection + " with algorithm " + m_tagger);
ATH_MSG_WARNING(" it will therefore be ignored");
@@ -142,8 +140,8 @@ namespace top {
m_btagging_selection_tools.push_back(btagsel);
m_config->setBTagAlgo_available(m_tagger, btagsel_tool_name);
- if ((caloJets_type == "AntiKt4EMTopoJets" && std::find(m_calo_WPs_calib.begin(), m_calo_WPs_calib.end(), bTagWPName) == m_calo_WPs_calib.end()) ||
- (caloJets_type == "AntiKt4EMPFlowJets" && std::find(m_pflow_WPs_calib.begin(), m_pflow_WPs_calib.end(), bTagWPName) == m_pflow_WPs_calib.end())) {
+ if ((caloJets_collection == "AntiKt4EMTopoJets" && std::find(m_calo_WPs_calib.begin(), m_calo_WPs_calib.end(), bTagWPName) == m_calo_WPs_calib.end()) ||
+ (caloJets_collection == "AntiKt4EMPFlowJets" && std::find(m_pflow_WPs_calib.begin(), m_pflow_WPs_calib.end(), bTagWPName) == m_pflow_WPs_calib.end())) {
ATH_MSG_WARNING("top::FlavorTaggingCPTools::initialize");
ATH_MSG_WARNING(" b-tagging WP: " + bTagWPName + " is not calibrated for jet collection " + caloJets_collection);
ATH_MSG_WARNING(" it will therefore be ignored for the scale-factors, although the tagging decisions will be saved");
@@ -159,9 +157,9 @@ namespace top {
"Failed to set b-tagging OperatingPoint");
top::check(btageff->setProperty("JetAuthor", caloJets_collection),
"Failed to set b-tagging JetAuthor");
- top::check(btageff->setProperty("MinPt",
- static_cast<double>(m_config->jetPtcut())),
- "Failed to set b-tagging selection tool MinPt");
+ top::check(btageff->setProperty("MinPt",
+ static_cast<double>(m_config->jetPtcut())),
+ "Failed to set b-tagging selection tool MinPt");
top::check(btageff->setProperty("EfficiencyFileName", calib_file_path),
"Failed to set path to b-tagging CDI file");
top::check(btageff->setProperty("ScaleFactorFileName", calib_file_path),
@@ -200,13 +198,13 @@ namespace top {
std::string bTagWPName = m_tagger + "_" + btagWP;
std::vector<std::string> track_WPs = {};
std::vector<std::string> track_WPs_calib = {};
- if (trackJets_type == "AntiKtVR30Rmax4Rmin02TrackJets") {
+ if (trackJets_collection == "AntiKtVR30Rmax4Rmin02TrackJets") {
track_WPs = m_trackAntiKtVR_WPs;
track_WPs_calib = m_trackAntiKtVR_WPs_calib;
- } else if (trackJets_type == "AntiKt2PV0TrackJets") {
+ } else if (trackJets_collection == "AntiKt2PV0TrackJets") {
track_WPs = m_trackAntiKt2_WPs;
track_WPs_calib = m_trackAntiKt2_WPs_calib;
- } else if (trackJets_type == "AntiKt4PV0TrackJets") {
+ } else if (trackJets_collection == "AntiKt4PV0TrackJets") {
track_WPs = m_trackAntiKt4_WPs;
track_WPs_calib = m_trackAntiKt4_WPs_calib;
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
index f5649401e524b1a17b54b0284028b3207bd45e8e..7209fcb505666301fd04c94fcb538ab0af2b658b 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
@@ -117,7 +117,7 @@ namespace top {
// https://twiki.cern.ch/twiki/bin/view/AtlasProtected/ApplyJetCalibrationR21
// Get jet calibration name and erase "Jets" from the end
- std::string caloJets_type = m_config->sgKeyJetsType();
+ const std::string caloJets_type = m_config->sgKeyJets();
std::string jetCalibrationName;
if (caloJets_type == "AntiKt4EMTopoNoElJets") {
jetCalibrationName = "AntiKt4EMTopoJets";
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
index 424da8400adfbb261dfb786a91e94a15bc44770f..65f7c7da4116ce27bf754c76bb872ebc35f7c194 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
@@ -156,10 +156,8 @@ namespace top {
m_sgKeySoftMuons("SetMe"),
m_sgKeyTaus("SetMe"),
m_sgKeyJets("SetMe"),
- m_sgKeyJetsType("SetMe"),
m_sgKeyLargeRJets("SetMe"),
m_sgKeyTrackJets("SetMe"),
- m_sgKeyTrackJetsType("SetMe"),
m_sgKeyMissingEt("MET"),
m_sgKeyMissingEtLoose("LooseMET"),
@@ -750,62 +748,6 @@ namespace top {
this->jetSubstructureName(settings->value("LargeJetSubstructure"));
this->decoKeyJetGhostTrack(settings->value("JetGhostTrackDecoName"));
- // check that jets use tagged collection name for new derivations
- // this is due to b-tagging breaking changes in derivations
- if (m_aodMetaData->valid()) {
- try {
- std::string deriv_rel_name = m_aodMetaData->get("/TagInfo", "AtlasRelease_AODtoDAOD");
- ATH_MSG_INFO("Checking jet collection name compatibility, reading (MetaData->TagInfo): " << deriv_rel_name);
- size_t pos = deriv_rel_name.find('-');
- if (pos != std::string::npos) {
- deriv_rel_name = deriv_rel_name.substr(pos + 1);
- int deriv_rel;
- std::sscanf(deriv_rel_name.c_str(), "21.2.%d", &deriv_rel);
- // check for derivation version due to format breakage with calo jet b-tagging
- if (deriv_rel >= 72) { // 21.2.72.0: release where we need tagged jet collection
- if (this->sgKeyJets() == this->sgKeyJetsType()) { // jet collection is NOT tagged
- throw std::runtime_error(
- "TopConfig: You are using derivation with release 21.2.72.0 or newer and did not specify tagged small-R jet collection, e.g. \"AntiKt4EMPFlowJets_BTagging201903\". This is necessary for b-tagging to work!");
- }
- } else { // release does NOT have tagged jet collection
- if (this->sgKeyJets() != this->sgKeyJetsType()) { // jet collection is NOT tagged
- throw std::runtime_error(
- "TopConfig: You are using derivation with release older than 21.2.72.0 so you cannot use tagged jet containers as you specified: \"" + this->sgKeyJets() + "\". Use \"" + this->sgKeyJetsType() +
- "\" instead.");
- }
- }
- // check for derivation version due to format breakage with track jet b-tagging
- if (this->useTrackJets()) {
- if (deriv_rel >= 87) { // 21.2.87.0: release where we need tagged track jet collection
- if (this->sgKeyTrackJets() == this->sgKeyTrackJetsType()) { // jet collection is NOT tagged
- throw std::runtime_error(
- "TopConfig: You are using derivation with release 21.2.87.0 or newer and did not specify tagged track jet collection, e.g. \"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903\". This is necessary for b-tagging to work!");
- }
- } else { // release does NOT have tagged jet collection
- if (this->sgKeyTrackJets() != this->sgKeyTrackJetsType()) { // jet collection is NOT tagged
- throw std::runtime_error(
- "TopConfig: You are using derivation with release older than 21.2.87.0 so you cannot use tagged track jet containers as you specified: \"" + this->sgKeyTrackJets() + "\". Use \"" + this->sgKeyTrackJetsType() +
- "\" instead.");
- }
- }
- }
- // check derivation version due to fJVT info needed at derivation level for PFlow
- if (this->useParticleFlowJets() && (settings->retrieve("ForwardJVTinMETCalculation") || settings->value("ForwardJVTWP") != "None")){ //fJVT requested for PFlow
- if (deriv_rel < 97) { //21.2.97.0
- throw std::runtime_error(
- "TopConfig: You are using derivation with release 21.2.96.0 or older and requested fJVT for particle-flow jets. The necessary information for PFlow fjvt is only present from release 21.2.97.0 and newer, you will need to switch to newer derivations or turn off fJVT (ForwardJVTWP = \"None\" && ForwardJVTinMETCalculation = \"False\")");
- }
- }
- } else {
- ATH_MSG_WARNING("Could not parse derivation release from the file metadata. We cannot check that correct jet and/or track jet collection is used for b-tagging, or that a new enough derivation is used for PFlow fJVT. You are on your own.");
- }
- // try to parse the derivation release, we need the release number
- } catch (std::logic_error& e) {
- ATH_MSG_WARNING(e.what());
- ATH_MSG_WARNING("Could not obtain derivation release from the file metadata. We cannot check that correct jet and/or track jet collection is used for b-tagging, or that a new enough derivation is used for PFlow fJVT. You are on your own.");
- }
- }
-
// ROOTCORE/Analysis release series
this->setReleaseSeries();
@@ -1965,16 +1907,10 @@ namespace top {
m_useJets = false;
if (s != "None") m_useJets = true;
- size_t delim_pos = s.find('_');
- // for b-tagging shallow copies, e,g.
- // AntiKt4EMPFlowJets_BTagging20181003
- // we want to have quick access to base collection name
- m_sgKeyJetsType = s.substr(0, delim_pos);
+ m_sgKeyJets = s;
// If anti-kt4 pflow jets then...
- if (m_sgKeyJetsType == "AntiKt4EMPFlowJets") m_useParticleFlowJets = true;
-
- m_sgKeyJets = s;
+ if (m_sgKeyJets == "AntiKt4EMPFlowJets") m_useParticleFlowJets = true;
}
}
@@ -1992,12 +1928,6 @@ namespace top {
m_useTrackJets = false;
if (s != "None") m_useTrackJets = true;
- size_t delim_pos = s.find('_');
- // for time-stamped track jet collections due to b-tagging
- // AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903
- // we want to have quick access to base collection name
- m_sgKeyTrackJetsType = s.substr(0, delim_pos);
-
m_sgKeyTrackJets = s;
}
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
index e9eedb97962ac98056a25fb8c0b4e660e30ea587..0c32daeb424ac32c50064d66be445809761588a9 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
@@ -564,11 +564,9 @@ namespace top {
inline virtual const std::string& sgKeySoftMuons() const {return m_sgKeySoftMuons;}
inline virtual const std::string& sgKeyTaus() const {return m_sgKeyTaus;}
inline virtual const std::string& sgKeyJets() const {return m_sgKeyJets;}
- inline virtual const std::string& sgKeyJetsType() const {return m_sgKeyJetsType;}
inline virtual const std::string& sgKeyLargeRJets() const {return m_sgKeyLargeRJets;}
inline virtual const std::string& sgKeyTrackJets() const {return m_sgKeyTrackJets;}
inline virtual const std::string& sgKeyTracks() const {return m_sgKeyTracks;}
- inline virtual const std::string& sgKeyTrackJetsType() const {return m_sgKeyTrackJetsType;}
inline virtual const std::string& sgKeyMissingEt() const {return m_sgKeyMissingEt;}
inline virtual const std::string& sgKeyMissingEtLoose() const {return m_sgKeyMissingEtLoose;}
inline const std::string& sgKeyInDetTrackParticles() const {return m_sgKeyInDetTrackParticles;}
@@ -2168,10 +2166,8 @@ namespace top {
std::string m_sgKeySoftMuons;
std::string m_sgKeyTaus;
std::string m_sgKeyJets;
- std::string m_sgKeyJetsType;
std::string m_sgKeyLargeRJets;
std::string m_sgKeyTrackJets;
- std::string m_sgKeyTrackJetsType;
std::string m_sgKeyMissingEt;
std::string m_sgKeyMissingEtLoose;
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/BTagScaleFactorCalculator.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/BTagScaleFactorCalculator.cxx
index 68374fec6a39501c74ccc6705f0110f261f8fc4d..718da6e4754b11f011fd92a7a2f4121146937194 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/BTagScaleFactorCalculator.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/BTagScaleFactorCalculator.cxx
@@ -37,10 +37,7 @@ namespace top {
m_btagSelTools[WP] = "BTaggingSelectionTool_" + WP + "_" + m_config->sgKeyJets();
top::check(m_btagSelTools[WP].retrieve(), "Failed to retrieve b-tagging Selection tool");
if (std::find(m_config->bTagWP_calibrated().begin(),
- m_config->bTagWP_calibrated().end(), WP) != m_config->bTagWP_calibrated().end()) {// need
- // scale-factors
- // only for
- // calibrated WPs
+ m_config->bTagWP_calibrated().end(), WP) != m_config->bTagWP_calibrated().end()) {// need scale-factors only for calibrated WPs
m_btagEffTools[WP] = "BTaggingEfficiencyTool_" + WP + "_" + m_config->sgKeyJets();
top::check(m_btagEffTools[WP].retrieve(), "Failed to retrieve b-tagging Efficiency tool");
m_systs[WP] = m_btagEffTools[WP]->affectingSystematics();
@@ -54,12 +51,7 @@ namespace top {
m_trkjet_btagSelTools[WP] = "BTaggingSelectionTool_" + WP + "_" + m_config->sgKeyTrackJets();
top::check(m_trkjet_btagSelTools[WP].retrieve(), "Failed to retrieve b-tagging Selection tool");
if (std::find(m_config->bTagWP_calibrated_trkJet().begin(),
- m_config->bTagWP_calibrated_trkJet().end(), WP) != m_config->bTagWP_calibrated_trkJet().end()) {// need
- // scale-factors
- // only
- // for
- // calibrated
- // WPs
+ m_config->bTagWP_calibrated_trkJet().end(), WP) != m_config->bTagWP_calibrated_trkJet().end()) {// need scale-factors only for calibrated WPs
m_trkjet_btagEffTools[WP] = "BTaggingEfficiencyTool_" + WP + "_" + m_config->sgKeyTrackJets();
top::check(m_trkjet_btagEffTools[WP].retrieve(), "Failed to retrieve b-tagging Efficiency tool");
m_trkjet_systs[WP] = m_trkjet_btagEffTools[WP]->affectingSystematics();
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopEventSelectionTools/Root/TrackJetCleaningSelector.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopEventSelectionTools/Root/TrackJetCleaningSelector.cxx
index 4b63e31ac38b2a7b5295fa1e75323cd0eb0d94a5..82a74dcae74f96bd44876d155b2c11ef65cfd9fd 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopEventSelectionTools/Root/TrackJetCleaningSelector.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopEventSelectionTools/Root/TrackJetCleaningSelector.cxx
@@ -14,7 +14,7 @@ namespace top {
bool TrackJetCleaningSelector::apply(const top::Event& event) const {
// Selection is applied only if Variable-R track jets are used
- if (m_config->sgKeyTrackJetsType() == "AntiKtVR30Rmax4Rmin02TrackJets") {
+ if (m_config->sgKeyTrackJets() == "AntiKtVR30Rmax4Rmin02TrackJets") {
static SG::AuxElement::Accessor<char> acc_passDRcut("passDRcut");
for (const xAOD::Jet* jet : event.m_trackJets) {
top::check(acc_passDRcut.isAvailable(
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
index 8f1e512d3463d3b8c6e551eb32ae81f774b6f97b..bd8121eda75253b004b4d82ed9ea00acade8623c 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
@@ -554,7 +554,7 @@ namespace top {
jetPtr->auxdecor<char>(m_passPreORSelectionLoose) = decoration;
}
- if (m_config->sgKeyTrackJetsType() == "AntiKtVR30Rmax4Rmin02TrackJets") { // Event cleaning for variable-R track jets
+ if (m_config->sgKeyTrackJets() == "AntiKtVR30Rmax4Rmin02TrackJets") { // Event cleaning for variable-R track jets
float pt_baseline = 5e3;
float radius1 = std::max(0.02, std::min(0.4, 30000. / jetPtr->pt()));
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
index 741fd788bc65b710fe5ef19323ebb5dc962473f0..bc2380ea454d25a95a24ffdc09ede30047542639 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
@@ -470,13 +470,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) {
@@ -490,13 +490,12 @@ namespace top {
// NOTE, if we use one of the b-tagging re-trained collections, we need to load
// the original uncalibrated jet container to which the b-tagging shallow-copy is pointing to
const xAOD::JetContainer* xaod_original(nullptr);
- // for small-R jet collections, set links to uncalibrated *original* jets (not BTagging shallow-copy)
- if (m_config->sgKeyJets() != m_config->sgKeyJetsType()) {
- top::check(evtStore()->retrieve(xaod_original,
- m_config->sgKeyJetsType()),
- "Failed to retrieve uncalibrated Jets for METMaker!");
- } else {
- xaod_original = xaod;
+ top::check(evtStore()->retrieve(xaod_original,
+ m_config->sgKeyJets()),
+ "Failed to retrieve uncalibrated Jets for METMaker!");
+ if (!xaod_original || !shallow_xaod_copy.first) {
+ ATH_MSG_ERROR("Cannot retrieve the original jet collection!");
+ return StatusCode::FAILURE;
}
bool setLinks = xAOD::setOriginalObjectLink(*xaod_original, *shallow_xaod_copy.first);
if (!setLinks) ATH_MSG_ERROR(" Cannot set original object links for jets, MET recalculation may struggle");
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MissingETObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MissingETObjectCollectionMaker.cxx
index 371277d200a519dce5588ee753a12ef96099358b..0848b83ad5762a367066868328f5072f2a3c9eb7 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MissingETObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MissingETObjectCollectionMaker.cxx
@@ -42,7 +42,7 @@ namespace top {
top::check(m_met_maker.retrieve(), "Failed to retrieve met maker tool");
top::check(m_met_systematics.retrieve(), "Failed to retrieve met systematic tool");
- std::string jet_collection = m_config->sgKeyJetsType();
+ std::string jet_collection = m_config->sgKeyJets();
jet_collection.erase(jet_collection.length() - 4); //erase "Jets" from jet collection name
m_MET_core = "MET_Core_" + jet_collection;
@@ -127,7 +127,7 @@ namespace top {
const std::string& outputContainerSuffix) {
// decoration for objects that pass pre OR selection
std::string passPreORSelection = "passPreORSelection";
- const std::string jet_collection = m_config->sgKeyJetsType();
+ const std::string jet_collection = m_config->sgKeyJets();
const bool is_loose_event = (event->isLooseEvent() == 1 ? true : false);