From b2be19fdf55419f9365ca7ef704eaf8b93417730 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Thu, 17 Dec 2020 10:03:48 +0100
Subject: [PATCH] Fixed the build of JetRecAlg in AthAnalysis.
---
Reconstruction/Jet/JetRec/src/JetRecAlg.cxx | 11 +++++------
Reconstruction/Jet/JetRec/src/JetRecAlg.h | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
index fba500de2eb..cf721e0d7db 100644
--- a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
+++ b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
@@ -3,14 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// JetRecAlg.cxx
+// JetRecAlg.cxx
#include <memory>
#include "JetRecAlg.h"
#include "JetInterface/IJetExecuteTool.h"
#include "xAODJet/JetAuxContainer.h"
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
#include "AthenaMonitoringKernel/Monitored.h"
#endif
@@ -28,7 +28,7 @@ StatusCode JetRecAlg::initialize() {
ATH_CHECK(m_jetprovider->initWithOutput(m_output));
ATH_MSG_INFO(" Initialized IJetProvider : "<< m_jetprovider->name());
-
+
ATH_MSG_INFO(" Initialize .... List of modifiers: ");
ATH_CHECK(m_modifiers.retrieve());
for(ToolHandle<IJetModifier> t : m_modifiers){
@@ -37,7 +37,7 @@ StatusCode JetRecAlg::initialize() {
ATH_CHECK(m_output.initialize());
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
#endif
@@ -60,7 +60,7 @@ StatusCode JetRecAlg::execute(const EventContext& ctx) const {
// We can subsequently access the jets from the handle and don't have to
// worry about memory management.
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
auto t_total = Monitored::Timer<std::chrono::milliseconds>( "TIME_total" );
SG::WriteHandle<xAOD::JetContainer> jetContHandle(m_output,ctx);
@@ -117,4 +117,3 @@ StatusCode JetRecAlg::execute(const EventContext& ctx) const {
}
//**********************************************************************
-
diff --git a/Reconstruction/Jet/JetRec/src/JetRecAlg.h b/Reconstruction/Jet/JetRec/src/JetRecAlg.h
index 80e5229ba37..acfb4ed1a26 100644
--- a/Reconstruction/Jet/JetRec/src/JetRecAlg.h
+++ b/Reconstruction/Jet/JetRec/src/JetRecAlg.h
@@ -4,7 +4,7 @@
*/
////////////////////////////////////////////////////
-/// \class JetRecAlg
+/// \class JetRecAlg
///
/// Algorithm tasked to create a single JetContainer
/// This algorithm makes use of 2 types of tools :
@@ -29,9 +29,9 @@
class IJetExecuteTool;
-class JetRecAlg : public AthReentrantAlgorithm {
+class JetRecAlg : public AthReentrantAlgorithm {
-public:
+public:
using AthReentrantAlgorithm::AthReentrantAlgorithm;
@@ -46,11 +46,10 @@ private:
ToolHandle<IJetProvider> m_jetprovider ={this , "Provider" , {} , "Tool providing the jets (fastjet, copy, grooming...)"};
ToolHandleArray<IJetModifier> m_modifiers = {this , "Modifiers", {}, "moment calculators" };
SG::WriteHandleKey<xAOD::JetContainer> m_output= {this, "OutputContainer", "AntiKt4LCtopoJets", "The output jet container name"};
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
#endif
-};
+};
#endif
-
--
GitLab