From af4f1f83030cec922cc3aa0446715851e8caa7df Mon Sep 17 00:00:00 2001
From: Tomas Dado <tomas.dado@cern.ch>
Date: Thu, 19 Nov 2020 13:22:41 +0100
Subject: [PATCH] AnalysisTop: Fixing setup of FTag and JetMET tools

---
 .../TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx  | 4 ++--
 .../TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
index ac125f398c2..5619ff6cd05 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopFlavorTaggingCPTools.cxx
@@ -122,7 +122,7 @@ namespace top {
         BTaggingSelectionTool* btagsel = new BTaggingSelectionTool(btagsel_tool_name);
         top::check(btagsel->setProperty("TaggerName", m_tagger),
                    "Failed to set b-tagging selecton tool TaggerName");
-        top::check(btagsel->setProperty("JetAuthor", caloJets_collection),
+        top::check(btagsel->setProperty("JetAuthor", caloJets_collection+"_BTagging201903"),
                    "Failed to set b-tagging selection JetAuthor");
         top::check(btagsel->setProperty("FlvTagCutDefinitionsFileName",
                                         m_cdi_file),
@@ -155,7 +155,7 @@ namespace top {
                      "Failed to set b-tagging TaggerName");
           top::check(btageff->setProperty("OperatingPoint", btagWP),
                      "Failed to set b-tagging OperatingPoint");
-          top::check(btageff->setProperty("JetAuthor", caloJets_collection),
+          top::check(btageff->setProperty("JetAuthor", caloJets_collection+"_BTagging201903"),
                      "Failed to set b-tagging JetAuthor");
           top::check(btageff->setProperty("MinPt",
                                           static_cast<double>(m_config->jetPtcut())),
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
index 7209fcb5056..437cd269e6e 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
@@ -201,6 +201,8 @@ namespace top {
       IJetUpdateJvt* jetUpdateJvtTool = new JetVertexTaggerTool(jvt_update_name);
       top::check(asg::setProperty(jetUpdateJvtTool, "JVTFileName", "JetMomentTools/" + m_jetJVT_ConfigFile),
                  "Failed to set JVTFileName for JetUpdateJvtTool");
+      top::check(asg::setProperty(jetUpdateJvtTool, "JetContainer", m_config->sgKeyJets()),
+                 "Failed to set JetContainer for JetUpdateJvtTool");
       top::check(jetUpdateJvtTool->initialize(), "Failed to initialize");
       m_jetUpdateJvtTool = jetUpdateJvtTool;
     }
-- 
GitLab