diff --git a/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h b/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
index d4859d19c71fbb59c0fdaf9aea666fc030962c0b..3bc7a103484cc5beab572ce3b6a98bf0c7da437d 100644
--- a/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
+++ b/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
@@ -42,7 +42,7 @@ namespace MyAnalysisCal {
/** standard Athena-Algorithm method */
virtual StatusCode initialize() override;
/** standard Athena-Algorithm method */
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
/** standard Athena-Algorithm method */
virtual StatusCode finalize() override;
private:
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
index 4e2bc56114e690e124ae5daf5922b6c0b018fdec..67ada897510eb13c89f673d6ccd0032acc73f7f1 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
@@ -51,7 +51,7 @@ namespace MyAnalysisCal {
}
//__________________________________________________________________________
- StatusCode AnalysisCal::execute_r (const EventContext& ctx) const
+ StatusCode AnalysisCal::execute (const EventContext& ctx) const
{
//.............................................
diff --git a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
index d16e950c9d8dd98c284c76b0d855403fdf5f1fb9..89ff976865d123415a87f8ca7a2bfc7e99409e1b 100644
--- a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
+++ b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
@@ -43,7 +43,7 @@ StatusCode do_declare (ToolWithConstantsMixin* self,
if (AlgTool* x = dynamic_cast<AlgTool*> (self)) {
x->declareProperty (name, c);
return StatusCode::SUCCESS;
- } else if (Algorithm* x = dynamic_cast<Algorithm*> (self)) {
+ } else if (Gaudi::Algorithm* x = dynamic_cast<Gaudi::Algorithm*> (self)) {
x->declareProperty (name, c);
return StatusCode::SUCCESS;
} else if (Service* x = dynamic_cast<Service*> (self)) {
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
index a0f324f807e5dbca47dda582943a190be08831b6..eb23fe09a2cbfc55733b2fb9af804082b05b4735 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
@@ -46,7 +46,7 @@ StatusCode CaloBCIDAvgAlg::finalize() {
//----------------------------------------------------------------------------------------
-StatusCode CaloBCIDAvgAlg::execute_r(const EventContext& ctx) const {
+StatusCode CaloBCIDAvgAlg::execute(const EventContext& ctx) const {
SG::ReadHandle<xAOD::EventInfo> ei(m_eventInfoKey,ctx);
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
index c53fa6597c6ac67f86548cad93dfc456cbf8fe64..72f5c9879664d8cfd513a2589a2daa739b0c5baa 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
@@ -28,7 +28,7 @@ public:
// Algorithm virtual methods
StatusCode initialize();
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
StatusCode finalize();
private:
diff --git a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
index 40e8eb77cc63b690f5c1622edec6f5c09c21b234..fe06a71efa812817e3e571ecda1e18c4a1349f25 100644
--- a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
+++ b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
@@ -80,7 +80,7 @@ StatusCode CaloCell2ClusterMapper::finalize()
//###############################################################################
-StatusCode CaloCell2ClusterMapper::execute_r(const EventContext& ctx) const {
+StatusCode CaloCell2ClusterMapper::execute(const EventContext& ctx) const {
// make a DataVector of Navigable CaloClusterContainer
ATH_MSG_DEBUG(" Recording Cell2Cluster Map " << m_mapOutputKey.key());
diff --git a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
index 6f497d6d699c066fb0c94f6e7adc9a2188e7850f..db39d8be16d68757fb2afba4fa814b8a5344ac93 100644
--- a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
+++ b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
@@ -35,7 +35,7 @@ class CaloCell2ClusterMapper : public AthReentrantAlgorithm
CaloCell2ClusterMapper(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~CaloCell2ClusterMapper();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
index 20b364f66b7c34e5bf5d8a4783e02bdbe674fba9..8819e2a15f6d96f56cab73e70adeb77e6f72c11f 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
@@ -132,7 +132,7 @@ StatusCode CaloClusterMaker::finalize() {
//###############################################################################
-StatusCode CaloClusterMaker::execute_r (const EventContext& ctx) const
+StatusCode CaloClusterMaker::execute (const EventContext& ctx) const
{
// make a Cluster Container
diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.h b/Calorimeter/CaloRec/src/CaloClusterMaker.h
index b490c417a485bd706d42645a3ec90f36687524d9..05c8fd631d244b2f14e05df08f634fa3c183b99c 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMaker.h
+++ b/Calorimeter/CaloRec/src/CaloClusterMaker.h
@@ -40,7 +40,7 @@ class CaloClusterMaker : public AthReentrantAlgorithm
CaloClusterMaker(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~CaloClusterMaker() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
virtual StatusCode finalize() override;
const std::string& getOutputContainerName() const;
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
index e68e0b1e2e90972ca75e17592da2b4055e338983..55afed800e3f0aa001438dafcbf846ce34bd6061 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
@@ -152,7 +152,7 @@ StatusCode CaloTopoTowerAlg::initialize()
///==============================================
/// EXECUTE
///==============================================
-StatusCode CaloTopoTowerAlg::execute_r (const EventContext& ctx) const
+StatusCode CaloTopoTowerAlg::execute (const EventContext& ctx) const
{
/// Say hello
ATH_MSG_DEBUG( "In CaloTopoTowerAlg::execute()" );
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
index 0aaac831cef67c923888796e55e31cafac5c7c64..fb65ce621da926b93d8ef05d3c634aa6a2807041 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
@@ -61,7 +61,7 @@ class CaloTopoTowerAlg : public AthReentrantAlgorithm
virtual StatusCode finalize() override;
/// Execute
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
// Container name strings
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index e652ebfc2526aa98608272474c54a26a39614fb2..6581b2a8cb6bcc573c8e61bfc07339ee62708d9a 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -206,7 +206,7 @@ StatusCode CaloTopoTowerAlgorithm::initialize()
// Execute //
/////////////
-StatusCode CaloTopoTowerAlgorithm::execute_r (const EventContext& ctx) const
+StatusCode CaloTopoTowerAlgorithm::execute (const EventContext& ctx) const
{
//////////////////////////
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
index bd46bd5fe1627bffffb11289fc115ed7f3067009..24c6f06327fc461fdd21fdaa3367144a876c6215 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
@@ -50,7 +50,7 @@ class CaloTopoTowerAlgorithm : public AthReentrantAlgorithm
/// inherited from Algorithm
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
index 0f477e0c074b125e4ba04304466a191db3ca73ee..0ba432ed5354fe4d4b6425f7e1fd8b6cb070103f 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
@@ -114,7 +114,7 @@ StatusCode CaloTowerAlgorithm::initialize()
// Execute //
/////////////
-StatusCode CaloTowerAlgorithm::execute_r (const EventContext& ctx) const
+StatusCode CaloTowerAlgorithm::execute (const EventContext& ctx) const
{
//////////////////////////
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
index a3142cbd5e4ab55a0c4711166c87a6500fb57dd3..a642742773cdc07b9c5adae5991baa3c6a119653 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
@@ -46,7 +46,7 @@ class CaloTowerAlgorithm: public AthReentrantAlgorithm {
/// inherited from Algorithm
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
index c57a41e3c2dbd94eaa265a0ef2bd100c67115a3e..260a909d009f7d6a8cb60d8a63b0eb222355ea75 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
@@ -45,7 +45,7 @@ StatusCode CaloTowerxAODFromCells::initialize() {
return initBase();
}
-StatusCode CaloTowerxAODFromCells::execute_r(const EventContext& ctx) const
+StatusCode CaloTowerxAODFromCells::execute(const EventContext& ctx) const
{
SG::ReadHandle<CaloCellContainer> inputCellContainer(m_inputCellContainerKey, ctx);
if (!inputCellContainer.isValid()) {
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
index 4810f17ab2fe1130b46d7397bc7191f09b169f0f..d2bf214acad8ca0fecf8aac9d0b12bf994d26d0c 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
@@ -33,7 +33,7 @@ public:
/// @name @c AthAlgorithm interface implementation
/// @{
virtual StatusCode initialize() override; ///< @brief Initialize algorithm
- virtual StatusCode execute_r(const EventContext& ctx) const override; ///< @brief Execute algorithm
+ virtual StatusCode execute(const EventContext& ctx) const override; ///< @brief Execute algorithm
virtual StatusCode finalize() override; ///< @brief Finalize algorithm
/// @}
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
index 7236142f1827ded242119e816eab444728db4aa4..358b544b3c5f2d6842d1ef4144aa67e50676176f 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
@@ -30,7 +30,7 @@ StatusCode CaloTowerxAODFromClusters::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode CaloTowerxAODFromClusters::execute_r(const EventContext& ctx) const
+StatusCode CaloTowerxAODFromClusters::execute(const EventContext& ctx) const
{
SG::ReadHandle<xAOD::CaloClusterContainer> inputClusterContainer(m_inputClusterContainerKey, ctx);
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
index 6b4b24b3a19c98385f0eae4bcf5d47bd4b0b7c08..63ae13ce993d41ce8f221a8b2f20184ec70441f4 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
@@ -27,7 +27,7 @@ public:
/// @name @c AthAlgorithm interface implementation
/// @{
virtual StatusCode initialize() override; ///< @brief Initialize algorithm
- virtual StatusCode execute_r(const EventContext&) const override; ///< @brief Execute algorithm
+ virtual StatusCode execute(const EventContext&) const override; ///< @brief Execute algorithm
virtual StatusCode finalize() override; ///< @brief Finalize algorithm
/// @}
diff --git a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
index d093358143300860f9002bf387aae23c4eb3458b..17e9fae866938a25ff165c2002677269538ec983 100755
--- a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
+++ b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
@@ -75,7 +75,7 @@ ToolWithConstantsMixin::finish_ctor (const std::string& toolcls /*= ""*/)
if (m_toolcls.empty())
m_toolcls = thistool->type();
}
- else if (Algorithm* thisalg = dynamic_cast<Algorithm*> (this)) {
+ else if (Gaudi::Algorithm* thisalg = dynamic_cast<Gaudi::Algorithm*> (this)) {
thisalg->declareProperty ("detStoreKey", m_detStoreKey);
thisalg->declareProperty ("prefix", m_prefix);
thisalg->declareProperty ("useCallback", m_use_callback);
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
index d05f7fc57052c8fcf1d3e1effb0044adb0b22b07..128ed9f575b6bd78d1bc1ef544f63f5aec918a1f 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
@@ -119,7 +119,7 @@ public:
///setProperty on an alg, even when initialized
template<typename W> static StatusCode setProperty(IAlgorithm* alg, const std::string& property, const W& value) {
- Algorithm* theAlg = dynamic_cast<Algorithm*>(alg);
+ Gaudi::Algorithm* theAlg = dynamic_cast<Gaudi::Algorithm*>(alg);
if(!theAlg) {
std::cout << "ERROR: alg is not an Algorithm. Cannot AthAnalysisHelper::setProperty on it" << std::endl;
return StatusCode::FAILURE;
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h b/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h
new file mode 100644
index 0000000000000000000000000000000000000000..4745fe0a44a6d5e8a7a3d21e2e99f5cb2f982945
--- /dev/null
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+// AthLegacySequence.h
+// Header file for class AthLegacySequence
+///////////////////////////////////////////////////////////////////
+#ifndef ATHENABASECOMPS_ATHLEGACYEQUENCE_H
+#define ATHENABASECOMPS_ATHLEGACYEQUENCE_H 1
+
+#pragma once
+
+
+// Framework includes
+#include "AthenaBaseComps/AthCommonDataStore.h"
+#include "AthenaBaseComps/AthCommonMsg.h"
+#include "Gaudi/Sequence.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+
+namespace Athena {
+ namespace details {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+ class AthLegacySequenceAdapter
+ : public AthCommonDataStore<AthCommonMsg< Gaudi::Sequence >>
+ {
+ public:
+
+ /// Constructor with parameters:
+ AthLegacySequenceAdapter(const std::string& name,
+ ISvcLocator* pSvcLocator);
+
+ virtual StatusCode execute() = 0;
+
+ const EventContext& getContext() const { return Gaudi::Hive::currentContext(); }
+
+ virtual const DataObjIDColl& extraOutputDeps() const override;
+
+ protected:
+ bool isReEntrant() const override final { return false; }
+
+ private:
+ StatusCode execute( const EventContext& ) const override final
+ {
+ return const_cast<AthLegacySequenceAdapter*>( this )->execute();
+ }
+
+ DataObjIDColl m_extendedExtraObjects;
+
+ };
+#pragma GCC diagnostic pop
+ }
+}
+
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+/// Alias for backward compatibility
+class AthLegacySequence : public Athena::details::AthLegacySequenceAdapter
+{
+public:
+ using Athena::details::AthLegacySequenceAdapter::AthLegacySequenceAdapter;
+ // this is to explicitly hide the other signature of `execute`
+ StatusCode execute() override = 0;
+};
+#pragma GCC diagnostic pop
+
+
+#endif //> !ATHENABASECOMPS_ATHLEGACYSEQUENCE_H
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
index 4472d43ea233388abae444a7f4ea4a5ce24141a4..65b21b18b6a7d4eb6ddb76f20bda70d31b0bda25 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
@@ -22,13 +22,7 @@
#include "AthenaBaseComps/AthMemMacros.h"
-// Framework includes
-#ifndef REENTRANT_GAUDI
- #define ReEntAlgorithm Algorithm
- #include "GaudiKernel/Algorithm.h"
-#else
- #include "GaudiKernel/ReEntAlgorithm.h"
-#endif
+#include "Gaudi/Algorithm.h"
/**
@@ -40,19 +34,19 @@
* derives from @c AthReentrantAlgorithm, then the same algorithm object may
* be used in multiple threads without cloning.
*
- * Rather than @c execute, a reentrant algorithm will call @c execute_r,
- * which has two differences. First, @c execute_r is @c const. If the
+ * Rather than @c execute, a reentrant algorithm will call @c execute,
+ * which has two differences. First, @c execute is @c const. If the
* same object is being used in multiple threads, it should not have any
* state which is being changed. Any attempt to get around this with
* @c mutable or @c const_cast should be viewed with great suspicion:
* that may not be thread-safe.
*
- * Second, the @c execute_r method takes an explicit event context argument.
+ * Second, the @c execute method takes an explicit event context argument.
* This may be used to find the proper store for the event being processed
* by the current thread.
*
* The typical usage will be to declare a key object as a property of the
- * algorithm and then construct a transient handle instance during @c execute_r
+ * algorithm and then construct a transient handle instance during @c execute
* from the key and the event context. For example:
*
*@code
@@ -74,7 +68,7 @@
* return StatusCode::SUCCESS;
* }
*
- * StatusCode MyAlg::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlg::execute (const EventContext& ctx) const
* {
* SG::ReadHandle<MyObj> myobj (m_rhandle, ctx);
* const MyObj& p = *myobj;
@@ -85,7 +79,7 @@
class AthReentrantAlgorithm
- : public AthCommonDataStore<AthCommonMsg<ReEntAlgorithm>>
+ : public AthCommonDataStore<AthCommonMsg<Gaudi::Algorithm>>
{
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -102,27 +96,6 @@ class AthReentrantAlgorithm
/// Destructor:
virtual ~AthReentrantAlgorithm() override;
-
-#ifndef REENTRANT_GAUDI
- /**
- * @brief Standard Gaudi execute method.
- *
- * This cannot be overridden; you should override the reentrant method
- * @c execute_r instead.
- */
- virtual StatusCode execute() override final;
-
-
- /**
- * @brief Reentrant execute method.
- * @param ctx The current event context.
- *
- * Override this for your algorithm.
- */
- virtual StatusCode execute_r (const EventContext& ctx) const = 0;
-#endif
-
-
/** Specify if the algorithm is clonable
*
* Reentrant algorithms are clonable.
@@ -137,16 +110,6 @@ class AthReentrantAlgorithm
virtual unsigned int cardinality() const override;
- /**
- * @brief Return the current event context.
- *
- * Override this because the base class version won't work correctly
- * for reentrant algorithms. (We shouldn't really be using this
- * for reentrant algorithms, but just in case.).
- */
- virtual const EventContext& getContext() const override;
-
-
/**
* @brief Execute an algorithm.
*
@@ -156,7 +119,6 @@ class AthReentrantAlgorithm
*/
virtual StatusCode sysExecute (const EventContext& ctx) override;
-
/**
* @brief Return the list of extra output dependencies.
diff --git a/Control/AthenaBaseComps/src/AthLegacySequence.cxx b/Control/AthenaBaseComps/src/AthLegacySequence.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..eaea8b72b8bb90f7dba8d67a0a03e512e672f542
--- /dev/null
+++ b/Control/AthenaBaseComps/src/AthLegacySequence.cxx
@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+// AthenaBaseComps includes
+#include "AthenaBaseComps/AthLegacySequence.h"
+#include "AthAlgorithmDHUpdate.h"
+
+
+namespace Athena {
+ namespace details {
+ AthLegacySequenceAdapter::AthLegacySequenceAdapter(const std::string& name,
+ ISvcLocator* pSvcLocator):
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>> ( name, pSvcLocator)
+ {
+ setProperty("Cardinality", 1);
+ m_updateDataHandles =
+ std::make_unique<AthenaBaseComps::AthAlgorithmDHUpdate>
+ (m_extendedExtraObjects,
+ std::move (m_updateDataHandles));
+ }
+
+
+ const DataObjIDColl&
+ AthLegacySequenceAdapter::extraOutputDeps() const {
+ if (!m_extendedExtraObjects.empty()) {
+ return m_extendedExtraObjects;
+ }
+ return Gaudi::Sequence::extraOutputDeps();
+ }
+ }
+
+}
diff --git a/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx b/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
index f60c8cd210d2b3b173ad7d6e60632e70ec7c5963..d958beeb8caf6008f0b5e31b8e9853724becbd87 100644
--- a/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
@@ -19,7 +19,7 @@
AthReentrantAlgorithm::AthReentrantAlgorithm( const std::string& name,
ISvcLocator* pSvcLocator,
const std::string& version ) :
- ::AthCommonDataStore<AthCommonMsg<ReEntAlgorithm>> ( name, pSvcLocator, version )
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Algorithm>> ( name, pSvcLocator, version )
{
// Set up to run AthAlgorithmDHUpdate in sysInitialize before
@@ -38,19 +38,6 @@ AthReentrantAlgorithm::~AthReentrantAlgorithm()
ATH_MSG_DEBUG ("Calling destructor");
}
-#ifndef REENTRANT_GAUDI
-/**
- * @brief Standard Gaudi execute method.
- *
- * Find the event context and call @c execute_r.
- */
-StatusCode AthReentrantAlgorithm::execute()
-{
- return execute_r (Gaudi::Hive::currentContext());
-}
-#endif
-
-
/** Specify if the algorithm is clonable
*/
bool AthReentrantAlgorithm::isClonable() const
@@ -69,18 +56,6 @@ unsigned int AthReentrantAlgorithm::cardinality() const
return 0;
}
-/**
- * @brief Return the current event context.
- *
- * Override this because the base class version won't work correctly
- * for reentrant algorithms. (We shouldn't really be using this
- * for reentrant algorithms, but just in case.).
- */
-const EventContext& AthReentrantAlgorithm::getContext() const
-{
- return Gaudi::Hive::currentContext();
-}
-
/**
* @brief Execute an algorithm.
*
@@ -90,23 +65,7 @@ const EventContext& AthReentrantAlgorithm::getContext() const
*/
StatusCode AthReentrantAlgorithm::sysExecute (const EventContext& ctx)
{
- EventContext ctx2 = ctx;
- // sysExecute will assign the context we pass in to a member variable of
- // the algorithm. If the context is referencing any dynamic memory,
- // then we can end up with a double-delete. So clear out any extension ---
- // we won't actually use the context we pass to here for anything anyway.
-
- if (ctx.hasExtension<Atlas::ExtendedEventContext>()) {
- ctx2.setExtension( Atlas::ExtendedEventContext() );
- } else if (ctx.hasExtension()) {
- ATH_MSG_ERROR("EventContext " << ctx
- << " has an extended context of an unknown type: \""
- << System::typeinfoName( ctx.getExtensionType() )
- << "\". Can't progress.");
- return StatusCode::FAILURE;
- }
-
- return ::ReEntAlgorithm::sysExecute (ctx2);
+ return Gaudi::Algorithm::sysExecute (ctx);
}
diff --git a/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx b/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
index 31df7275dcf8acebb57a183cea503c3e2d85348a..93babbcf671b78f7d0ea8b541224f9cea647540b 100644
--- a/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
+++ b/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
@@ -45,7 +45,7 @@ public:
MyAlg (const std::string& name, ISvcLocator* svcLoc);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual void declare(Gaudi::DataHandle& hnd) override;
virtual void addDependency (const DataObjID& obj, const Gaudi::DataHandle::Mode& mode) override;
@@ -83,7 +83,7 @@ StatusCode MyAlg::initialize()
}
-StatusCode MyAlg::execute_r (const EventContext& ctx) const
+StatusCode MyAlg::execute (const EventContext& ctx) const
{
pdict = ctx.getExtension<Atlas::ExtendedEventContext>().proxy();
return StatusCode::SUCCESS;
@@ -171,7 +171,7 @@ void test1 (ISvcLocator* svcLoc)
Gaudi::Hive::setCurrentContext (ctx);
- assert (alg.execute().isSuccess());
+ assert (alg.execute( ctx ).isSuccess());
assert (pdict == xdict);
DataObjIDColl exp = {
@@ -193,7 +193,7 @@ class MyArrAlg : public AthReentrantAlgorithm
public:
MyArrAlg (const std::string& name, ISvcLocator* svcLoc);
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
SG::ReadHandleKey<MyObj> rkey;
SG::WriteHandleKey<MyObj> wkey;
@@ -215,7 +215,7 @@ MyArrAlg::MyArrAlg (const std::string& name, ISvcLocator* svcLoc)
}
-StatusCode MyArrAlg::execute_r (const EventContext& /*ctx*/) const
+StatusCode MyArrAlg::execute (const EventContext& /*ctx*/) const
{
return StatusCode::SUCCESS;
}
diff --git a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
index 07cd88c2a673c0e00a4bf2823b4404fcd5c28c17..c7db4954c3321d2564286a211f56d860ca5d84b3 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
@@ -46,7 +46,7 @@ namespace Athena_test {
IAlgorithm* ialg= Algorithm::Factory::create( "MyPackageAlg",
"MyPackageAlg",
Gaudi::svcLocator() ).release();
- myAlg= dynamic_cast<Algorithm*>( ialg );
+ myAlg= dynamic_cast<Gaudi::Algorithm*>( ialg );
}
@@ -64,7 +64,7 @@ namespace Athena_test {
return std::stoi( prop );
}
- Algorithm* myAlg;
+ Gaudi::Algorithm* myAlg;
};
diff --git a/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx b/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
index e433a9bce04ca2b71b5b957d2dfbf538f623e71b..5d87ca857cb520474ae949c97cbdc073e0908e48 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
@@ -38,7 +38,7 @@ StatusCode HiveAlgR::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode HiveAlgR::execute_r(const EventContext& ctx) const {
+StatusCode HiveAlgR::execute(const EventContext& ctx) const {
info() << "execute_R: " << index() << " on " << ctx << endmsg;
diff --git a/Control/AthenaExamples/AthExHive/src/HiveAlgR.h b/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
index a7bcfbd16b6c8f32bbb8ff4235f8d495e9619b40..7be555e7b9ec98bf1e21a7a93691035d3e11ccd9 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
+++ b/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
@@ -24,7 +24,7 @@ public:
// Define the initialize, execute and finalize methods:
StatusCode initialize();
- StatusCode execute_r(const EventContext&) const;
+ StatusCode execute(const EventContext&) const;
StatusCode finalize();
private:
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
index 9d63867debb7b093ab8d40d745fea1a9db07d035..ddc3bc4496cfa4603664856f8f093a929ab9a1a4 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
@@ -33,7 +33,7 @@ StatusCode ExampleAlg::initialize()
}
-StatusCode ExampleAlg::execute_r (const EventContext& ctx) const
+StatusCode ExampleAlg::execute (const EventContext& ctx) const
{
// Construct handles from the keys.
// Since this is a reentrant algorithm, we have an explicit event context,
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
index de06b3e3853c1f9deffbae58deca58eb0fd1e87b..22d6b4708c971347bc84b958d14ca1e057d1dc56 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
@@ -29,7 +29,7 @@ class ExampleAlg
public:
ExampleAlg (const std::string& name, ISvcLocator* svcLocator);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
// Declare the keys used to access the data: one for reading and one
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
index fcfe02f317d15ddc2d5a3d3b597aa90783b31c7a..ba8920403c5b0f9b27f671b88abd259b5f2962a5 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
@@ -69,7 +69,7 @@ StatusCode ReadDataReentrant::initialize()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode ReadDataReentrant::execute_r (const EventContext& ctx) const
+StatusCode ReadDataReentrant::execute (const EventContext& ctx) const
{
// An algorithm, like this one, retrieving an object from the StoreGate(SG)
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
index d2f0fd136ecea6c64597813841d440962ddaaef7..93c54318dd3b2b153822bbf834e05b30a1e9d0db 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
@@ -31,7 +31,7 @@ class ReadDataReentrant
public:
ReadDataReentrant (const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override final;
- virtual StatusCode execute_r (const EventContext& ctx) const override final;
+ virtual StatusCode execute (const EventContext& ctx) const override final;
virtual StatusCode finalize() override final;
private:
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
index 842a29da1d4772d80a3d4609178f62fd91bb4079..8ad1cc179eb586babe8f9a1107495fabaabd080a 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
@@ -78,7 +78,7 @@ StatusCode WriteDataReentrant::initialize()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode WriteDataReentrant::execute_r (const EventContext& ctx) const
+StatusCode WriteDataReentrant::execute (const EventContext& ctx) const
{
//this example illustrates how to record objects into the StoreGate(SG)
//with and without providing a key
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
index 67221fa97b4c668f2ab13384e331931e8506ab09..7db055a45b86a90b2424f8040fd43be873962c04 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
@@ -32,7 +32,7 @@ public:
WriteDataReentrant (const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
- virtual StatusCode execute_r (const EventContext& ctx) const override final;
+ virtual StatusCode execute (const EventContext& ctx) const override final;
private:
SG::WriteHandleKey<MyDataObj> m_dobjKey;
diff --git a/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx b/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
index 5c656b82bf448beb78b46c75f4e40f09c47f32d0..e890dcb1be6886bc2e332005ede7337e92203419 100644
--- a/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
+++ b/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
@@ -46,7 +46,7 @@ namespace Athena_test {
IAlgorithm* ialg= Algorithm::Factory::create( "AthExUnittestAlg",
"AthExUnittestAlg",
Gaudi::svcLocator() ).release();
- myAlg= dynamic_cast<Algorithm*>( ialg );
+ myAlg= dynamic_cast<Gaudi::Algorithm*>( ialg );
}
@@ -64,7 +64,7 @@ namespace Athena_test {
return std::stoi( prop );
}
- Algorithm* myAlg = nullptr;
+ Gaudi::Algorithm* myAlg = nullptr;
};
diff --git a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
index 0d1ddeec4ff0a6910acaedb91d8a003a7800db57..b69045c2872eac16536fcea38fa3303ef9d72e77 100644
--- a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
+++ b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
@@ -51,8 +51,6 @@ class Alg : virtual public ::IPyComponent,
virtual StatusCode sysInitialize() override;
- virtual void resetExecuted() override;
-
///////////////////////////////////////////////////////////////////
// Const methods:
///////////////////////////////////////////////////////////////////
diff --git a/Control/AthenaPython/src/PyAthenaAlg.cxx b/Control/AthenaPython/src/PyAthenaAlg.cxx
index dd0bc8c06550b2d3b880a99e7d3b5bf06e5e8121..687b3b15abfd12eda565405c272b8e784e9aa11a 100644
--- a/Control/AthenaPython/src/PyAthenaAlg.cxx
+++ b/Control/AthenaPython/src/PyAthenaAlg.cxx
@@ -99,12 +99,6 @@ Alg::execute()
return sc;
}
-void
-Alg::resetExecuted()
-{
- PyAthena::callPyMethod( m_self, "resetExecuted" ).ignore();
-}
-
StatusCode
Alg::sysInitialize()
{
diff --git a/Control/AthenaServices/python/PyAthenaEventLoopMgr.py b/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
index ec08cccd8c0ace2425005d2a5d5b5926fcf3f904..4de2415d8f3538374800291f21eac6eff4eb6703 100644
--- a/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
+++ b/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
@@ -130,7 +130,7 @@ class PyAthenaEventLoopMgr( PyGaudi.iService ):
if not alg._ialg:
alg.retrieveInterface()
ialg = alg._ialg
- ialg.resetExecuted()
+ ialg.execState(ctx).reset()
result = ialg.sysExecute(ctx)
if result.isFailure():
from AthenaCommon.Logging import log as msg
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.cxx b/Control/AthenaServices/src/AthIncFirerAlg.cxx
index 07fcc114f63cb1e893554d39fd0d047d2d9d3f83..8d126b4688234545cc0ddd086da5b72ef4f233cb 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.cxx
+++ b/Control/AthenaServices/src/AthIncFirerAlg.cxx
@@ -5,14 +5,12 @@
#include "EventInfo/EventIncident.h"
#include "AthenaKernel/errorcheck.h"
-AthIncFirerAlg::AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator ):AthAlgorithm(name,pSvcLocator),m_Serial(false){
+AthIncFirerAlg::AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator ):AthReentrantAlgorithm(name,pSvcLocator),m_Serial(false){
declareProperty("Incidents",m_incLists,"Incidents to fire");
declareProperty("FireSerial",m_Serial,"Whether to fire serial incidents");
}
StatusCode AthIncFirerAlg::initialize(){
- auto sc=AthAlgorithm::initialize();
- if (sc.isFailure()) return sc;
m_incSvc = service("IncidentSvc",true);
//Copied from CPUCruncher.cpp
if (m_incLists.value().size()==0){
@@ -22,30 +20,14 @@ StatusCode AthIncFirerAlg::initialize(){
return StatusCode::SUCCESS;
}
-StatusCode AthIncFirerAlg::execute() {
- for(auto & i:m_incLists.value()){
- ATH_MSG_VERBOSE("Firing incident "<<i);
- if((i=="BeginEvent")||(i=="EndEvent")){
- const EventInfo* event(0);
- CHECK( evtStore()->retrieve(event) );
- m_incSvc->fireIncident(std::make_unique<EventIncident>(*event, name(),i));
- if(m_Serial.value())m_incSvc->fireIncident(EventIncident(*event, name(),i));
- }else{
- m_incSvc->fireIncident(std::make_unique<Incident>(name(),i));
- if(m_Serial.value())m_incSvc->fireIncident(Incident( name(),i));
- }
- }
- return StatusCode::SUCCESS;
-}
-
-StatusCode AthIncFirerAlg::execute_r(const EventContext& ctx)const {
+StatusCode AthIncFirerAlg::execute(const EventContext& ctx)const {
auto ctxcp=ctx;
for(auto & i:m_incLists.value()){
ATH_MSG_VERBOSE("Firing incident "<<i);
if((i=="BeginEvent")||(i=="EndEvent")){
const EventInfo* event(0);
- evtStore()->retrieve(event);
+ evtStore()->retrieve(event).ignore();
m_incSvc->fireIncident(std::make_unique<EventIncident>(*event, name(),i,ctxcp));
if(m_Serial.value())m_incSvc->fireIncident(EventIncident(*event, name(),i,ctxcp));
}else{
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.h b/Control/AthenaServices/src/AthIncFirerAlg.h
index 96485337142802ed5610c3a8f9cfbdef60ef4aa0..017da68379ea14456e6059fea77feb30610699f7 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.h
+++ b/Control/AthenaServices/src/AthIncFirerAlg.h
@@ -4,18 +4,17 @@
#include <vector>
#include <string>
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/ServiceHandle.h"
class IIncidentSvc;
-class AthIncFirerAlg : public AthAlgorithm{
+class AthIncFirerAlg : public AthReentrantAlgorithm{
public:
AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator );
StatusCode initialize() override;
- StatusCode execute() override;
- StatusCode execute_r(const EventContext& ctx) const ;
+ StatusCode execute(const EventContext& ctx) const ;
StatusCode finalize() override;
private:
// Gaudi::Property<std::vector<std::string>> m_incLists{this, "Incidents", {},"List of incidents to fire"};
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
index 1c4d514f58ea9c908facd3eecad35206e68e28f8..0d7f4caf263d2b535fc27b85d06a6110728d6436 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
@@ -45,7 +45,7 @@ StatusCode CondAlg1::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode CondAlg1::execute_r (const EventContext& ctx) const
+StatusCode CondAlg1::execute (const EventContext& ctx) const
{
SG::ReadCondHandle<AthenaAttributeList> attrList (m_attrListKey, ctx);
int xint = (**attrList)["xint"].data<int>();
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
index 5a8afa2372448ee07b596ae04a98e402605febec..37fda17d17c240507c53d81c4ad5309b93bff68c 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
@@ -46,7 +46,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
index f91246d40b37ba5c1561ab81dc7499f6816a595c..079279a66ec19a874daf485338064ea50f50c5be 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
@@ -61,7 +61,7 @@ StatusCode CondReaderAlg::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode CondReaderAlg::execute_r (const EventContext& ctx) const
+StatusCode CondReaderAlg::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
index 237d77c15482477e368cfc81a92b7eb2610088a1..06781d9024b326bb3353a2f8d1a6c5b381eb0eeb 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
@@ -49,7 +49,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
index 61347ae0e6afda2bdc9d3de0cb6ddc8e1cc575e8..88fd2d9700d2ab778197bd95c1cd2153eadff27b 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
@@ -45,7 +45,7 @@ StatusCode MetaReaderAlg::initialize()
* @brief Algorithm execute method.
* @param ctx Event context.
*/
-StatusCode MetaReaderAlg::execute_r (const EventContext& ctx) const
+StatusCode MetaReaderAlg::execute (const EventContext& ctx) const
{
// Get proper dbkey.
const DataHeader* thisDH = nullptr;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
index c1f2bd4749b848892cb74df5dbc6312c46c362cd..149fced29774f5d5c4f80d679b75b3207307a93a 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm execute method.
* @param ctx Event context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
index 2f07dafba3e86c432ffd73c39fbb49de7b73c89b..b79938bd03e53addb73a8515d714c044309149bc 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
@@ -44,7 +44,7 @@ StatusCode xAODTestAlg::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestAlg::execute_r (const EventContext& ctx) const
+StatusCode xAODTestAlg::execute (const EventContext& ctx) const
{
for (const auto& t : m_tools)
ATH_CHECK( t->doit (ctx) );
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
index 44f39f83de0de5d4f9ac71123c055e8c37309e48..cd2e5824a6e939cf36ce5a6513a192bdbbbdc9da 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
@@ -45,7 +45,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
index 551b35e9add8d0a62ebb67aee44adf5c99d0a2ba..e56022f27ccddd7535dd71ffa165cdebb438b6a1 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
@@ -69,7 +69,7 @@ StatusCode xAODTestDecor::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestDecor::execute_r (const EventContext& ctx) const
+StatusCode xAODTestDecor::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
index cf0b32004c96f22165a89502d50d1b2d06d1570f..1251a2c6a1f588a8734752032124ac4ee8d2dc90 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
@@ -52,7 +52,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
index 489b62499d2f95f433c49f8b9668618638e89a1b..b3b0b48fc2f64dad1f88118d9dbc0de42893192b 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
@@ -62,7 +62,7 @@ StatusCode xAODTestReadDecor::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadDecor::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadDecor::execute (const EventContext& ctx) const
{
{
std::ostringstream ss;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
index 113f994046d77a3bcb11504a732edc7ea129f9a8..62d92088f1b8a46348601b781a2355f4ed17a298 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
@@ -48,7 +48,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
index 31e3a94d7d757c774c35263d1d63081d42974145..0a5056e239a4eab7c47afb1ee127cb7740c20c26 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
@@ -38,7 +38,7 @@ StatusCode xAODTestReadSymlink::initialize()
}
-StatusCode xAODTestReadSymlink::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadSymlink::execute (const EventContext& ctx) const
{
SG::ReadHandle<SG::AuxElement> c (m_objKey, ctx);
SG::ReadHandle<DMTest::S1> s1 (m_s1Key, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
index 55561d6328b62edd0d79c8deb53a0fca83414545..a8db4bc9dbb055a0f4c4310181e300e31cfeb153 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
@@ -48,7 +48,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
index 6eaeef6adf044f5d683441ef75b808598041b6b7..46c6935b81ef4b5e11ee79352e782fc551a1b066 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
@@ -55,7 +55,7 @@ StatusCode xAODTestWriteCInfo::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCInfo::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCInfo::execute (const EventContext& ctx) const
{
//SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
//unsigned int count = eventInfo->eventNumber() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
index ad3d2de6bf4cacc546113f33e265fc29afcfed2a..0e4ee559826bb227c8b5e04fffc00e08285e0f57 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
index 640f302d671f68fd766b4f5c0dec31bd1f1ba211..7e97df33bc6ca1e02970baffd7edaf28085a630f 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
@@ -54,7 +54,7 @@ StatusCode xAODTestFilterCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestFilterCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestFilterCVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
const static C::Accessor<ElementLink<DMTest::CVec> > cEL ("cEL");
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
index f6220c7e8af24eb4ec498aad701ecb6302c4539b..7e1dbdc16c07f2913e6a639e0fc18b2c7dd595b5 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
index 507990d44627d2bbb4c3774641b365623c63b78f..e01a0f3b89ac0f6fc82bb3df656a8871a53896fc 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
@@ -51,7 +51,7 @@ StatusCode xAODTestReadCInfo::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCInfo::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCInfo::execute (const EventContext& ctx) const
{
static const C::Accessor<int> anInt2 ("anInt2");
static const C::Accessor<int> anInt10 ("anInt10");
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
index 22ddd89b1ac265ea551a2004d33c1544f202a64d..77fb515eb62dab4eaf9456d8df937d64963fc8b7 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
@@ -47,7 +47,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const;
+ virtual StatusCode execute (const EventContext& ctx) const;
private:
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
index a9468898e3d05b801c2f49c78d9973c676aa5878..54224900a2e33d251b97146af57d028d41ec7926 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
@@ -65,7 +65,7 @@ StatusCode xAODTestReadCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
index d45f552feebeef3f51063a8f917fa2f59fad4b4f..4b2a74c25e5dbf09afda872ab0b45ec8a9c0c13b 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
index a0a95e62e9f5c5c71d321cdaebd78786828c62e6..2c7fd98ac5e580ba64f523c10c2bd867ea7af31a 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
@@ -54,7 +54,7 @@ StatusCode xAODTestReadCView::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCView::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCView::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CView> cview (m_cviewKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
index 9a722b5977adce46078e03e5918d2af502c6b344..eeb513f850779548d484a52e0e1619b4b6150dbe 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
index ea93300e21a698ca66dd25049fa4a223eabaf788..ec6526dd0e9eb7e217dbff165271998b5e7eb4d2 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
@@ -64,7 +64,7 @@ StatusCode xAODTestReadHVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadHVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadHVec::execute (const EventContext& ctx) const
{
const DMTest::HVec* hvec = SG::get (m_hvecKey, ctx);
std::cout << m_hvecKey.key() << ":";
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
index c749ab28f13e23a0770b09d5ae4d559533a8e29f..e6dc370b7bb732d757a8cad2dd0fa58a2e052b20 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
@@ -51,7 +51,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
index 164615717c98bc6cc45d7d79c86b3c0ec7e56585..9e1fc6a73b10bba0c2dfcafb46eb4fa25e808bb4 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
@@ -77,7 +77,7 @@ StatusCode xAODTestWrite::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWrite::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWrite::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
index bf5af6cbee38f633d0361eb33727f08445dae998..b85a3695688f14a3afab41f56088613aa67c373b 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
index 05bd50affc78fa15b6a0434460d451d7055fb9c0..50bfe4227a120ccc7c3ca88b0cecf8c5d3981de7 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
@@ -71,7 +71,7 @@ StatusCode xAODTestWriteCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCVec::execute (const EventContext& ctx) const
{
//SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
//unsigned int count = eventInfo->eventNumber() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
index e7da4af15ade979137f4f5677884b5ab70d8903b..151956d790d0f606f334a23dd545bfb49377d613 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
index 3f54d8c62cfe14972b9e3e2084ee3620d804a55c..ce978de84878a08a76bfb39ba7de24977c879c8e 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
@@ -50,7 +50,7 @@ StatusCode xAODTestWriteCVecConst::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCVecConst::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCVecConst::execute (const EventContext& ctx) const
{
auto coll = CxxUtils::make_unique<DMTest::CVec>();
auto store = CxxUtils::make_unique<DMTest::CAuxContainer>();
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
index 5802915bdc886a3df0c6682a21be9e3c1e169566..fd8d71abf2bfe9fadeac7b6927eb9978e7e50803 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
@@ -49,7 +49,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
index b9a3417d759cab6df01285e82c0aaa7370d23d95..96a4bf7e3a2359e78f81c1ce9d89af31694a332c 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
@@ -52,7 +52,7 @@ StatusCode xAODTestWriteCView::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCView::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCView::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
auto cview = std::make_unique<ConstDataVector<DMTest::CView> >(SG::VIEW_ELEMENTS);
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
index 89cf85142768914a2ef9b645609aa8a2fd4e7a37..46bc298d25765b7b49f273f005927fca0e23a5b5 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
@@ -52,7 +52,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
index d091fc269321e02683e20048078887b5e2420d5f..b9598e4146528481a8da39c3d9efca6d38681d05 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
@@ -56,7 +56,7 @@ StatusCode xAODTestWriteHVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteHVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteHVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
index a932ea9f9ec657531496b9282c59c350d3fb644e..389b258bfa212294ed8338d42d2c01a9e41d3205 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
index 549dfef439f0e48f169b5f751e559d0424a34613..efac81f2886fdf6363f32117d82684cef0a93f2a 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
@@ -53,7 +53,7 @@ StatusCode xAODTestWriteSymlinks::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteSymlinks::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteSymlinks::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
SG::WriteHandle<DMTest::S2> s2 (m_s2Key, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
index e58707d95c4ca54cfe18ce1c4d5e94e4f4d0de3a..a5eab365e414381b4b9cd978973f58c4c393b82c 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.cxx b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
index 39d9b9296457695728ad717a33b911725762c4c6..c7a9b0f6d4c353288c75e177171bc33e4a583224 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.cxx
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
@@ -44,16 +44,16 @@ AthRetrySequencer::AthRetrySequencer( const std::string& name,
AthRetrySequencer::~AthRetrySequencer()
{}
-StatusCode AthRetrySequencer::execute()
+StatusCode AthRetrySequencer::execute( const EventContext& ctx ) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
int iloop = 0;
while (iloop < m_maxRetries || m_maxRetries == -1) {
iloop += 1;
- this->AthSequencer::resetExecuted();
- if (this->AthSequencer::execute().isSuccess() &&
- filterPassed()) {
+ this->AthSequencer::resetExecuted( ctx );
+ if (this->AthSequencer::execute( ctx ).isSuccess() &&
+ this->execState(ctx).filterPassed()) {
return StatusCode::SUCCESS;
}
}
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.h b/Control/GaudiSequencer/src/AthRetrySequencer.h
index be505503398360a6784c6a101051f8e66d54ebf4..0654858d380103ec57c649755b95dea630a87ee3 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.h
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.h
@@ -47,7 +47,7 @@ class AthRetrySequencer
//AthRetrySequencer &operator=(const AthRetrySequencer &alg);
// Athena algorithm's Hooks
- virtual StatusCode execute();
+ virtual StatusCode execute( const EventContext& ) const override;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Control/GaudiSequencer/src/AthSequencer.cxx b/Control/GaudiSequencer/src/AthSequencer.cxx
index 393fc3dc992d1137cd5e38f8306dfd7ee44f2dbf..5bee1662a514b5d35e602a5a3fe5cdb8791ee523 100644
--- a/Control/GaudiSequencer/src/AthSequencer.cxx
+++ b/Control/GaudiSequencer/src/AthSequencer.cxx
@@ -31,6 +31,10 @@
#include <execinfo.h>
#endif
+/// timer will abort job once timeout for any algorithm or sequence is reached
+thread_local Athena::AlgorithmTimer s_abortTimer{ 0, NULL, Athena::AlgorithmTimer::DEFAULT };
+
+
#include "valgrind/valgrind.h"
/**
@@ -49,7 +53,7 @@ bool AthSequencer::m_installedSignalHandler;
**/
AthSequencer::AthSequencer( const std::string& name,
ISvcLocator* pSvcLocator ):
- AthAlgorithm (name, pSvcLocator),
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>> ( name, pSvcLocator ),
m_timeoutMilliseconds(0),
m_abortTimer(0, NULL, Athena::AlgorithmTimer::DEFAULT ),
m_continueEventloopOnFPE(false)
@@ -89,13 +93,6 @@ AthSequencer::AthSequencer( const std::string& name,
AthSequencer::~AthSequencer()
{}
-/// Mark as a sequencer.
-bool AthSequencer::isSequence() const
-{
- return true;
-}
-
-
StatusCode
AthSequencer::initialize()
{
@@ -107,52 +104,60 @@ AthSequencer::initialize()
m_timeoutMilliseconds = 0;
}
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
if (!decodeMemberNames().isSuccess()) {
ATH_MSG_ERROR ("Unable to configure one or more sequencer members ");
return StatusCode::FAILURE;
}
+ StatusCode sc(StatusCode::SUCCESS);
// Loop over all sub-algorithms
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysInitialize( ).isSuccess()) {
- ATH_MSG_ERROR ("Unable to initialize Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR ("Unable to initialize Algorithm "
+ << theAlgorithm->type() << "/" << theAlgorithm->name());
+ sc= StatusCode::FAILURE;
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::reinitialize()
{
+ StatusCode sc(StatusCode::SUCCESS);
// Bypass the loop if this sequencer is disabled
if ( isEnabled( ) ) {
// Loop over all members calling their reinitialize functions
// if they are not disabled.
- std::vector<Algorithm*>* theAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgms->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgms->end( );
for (it = theAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
- theAlgorithm->reinitialize( ).ignore();
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
+ if (theAlgorithm->sysReinitialize( ).isFailure()) {
+ ATH_MSG_ERROR ("Unable to reinitialize Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
}
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
-AthSequencer::execute()
+AthSequencer::execute( const EventContext& ctx ) const
{
volatile bool all_good = true;
volatile bool caughtfpe= false;
@@ -160,34 +165,32 @@ AthSequencer::execute()
bool seqPass = !m_modeOR;
ATH_MSG_DEBUG ("Executing " << name() << "...");
+
+ auto& state = execState( ctx );
// Bypass the loop if this sequencer is disabled or has already been executed
- if ( isEnabled( ) && ! isExecuted( ) ) {
+ if ( isEnabled( ) && state.state() != AlgExecState::State::Done ) {
// Prevent multiple executions of this sequencer for the current event
- setExecuted( true );
+ state.setState( AlgExecState::State::Executing );
// Loop over all algorithms calling their execute functions if they
// are (a) not disabled, and (b) aren't already executed. Note that
// in the latter case the filter state is still examined. Terminate
// the loop if an algorithm indicates that it's filter didn't pass.
- std::vector<Algorithm*>* subAlgms = subAlgorithms( );
- //volatile std::vector<Algorithm*>::iterator it;
- //std::vector<Algorithm*>::iterator itend = subAlgms->end( );
- //for (it = subAlgms->begin(); it != itend; it++) {
- //volatile Algorithm* theAlgorithm = (*it);
- for (Algorithm* theAlgorithm : *subAlgms) {
+ const std::vector<Gaudi::Algorithm*>* subAlgms = subAlgorithms( );
+ for (auto theAlgorithm : *subAlgms) {
if ( theAlgorithm->isEnabled( ) ) {
- if ( ! theAlgorithm->isExecuted( ) ) {
- sc = executeAlgorithm (theAlgorithm, all_good, caughtfpe);
+ if ( theAlgorithm->execState(ctx).state() == AlgExecState::State::None ) {
+ sc = executeAlgorithm (theAlgorithm, ctx, all_good, caughtfpe);
}
if ( all_good ) {
if ( !m_ignoreFilter ) {
// Take the filter passed status of this algorithm as my own status
- bool passed = theAlgorithm->filterPassed( );
- setFilterPassed( passed );
+ bool passed = theAlgorithm->execState( ctx ).filterPassed();
+ state.setFilterPassed( passed );
// The behaviour when the filter fails depends on the
// StopOverride property.
@@ -206,16 +209,18 @@ AthSequencer::execute()
}
}
- if ( !m_ignoreFilter && !m_names.empty() ) setFilterPassed( seqPass );
+ if ( !m_ignoreFilter && !m_names.empty() ) state.setFilterPassed( seqPass );
+ state.setState( AlgExecState::State::Done );
return caughtfpe ? StatusCode::RECOVERABLE : sc;
}
-StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
+StatusCode AthSequencer::executeAlgorithm (Gaudi::Algorithm* theAlgorithm,
+ const EventContext& ctx,
volatile bool& all_good,
- volatile bool& caughtfpe)
+ volatile bool& caughtfpe) const
{
StatusCode sc = StatusCode::SUCCESS;
@@ -226,13 +231,11 @@ StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
!sigsetjmp(s_fpe_landing_zone, 1) )
{
// Call the sysExecute() of the method the algorithm
- m_abortTimer.start(m_timeoutMilliseconds);
- sc = theAlgorithm->sysExecute( getContext() );
+ s_abortTimer.start(m_timeoutMilliseconds);
+ sc = theAlgorithm->sysExecute( ctx );
all_good = sc.isSuccess();
- // I think this should be done by the algorithm itself,
- // but just in case...
- theAlgorithm->setExecuted( true );
- int tmp=m_abortTimer.stop();
+
+ int tmp=s_abortTimer.stop();
// but printout only if non-zero timeout was used
if (m_timeoutMilliseconds) {
ATH_MSG_DEBUG ("Time left before interrupting <"
@@ -253,92 +256,98 @@ StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
return sc;
}
-StatusCode
-AthSequencer::finalize()
-{
- ATH_MSG_DEBUG ("Finalizing " << name() << "...");
- return StatusCode::SUCCESS;
-}
-
StatusCode
AthSequencer::start()
{
+ StatusCode sc(StatusCode::SUCCESS);
#ifdef GAUDIKERNEL_STATEMACHINE_H_
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
// Loop over all sub-algorithms
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysStart( ).isSuccess()) {
- ATH_MSG_ERROR ("Unable to start Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR ("Unable to start Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
}
}
#endif // !GAUDIKERNEL_STATEMACHINE_H_
-
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::stop()
{
+ StatusCode sc(StatusCode::SUCCESS);
#ifdef GAUDIKERNEL_STATEMACHINE_H_
// Loop over all sub-algorithms if they are not disabled.
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (theAlgorithm->sysStop( ).isFailure()) {
- ATH_MSG_ERROR ("Unable to stop Algorithm " << theAlgorithm->name());
+ ATH_MSG_ERROR ("Unable to stop Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
}
}
#endif // !GAUDIKERNEL_STATEMACHINE_H_
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::beginRun()
{
// Bypass the loop if this sequencer is disabled
+ StatusCode sc(StatusCode::SUCCESS);
if ( isEnabled( ) ) {
// Loop over all members calling their sysInitialize functions
// if they are not disabled. Note that the Algoriithm::sysInitialize
// function protects this from affecting Algorithms that have already
// been initialized.
- std::vector<Algorithm*>* theAlgs = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgs = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysInitialize( ).isSuccess()) {
ATH_MSG_ERROR
("Unable to initialize Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ sc = StatusCode::FAILURE;
+ return sc;
}
}
// Loop over all members calling their beginRun functions
// if they are not disabled.
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
- theAlgorithm->beginRun( ).ignore();
+ if (theAlgorithm->sysBeginRun( ).isFailure()) {
+ ATH_MSG_ERROR("Unable to BeginRun Algorithm "
+ << theAlgorithm->type() << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
@@ -347,50 +356,56 @@ AthSequencer::beginRun()
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::endRun()
{
+ StatusCode sc(StatusCode::SUCCESS);
// Bypass the loop if this sequencer is disabled
if ( isEnabled( ) ) {
// Loop over all members calling their endRun functions
// if they are not disabled.
- std::vector<Algorithm*>* theAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgms->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgms->end( );
for (it = theAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
- theAlgorithm->endRun( ).ignore();
+ if ( theAlgorithm->sysEndRun( ).isFailure() ) {
+ ATH_MSG_ERROR("Unable to EndRun Algorithm "
+ << theAlgorithm->type() << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
void
-AthSequencer::resetExecuted( )
+AthSequencer::resetExecuted( const EventContext& ctx ) const
{
- Algorithm::resetExecuted( );
+ execState(ctx).reset();
// Loop over all members calling their resetExecuted functions
// if they are not disabled.
- std::vector<Algorithm*>* subAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = subAlgms->end( );
+ const std::vector<Gaudi::Algorithm*>* subAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::const_iterator it;
+ std::vector<Gaudi::Algorithm*>::const_iterator itend = subAlgms->end( );
for (it = subAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- theAlgorithm->resetExecuted( );
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ theAlgorithm->execState(ctx).reset();
}
}
@@ -401,7 +416,7 @@ AthSequencer::isStopOverride( ) const
}
StatusCode
-AthSequencer::append( Algorithm* pAlgorithm )
+AthSequencer::append( Gaudi::Algorithm* pAlgorithm )
{
return append( pAlgorithm, subAlgorithms( ) );
}
@@ -409,13 +424,13 @@ AthSequencer::append( Algorithm* pAlgorithm )
StatusCode
AthSequencer::createAndAppend( const std::string& type,
const std::string& name,
- Algorithm*& pAlgorithm )
+ Gaudi::Algorithm*& pAlgorithm )
{
return createAndAppend( type, name, pAlgorithm, subAlgorithms( ) );
}
StatusCode
-AthSequencer::remove( Algorithm* pAlgorithm )
+AthSequencer::remove( Gaudi::Algorithm* pAlgorithm )
{
return remove (pAlgorithm->name());
}
@@ -444,16 +459,16 @@ AthSequencer::membershipHandler( Property& /* theProp */ )
**/
StatusCode
-AthSequencer::append( Algorithm* pAlgorithm,
- std::vector<Algorithm*>* theAlgs )
+AthSequencer::append( Gaudi::Algorithm* pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
bool all_good = true;
// Check that the specified algorithm doesn't already exist
// in the membership list
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if ( theAlgorithm == pAlgorithm ) {
all_good = false;
break;
@@ -469,8 +484,8 @@ AthSequencer::append( Algorithm* pAlgorithm,
StatusCode
AthSequencer::createAndAppend( const std::string& type,
const std::string& algName,
- Algorithm*& pAlgorithm,
- std::vector<Algorithm*>* theAlgs )
+ Gaudi::Algorithm*& pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result = StatusCode::FAILURE;
IAlgManager* theAlgMgr;
@@ -484,7 +499,7 @@ AthSequencer::createAndAppend( const std::string& type,
result = theAlgMgr->createAlgorithm( type, algName, tmp );
if ( result.isSuccess( ) ) {
try{
- pAlgorithm = dynamic_cast<Algorithm*>(tmp);
+ pAlgorithm = dynamic_cast<Gaudi::Algorithm*>(tmp);
theAlgs->push_back( pAlgorithm );
} catch(...){
ATH_MSG_ERROR ("Unable to create Algorithm " << algName);
@@ -498,7 +513,7 @@ AthSequencer::createAndAppend( const std::string& type,
StatusCode
AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
- std::vector<Algorithm*>* theAlgs )
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result;
IAlgManager* theAlgMgr;
@@ -536,10 +551,10 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
// Check whether the suppied name corresponds to an existing
// Algorithm object.
IAlgorithm* theIAlg;
- Algorithm* theAlgorithm;
+ Gaudi::Algorithm* theAlgorithm;
StatusCode status = theAlgMgr->getAlgorithm( theName, theIAlg );
if ( status.isSuccess( ) ) {
- theAlgorithm = dynamic_cast<Algorithm*>(theIAlg);
+ theAlgorithm = dynamic_cast<Gaudi::Algorithm*>(theIAlg);
if (!theAlgorithm) {
ATH_MSG_WARNING
(theName << " is not an Algorithm - Failed dynamic cast");
@@ -581,7 +596,7 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
if ( result.isSuccess() && !theAlgs->empty() ) {
msg(MSG::DEBUG) << "Member list: ";
bool first = true;
- for (Algorithm* alg : *theAlgs) {
+ for (Gaudi::Algorithm* alg : *theAlgs) {
if (first)
first = false;
else
@@ -599,15 +614,15 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
StatusCode
AthSequencer::remove( const std::string& algname,
- std::vector<Algorithm*>* theAlgs )
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result = StatusCode::FAILURE;
// Test that the algorithm exists in the member list
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if ( theAlgorithm->name( ) == algname ) {
// Algorithm with specified name exists in the algorithm list - remove it
@@ -671,7 +686,7 @@ void AthSequencer::fpe_callback( int /* sig_number */, siginfo_t *info, void* /*
}
void
-AthSequencer::cleanupAfterFPE(siginfo_t *info)
+AthSequencer::cleanupAfterFPE(siginfo_t *info) const
{
if (info->si_signo != SIGFPE) /* should never happen */
{
@@ -696,6 +711,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
// now have to unwind gaudi stack
// Check if the AlgContextSvc is running
IAlgContextSvc* algContextSvc(0);
+ EventContext ctx = Gaudi::Hive::currentContext();
if (service("AlgContextSvc", algContextSvc, /*createIf=*/ false).isSuccess() && algContextSvc)
{
IAlgorithm* alg = algContextSvc->currentAlg();
@@ -718,7 +734,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
}
}
while ( algContextSvc->algorithms().size() && algContextSvc->currentAlg()->name() != this->name() )
- if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg()).isFailure() )
+ if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg(),ctx).isFailure() )
this->msg() << "cannot unwind: " << algContextSvc->currentAlg();
this->msg() << endmsg;
}
diff --git a/Control/GaudiSequencer/src/AthSequencer.h b/Control/GaudiSequencer/src/AthSequencer.h
index 516d33275e0ceb77d85a589b730077f212b6c5f4..13fa4d45e993cda130dedb64f10abec4752964b6 100644
--- a/Control/GaudiSequencer/src/AthSequencer.h
+++ b/Control/GaudiSequencer/src/AthSequencer.h
@@ -13,8 +13,11 @@
#define GAUDISEQUENCER_ATHSEQUENCER_H
// Include files
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthCommonDataStore.h"
+#include "AthenaBaseComps/AthCommonMsg.h"
+
#include "GaudiKernel/Property.h"
+#include "Gaudi/Sequence.h"
#include "AthenaKernel/AlgorithmTimer.h"
@@ -34,7 +37,8 @@
** terminated and the AthSequencer assumes the same filtered state as the
** last member.
**/
-class AthSequencer : public AthAlgorithm
+class AthSequencer
+ : public AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>>
{
public:
@@ -54,8 +58,6 @@ public:
** Public Function Members **
*****************************/
- /// Mark as a sequencer.
- virtual bool isSequence() const override final;
/**
** Initialization of a sequencer. Typically things like histogram creation,
@@ -74,13 +76,8 @@ public:
** The actions to be performed by the sequencer on an event. This method
** is invoked once per event.
**/
- virtual StatusCode execute( ) override;
-
- /**
- ** AthSequencer finalization.
- **/
- virtual StatusCode finalize( ) override;
-
+ virtual StatusCode execute( const EventContext& ctx ) const override;
+
/**
** AthSequencer beginRun.
**/
@@ -102,7 +99,7 @@ public:
/**
** Reset the AthSequencer executed state for the current event.
**/
- virtual void resetExecuted( ) override;
+ virtual void resetExecuted( const EventContext& ctx ) const;
/**
** Has the StopOverride mode been set?
@@ -112,7 +109,7 @@ public:
/**
** Append an algorithm to the sequencer.
**/
- StatusCode append( Algorithm* pAlgorithm );
+ StatusCode append( Gaudi::Algorithm* pAlgorithm );
/**
** Create a algorithm and append it to the sequencer. A call to this method
@@ -126,13 +123,13 @@ public:
StatusCode createAndAppend(
const std::string& type, // The concrete algorithm class of the algorithm
const std::string& name, // The name to be given to the algorithm
- Algorithm*& pAlgorithm // Set to point to the newly created algorithm object
+ Gaudi::Algorithm*& pAlgorithm // Set to point to the newly created algorithm object
);
/**
** Remove the specified algorithm from the sequencer
**/
- StatusCode remove( Algorithm* pAlgorithm );
+ StatusCode remove( Gaudi::Algorithm* pAlgorithm );
StatusCode remove( const std::string& name );
/// Decode Member Name list
@@ -152,8 +149,8 @@ protected:
/**
** Append an algorithm to the sequencer.
**/
- StatusCode append( Algorithm* pAlgorithm,
- std::vector<Algorithm*>* theAlgs );
+ StatusCode append( Gaudi::Algorithm* pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs );
/**
** Create a algorithm and append it to the sequencer. A call to this method
@@ -167,21 +164,21 @@ protected:
StatusCode createAndAppend(
const std::string& type, // The concrete algorithm class of the algorithm
const std::string& name, // The name to be given to the algorithm
- Algorithm*& pAlgorithm, // Set to point to the newly created algorithm object
- std::vector<Algorithm*>* theAlgs
+ Gaudi::Algorithm*& pAlgorithm, // Set to point to the newly created algorithm object
+ std::vector<Gaudi::Algorithm*>* theAlgs
);
/**
** Decode algorithm names, creating or appending algorithms as appropriate
**/
StatusCode decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
- std::vector<Algorithm*>* theAlgs );
+ std::vector<Gaudi::Algorithm*>* theAlgs );
/**
** Remove the specified algorithm from the sequencer
**/
- StatusCode remove( const std::string& algname, std::vector<Algorithm*>* theAlgs );
+ StatusCode remove( const std::string& algname, std::vector<Gaudi::Algorithm*>* theAlgs );
private:
@@ -201,9 +198,10 @@ private:
/// Run one algorithm.
/// Broken out to avoid warnings related to longjmp.
- StatusCode executeAlgorithm (Algorithm* theAlgorithm,
+ StatusCode executeAlgorithm (Gaudi::Algorithm* theAlgorithm,
+ const EventContext& ctx,
volatile bool& all_good,
- volatile bool& caughtfpe);
+ volatile bool& caughtfpe) const;
/**************************
** Private Data Members **
@@ -247,7 +245,7 @@ private:
static void fpe_trap_enable();
static void fpe_callback(int, siginfo_t*, void*);
static bool prepareCatchAndEnableFPE();
- void cleanupAfterFPE(siginfo_t*);
+ void cleanupAfterFPE(siginfo_t*) const;
static void uninstallFPESignalHandler();
static const size_t s_maxArraySize = 50;
diff --git a/Control/SGComps/src/AddressRemappingSvc.cxx b/Control/SGComps/src/AddressRemappingSvc.cxx
index e976546742877a517b66d3a6c8d6902946c0d48a..8efdb0af1a2d89c2b1553bcd1ddb8d805176d175 100644
--- a/Control/SGComps/src/AddressRemappingSvc.cxx
+++ b/Control/SGComps/src/AddressRemappingSvc.cxx
@@ -465,7 +465,7 @@ void AddressRemappingSvc::initDeletes()
m_haveDeletes = true;
for (IAlgorithm* ialg : m_algResourcePool->getFlatAlgList()) {
- if (Algorithm* alg = dynamic_cast<Algorithm*> (ialg)) {
+ if (Gaudi::Algorithm* alg = dynamic_cast<Gaudi::Algorithm*> (ialg)) {
// Need to ignore SGInputLoader; it'll have output deps
// on everything being read.
if (alg->name() == "SGInputLoader") continue;
@@ -488,7 +488,10 @@ void AddressRemappingSvc::initDeletes()
}
}
}
+ } else {
+ ATH_MSG_WARNING(ialg->name() << " doesn't seem to be an Algorithm" );
}
+
}
}
//______________________________________________________________________________
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandle.h b/Control/StoreGate/StoreGate/ReadDecorHandle.h
index 025ca9964e6efa70da33b04a2b69a48c53245032..83884e546853952c1f402a9af0d909275bdddd03 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandle.h
+++ b/Control/StoreGate/StoreGate/ReadDecorHandle.h
@@ -73,7 +73,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::ReadDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandleKey.h b/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
index 1e4f643519d5f38d575286ca87a8cac3a2171cf0..d05be29b4aa3c3f98fdf1cfd30b25b4745018405 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
+++ b/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
@@ -55,7 +55,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::ReadDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.h b/Control/StoreGate/StoreGate/WriteDecorHandle.h
index ced61555169efd9d5d63ab9a27268396efeaf188..c50b96f81bd72d3f39cd68c02ad3c5e018d27352 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.h
@@ -75,7 +75,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::WriteDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandleKey.h b/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
index 8576bc78b070ae0257ba5b582f6141ccf82a8326..e8820fb81ebe9b85fe76272686e2695dd0deeeb8 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
@@ -60,7 +60,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::WriteDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
index cdd88c845a488efac3c90f95c0c695e4e6861db0..4c45d79ceff27dc4834fcb85e19ddf8d59be9e96 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
@@ -41,7 +41,7 @@ StatusCode ReWriteData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode ReWriteData::execute_r (const EventContext& ctx) const {
+StatusCode ReWriteData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
if (!m_exampleHitKey.key().empty()) {
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
index 2d98b4f84f0216d2992955f56181ebca67db96ee..5a564c8162feb0e4b523584386f419eeff3f2482 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
@@ -32,7 +32,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
index 446a26a5f3b3057c1ef8dceb1225844e6e2f96b4..0cff7e2dc641f1fc306d3768a5027acd596a344d 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
@@ -54,7 +54,7 @@ StatusCode ReadData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode ReadData::execute_r (const EventContext& ctx) const {
+StatusCode ReadData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
SG::ConstIterator<EventStreamInfo> esi1, esi2;
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
index 62bad7121f9091488bdbb94f21ce37c1b5a440c1..4c209285fa8571586ee6645253f59cab982aa5ef 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
@@ -34,7 +34,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
index 85e08478ebc86dfaf6323947ad94b781744a264e..a28b1e16e362d1d6a67cbef012837e3cf09e1ecb 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
@@ -45,7 +45,7 @@ StatusCode WriteCond::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteCond::execute_r (const EventContext& ctx) const {
+StatusCode WriteCond::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
SG::ReadHandle<ExampleHitContainer> hits (m_exampleHitKey, ctx);
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
index 813489ff99dac9069ce4121175c4de80b337e3b2..330b4fa343a8e6a7918e8d12d0f5b06f55d91e59 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
@@ -30,7 +30,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode stop() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
index 014e904dd27b8084afdffa592c0fa1974e57dcfc..e06c58555536ef68aa7ae9a8f38d4cae2e50398a 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
@@ -32,7 +32,7 @@ StatusCode WriteData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteData::execute_r (const EventContext& ctx) const {
+StatusCode WriteData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
int eventNumber = ctx.eventID().event_number();
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
index 03ccdcd069173bfad313ef50a38513571547d90e..0eedbdc1d1fa2f34e361a4598caa60c32c2e8afe 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
@@ -30,7 +30,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
SG::WriteHandleKey<ExampleHitContainer> m_exampleHitKey { this, "ExampleHitKey", "MyHits" };
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
index 4d55425c6c6f33b7d491a96b0daa49ee1ca87083..d51e4620a5f2b5dfec5be20316d8df506ce5e89a 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
@@ -50,7 +50,7 @@ StatusCode WriteTag::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteTag::execute_r (const EventContext& ctx) const {
+StatusCode WriteTag::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
unsigned int eventNumber = ctx.eventID().event_number();
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
index 7d7d1006a8f36aefc5b48678f3ea1932dc138c19..874f3f5124fbc1b5aeb54ed7ef9b883116eeb0c6 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
@@ -33,7 +33,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
index a34750fb2167a47b6a75bda65eeef0c86afbe9ea..1f20118e7e8e236b0276d06be094eabddf09ca97 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
@@ -34,7 +34,7 @@ StatusCode MakeInputDataHeader::initialize() {
return(StatusCode::SUCCESS);
}
//___________________________________________________________________________
-StatusCode MakeInputDataHeader::execute_r (const EventContext& ctx) const
+StatusCode MakeInputDataHeader::execute (const EventContext& ctx) const
{
SG::ReadHandle<DataHeader> dh (m_streamName, ctx);
ATH_CHECK( dh.alias (m_aliasName) );
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
index a99cf8fc9bdb3677ae688ec3881b7cf9d3993a12..4fc503d7ac30eb890553599cced7c78d6d4fafe0 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
@@ -38,7 +38,7 @@ public:
virtual ~MakeInputDataHeader();
/// AthAlgorithm Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
index 1085be4378ff911894aa09b54255cedf6d892a7f..81783c7e1cb8dcdbf6411ae32eaa732f495547fa 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
@@ -34,7 +34,7 @@ OnlineLumiCalibrationCondAlg::initialize()
StatusCode
-OnlineLumiCalibrationCondAlg::execute_r (const EventContext& ctx) const
+OnlineLumiCalibrationCondAlg::execute (const EventContext& ctx) const
{
SG::ReadCondHandle<CondAttrListCollection> calibrationFolder
(m_calibrationFolderName, ctx);
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
index 4b3966d57342125e7b1db26e07a50893cb48b1f2..d267e68b5e2e56b7586026fdb7ce3c5faf87d86f 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
@@ -29,7 +29,7 @@ public:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
index d0ad5af704a72576fe9b83ac75adc83e03f6bb6d..3eaea94dc88902d47e7489eab7181d84c52a85f2 100644
--- a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
+++ b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
@@ -104,7 +104,7 @@ void test1 (ISvcLocator* svcloc)
ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
assert( conditionStore->record (std::move (cc1), "testcalib") );
- assert( alg.execute_r (ctx).isSuccess() );
+ assert( alg.execute (ctx).isSuccess() );
CondCont<OnlineLumiCalibrationCondData>* cc2 = nullptr;
assert( conditionStore->retrieve (cc2, "OnlineLumiCalibrationCondData").isSuccess() );
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 78301af97fd7a3f347591f4fb4065dc56a497312..c483744ceddba0dc00f690bbac7ec0346650e4e2 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -29,7 +29,7 @@ StatusCode RegSelTestAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode RegSelTestAlg::execute_r(const EventContext& /*context*/) const {
+StatusCode RegSelTestAlg::execute(const EventContext& /*context*/) const {
ATH_MSG_DEBUG ("Executing " << name() << "...");
if ( m_mt )
CHECK( mt() );
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
index 724b2a25731444ef1d822e195a0244d790370505..6ff141f9dffad3bc9318cd6ac97888b8241655ce 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
@@ -25,7 +25,7 @@ class RegSelTestAlg
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
StatusCode dump() const;
StatusCode mt() const;
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
index 4d712dc83cca66a254b9f511afed70444d0cb885..1f796ef516ac30fa6936615ceac208ad61e2b99c 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
@@ -57,7 +57,7 @@ private:
-StatusCode ROBDataProviderMTTest::execute_r( const EventContext& context ) const
+StatusCode ROBDataProviderMTTest::execute( const EventContext& context ) const
{
// will be asking for many ROBs from the list and check if all of them come from the same physical event
const RawEvent* ev = m_robDataProvider->getEvent( context );
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
index 12468b2d71dd1c04423f6261608c32fb9008d202..853641e4c39c333abc16fc3f9690174bf30c944f 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
@@ -28,7 +28,7 @@ class ROBDataProviderMTTest
//ROBDataProviderMTTest &operator=(const ROBDataProviderMTTest &alg);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& context) const override;
+ StatusCode execute(const EventContext& context) const override;
StatusCode finalize() override;
private:
diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
index cdc4b67c9f961d0a824233e0ff42ba0484e4f5bf..9ad9029219a1501730a4441811651b1387c45c52 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
@@ -59,7 +59,7 @@ namespace xAODMaker {
return StatusCode::SUCCESS;
}
- StatusCode EventInfoCnvAlg::execute_r (const EventContext& ctx) const {
+ StatusCode EventInfoCnvAlg::execute (const EventContext& ctx) const {
// Check if anything needs to be done:
// FIXME: Job configuration should be fixed so we don't need this test.
@@ -158,7 +158,7 @@ namespace xAODMaker {
ATH_MSG_DEBUG( "Preparing xAOD::EventInfo object in beginRun()" );
// Run the conversion using the execute function:
- CHECK( execute_r (Gaudi::Hive::currentContext()) );
+ CHECK( execute (Gaudi::Hive::currentContext()) );
}
// Return gracefully:
diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
index ba1887428768786d846e3f0bfde690e63c455289..40781a4634a511151bf2557a5a337d7cc5d731be 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
@@ -43,7 +43,7 @@ namespace xAODMaker {
/// Function initialising the algorithm
virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/// Function executed at the beginning of the job, once the first event
/// from the input file is already open
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
index 6fe5bd6b21169b0baa103a21deff5812dcf32f39..1e8ed9c0126c5ca8ba9eb48530f1911142305358 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
@@ -85,7 +85,7 @@ namespace xAODMaker {
}
- StatusCode xAODTruthCnvAlg::execute_r (const EventContext& ctx) const {
+ StatusCode xAODTruthCnvAlg::execute (const EventContext& ctx) const {
SG::WriteHandle<xAODTruthParticleLinkVector> truthLinkVec(m_truthLinkContainerKey, ctx);
ATH_CHECK(truthLinkVec.record(std::make_unique<xAODTruthParticleLinkVector>()));
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
index 10b3fb5c02b7864a1c93fcc6db47e6a5d3f66bad..dcdccf5d2bb25e00a7f3cb33ad4e401a8750d4ac 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
@@ -53,7 +53,7 @@ namespace xAODMaker {
/// Function initialising the algorithm
virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h b/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
index b217134a125279b3aaff0f83b84b27e7bac407a7..fcc929838aa5ed7044fbcb7e23c04700718028a3 100644
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
+++ b/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
@@ -27,7 +27,7 @@ class LUCID_DigiSettings {
double GetDigiParDouble(std::string);
int GetDigiParInt (std::string);
- void OverwriteDigiParProperties(Algorithm*);
+ void OverwriteDigiParProperties(Gaudi::Algorithm*);
void OverwriteDigiParValues();
void Print() const;
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
index 7085cc2676a40b3e4429650ae8ac9a2cb4ab63ee..37fe7480ba4c028eb40998f8bb1229448115eca9 100644
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
+++ b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
@@ -45,7 +45,7 @@ void LUCID_DigiSettings::SetDefaultValues() {
m_tdcFedNoiseFactor = 0.8;
}
-void LUCID_DigiSettings::OverwriteDigiParProperties(Algorithm* alg) {
+void LUCID_DigiSettings::OverwriteDigiParProperties(Gaudi::Algorithm* alg) {
std::map <std::string, parDouble>::iterator doubleMapIt = m_doubleMap.begin();
std::map <std::string, parInt>::iterator intMapIt = m_intMap.begin();
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
index 9d8a72ff20bed2c2c18768c200f7a797f2b52c16..45ff6f53daab16eaf0f3abfa675fbe2ca6908249 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
@@ -42,9 +42,9 @@ StatusCode MTCalibPebHypoAlg::finalize() {
}
// =============================================================================
-// Implementation of AthReentrantAlgorithm::execute_r
+// Implementation of AthReentrantAlgorithm::execute
// =============================================================================
-StatusCode MTCalibPebHypoAlg::execute_r(const EventContext& eventContext) const {
+StatusCode MTCalibPebHypoAlg::execute(const EventContext& eventContext) const {
ATH_MSG_DEBUG("Executing " << name());
// New output
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
index 81cf142d5455628ba172654025826b90d53c0a17..af8791804762b6eb53d15aa5c92729cfc8a0c0e8 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
@@ -22,7 +22,7 @@ public:
// ------------------------- AthReentrantAlgorithm methods -------------------
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& eventContext) const override;
+ virtual StatusCode execute(const EventContext& eventContext) const override;
private:
ToolHandleArray<MTCalibPebHypoTool> m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"};
};
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
index a7cee61fc80e18f282a8d26c518e300796cd89b7..bdd0ef2c8497342d9ede62875f5e1d63a102f025 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
@@ -27,7 +27,7 @@ StatusCode InDet::InDetBeamSpotReader::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode InDet::InDetBeamSpotReader::execute_r(const EventContext& ctx) const {
+StatusCode InDet::InDetBeamSpotReader::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG( "in execute()");
//get the set of
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
index 3be3e5f167a2051514311fca8c3499e139e79326..8533e0c824744c74b09df77476c8d93de6858144 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
@@ -27,7 +27,7 @@ namespace InDet {
//Standard constructor and methods
InDetBeamSpotReader (const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
index 69ed0bb97d540c1dbd12942b354c4b4029874c26..16ca558d36b213bfaaebda72b2b5fb4a5a2d3ac1 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
@@ -151,7 +151,7 @@ StatusCode SpecialPixelMapCondAlg::initialize()
return StatusCode::SUCCESS;
}
-StatusCode SpecialPixelMapCondAlg::execute_r (const EventContext& ctx) const
+StatusCode SpecialPixelMapCondAlg::execute (const EventContext& ctx) const
{
ATH_MSG_DEBUG("Entering SpecialPixelMapCondAlg");
const std::array<const SG::ReadCondHandleKey<CondAttrListCollection>*, s_max> condarray{{ &m_ConAttrList1, &m_ConAttrList2, &m_ConAttrList3, &m_ConAttrList4 }};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
index 57b77ee1dfd9da0780a99ddd3cb63b7bfcda78b8..02be8f33b188ae5768873de8540226be2fd140a2 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
@@ -23,7 +23,7 @@ class SpecialPixelMapCondAlg: public AthReentrantAlgorithm {
~SpecialPixelMapCondAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext&) const override;
+ virtual StatusCode execute (const EventContext&) const override;
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
index 312c5d863fbf39e78769860dcd9f35abcd79a0fa..d737c2760af0179732daa09c46bdf59b65ae4828 100755
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
@@ -44,7 +44,7 @@ class CaloClusterROI_Selector : public AthReentrantAlgorithm
/** @brief finalize method*/
StatusCode finalize();
/** @brief execute method*/
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
index ded679b271a645e321085a7296cca11673bbedcb..6f77152ac95dfb5412e4aaa28ddd33d0a16ff06e 100755
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
@@ -77,7 +77,7 @@ StatusCode InDet::CaloClusterROI_Selector::finalize()
}
// ======================================================================
-StatusCode InDet::CaloClusterROI_Selector::execute_r(const EventContext& ctx) const
+StatusCode InDet::CaloClusterROI_Selector::execute(const EventContext& ctx) const
{
//
// athena execute method
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
index 3e525a67b8e51768a617a7b55d86e3822304cf23..9a08f71ead06998ae915d824be9a47ccb0ac1fde 100755
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
@@ -40,7 +40,7 @@ public:
InDetExtensionProcessor(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
index ad32cae93dd9c4ffc83695af36c5614c81472c68..97414860ef42ca725d2eb0ac45745d7f8c472971 100755
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
@@ -115,7 +115,7 @@ StatusCode InDet::InDetExtensionProcessor::initialize()
//==================================================================================================
// Execute method:
-StatusCode InDet::InDetExtensionProcessor::execute_r(const EventContext& ctx) const
+StatusCode InDet::InDetExtensionProcessor::execute(const EventContext& ctx) const
{
// process the extensions
SG::ReadHandle<TrackCollection> tracks(m_trackName, ctx);
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
index 2e5411fead0b0209498487467b6e13d404a4bf2f..ed8be743ba739bcfc13116e33a498b7161250dcc 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
@@ -55,7 +55,7 @@ namespace InDet{
CacheCreator::~CacheCreator() {}
- StatusCode CacheCreator::execute_r (const EventContext& ctx) const
+ StatusCode CacheCreator::execute (const EventContext& ctx) const
{
if(!m_disableTRT) ATH_CHECK(CreateContainer(m_rioContainerCacheKey, m_pTRTHelper->straw_layer_hash_max(), ctx));
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
index 1ed4085d859a984cd51ccdcdf0244426f477442f..2f47911654d8f0ead15322f5088edfac5afaaa18 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
@@ -37,7 +37,7 @@ namespace InDet{
CacheCreator(const std::string &name,ISvcLocator *pSvcLocator);
virtual ~CacheCreator() ;
virtual StatusCode initialize () override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
//No need for finalize
protected:
const TRT_ID* m_pTRTHelper;
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
index 1ebf0e96642bd386d3bf18d9b84bcd0857e2ed9a..0f89649a0022dcf02c921fac7ea0902b4d6b0080 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
@@ -95,7 +95,7 @@ namespace InDet {
StatusCode initialize() override;
- StatusCode execute_r (const EventContext& ctx) const override;
+ StatusCode execute (const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
index 0230f094c480aa21039e853ac7b84b08cb49d6ad..6cd6c38df275455c2bfd73ecbfeb00671d283cfe 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
@@ -164,7 +164,7 @@ StatusCode SiTrackerSpacePointFinder::initialize()
//-------------------------------------------------------------------------
-StatusCode SiTrackerSpacePointFinder::execute_r (const EventContext& ctx) const
+StatusCode SiTrackerSpacePointFinder::execute (const EventContext& ctx) const
{
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
index 47abf1be458a458f7d348e886830c8bb592e28e0..27acecaf8ef6f914dc5741bd03efa59eb0eadd97 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
@@ -44,7 +44,7 @@ StatusCode InDet::ToolTester::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode InDet::ToolTester::execute_r(const EventContext &ctx) const {
+StatusCode InDet::ToolTester::execute(const EventContext &ctx) const {
// Retrieve the tracks:
SG::ReadHandle<xAOD::TrackParticleContainer> tracks(m_sgKey,ctx);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
index 08bc2a208ce1ca2c4647b9cc679427562273d204..445d5290a1de7f4fbb6ed0d4a6c119a1b326484f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
@@ -34,7 +34,7 @@ namespace InDet {
/// Function initialising the algorithm
virtual StatusCode initialize();
/// Function executing the algorithm
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
/// StoreGate key for the track container to investigate
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
index 264c084ed3b022b2b4b8ca00687a116d7278827d..fd60e199cdcf7f016a0431deb265cebdcf3644dd 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
@@ -34,7 +34,7 @@ public:
InDetDetailedTrackTruthMaker(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
index 84f3abd67dcda39c44d5dbf72e1e1adc18a6676d..83a06f5e02a16352a6b9e7cba3c71891a073b0d6 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
@@ -32,7 +32,7 @@ public:
PRD_MultiTruthMaker(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
index 9262a1c5cb52275a53ac2702d45ea2b29fc22723..eccdd3a9556a9e679e05c03a751acdbe95258b6e 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
@@ -64,9 +64,9 @@ StatusCode InDetDetailedTrackTruthMaker::finalize()
}
// -----------------------------------------------------------------------------------------------------
-StatusCode InDetDetailedTrackTruthMaker::execute_r(const EventContext &ctx) const
+StatusCode InDetDetailedTrackTruthMaker::execute(const EventContext &ctx) const
{
- ATH_MSG_DEBUG ("InDetDetailedTrackTruthMaker::execute_r(...)");
+ ATH_MSG_DEBUG ("InDetDetailedTrackTruthMaker::execute(...)");
//----------------------------------------------------------------
// Retrieve track collection
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
index 060e76998f8784d9dd3ba236e0488521fb4b0de8..5fd65d0558e30ef7cda172a6aea4c687afd86851 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
@@ -81,7 +81,7 @@ StatusCode PRD_MultiTruthMaker::finalize()
}
// -----------------------------------------------------------------------------------------------------
-StatusCode PRD_MultiTruthMaker::execute_r(const EventContext &ctx) const {
+StatusCode PRD_MultiTruthMaker::execute(const EventContext &ctx) const {
ATH_MSG_DEBUG ("PRD_MultiTruthMaker::execute()");
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
index 5aa001129a2d33d01169ebe8d8da1536455585a2..c986a0642bb8ce92abed5e2182001155641257f0 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
@@ -32,7 +32,7 @@
InDetPhysHitDecoratorAlg::InDetPhysHitDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator),
+ AthReentrantAlgorithm(name,pSvcLocator),
m_holeSearchTool("InDet::InDetTrackHoleSearchTool"),
m_updatorHandle("Trk::KalmanUpdator/TrkKalmanUpdator"),
m_residualPullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator"),
@@ -109,15 +109,9 @@ InDetPhysHitDecoratorAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode
-InDetPhysHitDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
// to migrate to AthReentrantAlgorithm later
StatusCode
-InDetPhysHitDecoratorAlg::execute_r(const EventContext &ctx) const {
+InDetPhysHitDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TrackParticleContainer> ptracks(m_trkParticleName);
if ((not ptracks.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
index b1f08b4df07edcb7d79915fc43577bf96ae55a9e..8a95ee1049720f29c80cfb4ced9fc9e8985509ed 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
@@ -12,7 +12,7 @@
**/
// STL includes
#include <string>
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "StoreGate/WriteDecorHandle.h"
@@ -33,7 +33,7 @@ namespace Trk {
// class to decorate xAOD::TruthParticles with additional information required by validation
-class InDetPhysHitDecoratorAlg: public AthAlgorithm {
+class InDetPhysHitDecoratorAlg: public AthReentrantAlgorithm {
public:
// L0PIXBARR : layer0 of pixel barrel (IBL in Run2)
// PIXEL : in barrel all layers appart from layer0. In end-caps all disks/rings.
@@ -48,8 +48,7 @@ public:
~InDetPhysHitDecoratorAlg ();
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute() override;
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
index b6f1a3e804214b6704607123ed3d0ba739e50834..454606b041994f9c6709dd90ce0fa308a16386ab 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
@@ -27,7 +27,7 @@
InDetPhysValTruthDecoratorAlg::InDetPhysValTruthDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
+ AthReentrantAlgorithm(name, pSvcLocator),
m_beamSpotSvc("BeamCondSvc", name) {
}
@@ -71,14 +71,7 @@ InDetPhysValTruthDecoratorAlg::finalize() {
}
StatusCode
-InDetPhysValTruthDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
-// to migrate to AthReentrantAlgorithm later
-StatusCode
-InDetPhysValTruthDecoratorAlg::execute_r(const EventContext &ctx) const {
+InDetPhysValTruthDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TruthParticleContainer> ptruth(m_truthParticleName);
if ((not ptruth.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
index 6a9ad9d4475c0cfa3324fa9d7629daad8ebfc2c5..11202a332889309cb371295bb057c9979ad01088 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
@@ -13,7 +13,7 @@
// STL includes
#include <string>
#include "xAODTruth/TruthParticleContainer.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "TrkExInterfaces/IExtrapolator.h"
@@ -29,17 +29,14 @@
class IBeamCondSvc;
// class to decorate xAOD::TruthParticles with additional information required by validation
-class InDetPhysValTruthDecoratorAlg: public AthAlgorithm {
+class InDetPhysValTruthDecoratorAlg: public AthReentrantAlgorithm {
public:
InDetPhysValTruthDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator);
virtual
~InDetPhysValTruthDecoratorAlg ();
virtual StatusCode initialize();
virtual StatusCode finalize();
- virtual StatusCode execute() override;
-
- // to migrate to AthReentrantAlgorithm later
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool decorateTruth(const xAOD::TruthParticle& particle,
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
index f8d5d429ee12d5756a2c00d11e345fb62695048f..0f7ebce677ff7f983860e9bde493d00e0d943e19 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
@@ -44,7 +44,7 @@ ParameterErrDecoratorAlg::finalize() {
}
StatusCode
-ParameterErrDecoratorAlg::execute_r(const EventContext &ctx) const {
+ParameterErrDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TrackParticleContainer> ptracks(m_trkParticleName);
if ((not ptracks.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
index a9850f563f07cb90e003758f3ef4ee3429fa19b3..02ad809325d407a51bcac8acb3cd10e668d9d6aa 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
@@ -28,7 +28,7 @@ public:
~ParameterErrDecoratorAlg();
virtual StatusCode initialize();
virtual StatusCode finalize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
virtual bool decorateTrack(const xAOD::TrackParticle& particle,
std::vector< SG::WriteDecorHandle<xAOD::TrackParticleContainer,float> > &float_decor) const;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
index 5a83ab72e827e7e751cec6ba65496e905aac0b36..dcc8674da31f1f9ba0bf34efca0f358843f59b7a 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
@@ -13,7 +13,7 @@
TruthClassDecoratorAlg::TruthClassDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator)
+ AthReentrantAlgorithm(name,pSvcLocator)
{
}
@@ -37,15 +37,9 @@ TruthClassDecoratorAlg::finalize() {
}
-StatusCode
-TruthClassDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
// to migrate to AthReentrantAlgorithm later
StatusCode
-TruthClassDecoratorAlg::execute_r(const EventContext &ctx) const {
+TruthClassDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TruthParticleContainer> ptruth(m_truthParticleName);
if ((not ptruth.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
index 8284785db4e209099c4b96de0f0488b6d3e028a8..2cb5b6b9d0c73968da18d1947bd651cf578bbd34 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
@@ -13,7 +13,7 @@
// STL includes
#include <string>
#include "xAODTruth/TruthParticleContainer.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
#include "StoreGate/WriteDecorHandleKey.h"
@@ -24,7 +24,7 @@
#include "InDetPhysValMonitoring/IAthSelectionTool.h"
// class to decorate xAOD::TruthParticles with type and origin, required by validation
-class TruthClassDecoratorAlg: public AthAlgorithm {
+class TruthClassDecoratorAlg: public AthReentrantAlgorithm {
public:
TruthClassDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~TruthClassDecoratorAlg () {/*nop*/
@@ -32,10 +32,7 @@ public:
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute() override;
-
- // to migrate to AthReentrantAlgorithm later
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool decorateTruth(const xAOD::TruthParticle& particle,
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
index 2c5e0093f483da0bc5efda104b76cba2514c7b63..a90bdc2c0dd158fcb1fe14f46978fecbfbbf1290 100755
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
@@ -85,7 +85,7 @@ namespace InDet {
TrackClusterAssValidation(const std::string &name, ISvcLocator *pSvcLocator);
virtual ~TrackClusterAssValidation() {}
StatusCode initialize();
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
StatusCode finalize();
protected:
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
index 8e4affef115d6f289d91aa5941f38d9c867a3732..17649691cbed6963ac4f4751aa9b942f21b75aba 100755
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
@@ -144,7 +144,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize()
// Execute
///////////////////////////////////////////////////////////////////
-StatusCode InDet::TrackClusterAssValidation::execute_r(const EventContext& ctx) const
+StatusCode InDet::TrackClusterAssValidation::execute(const EventContext& ctx) const
{
if(!m_usePIX && !m_useSCT) return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
index f896325e29e459a686c63266d47a8f4652b0e03b..770427d5a4a667ba9ef0227f44d4e16d0a7879ab 100755
--- a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
@@ -58,7 +58,7 @@ namespace InDet {
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
index 1e40a80f9123325f7ea57d963a947027a6224ecf..6fd969ce5e6185c299862832f5be9380196da921 100644
--- a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
@@ -35,7 +35,7 @@ public:
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
index 6186436a7cbcd0ff6f02874f34d13e63b9eeabe8..6322b581f67aaae23f2caf45a316f14f4823bb91 100755
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
@@ -154,7 +154,7 @@ StatusCode HoleSearchValidation::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HoleSearchValidation::execute_r(const EventContext& ctx) const {
+StatusCode HoleSearchValidation::execute(const EventContext& ctx) const {
std::array<bool,Parts::kNParts> remove_parts;
for (unsigned int part_i=0; part_i<Parts::kNParts; ++part_i) {
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
index 4376a4523bb9197cd3f4bf269e6160bbb8ac9fe5..cd5604f465281c1614aaa478b67e5a36df682d64 100644
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
@@ -47,7 +47,7 @@ StatusCode InDet::InDetSplittedTracksCreator::initialize(){
return StatusCode::SUCCESS;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode InDet::InDetSplittedTracksCreator::execute_r(const EventContext& ctx) const {
+StatusCode InDet::InDetSplittedTracksCreator::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("InDetSplittedTracksCreator execute()");
ATH_MSG_DEBUG("Input Track Collection: " << m_TrackCol);
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
index 751ba1962a14331bc79fe374595c96373eb57af3..af1babc4fc48dac2246b0ca79dd8d7a261f0f8b0 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
@@ -34,7 +34,7 @@ StatusCode LArNoisyROAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode LArNoisyROAlg::execute_r (const EventContext& ctx) const
+StatusCode LArNoisyROAlg::execute (const EventContext& ctx) const
{
SG::ReadHandle<CaloCellContainer> cellContainer(m_CaloCellContainerName, ctx);
if (!cellContainer.isValid()) {
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
index 9ada3ebafcd6e3014e1647dd470d7d974d7d10f5..1f706dcdffa919ec7670471d19d9398f21fd3c84 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
@@ -35,7 +35,7 @@ class LArNoisyROAlg : public AthReentrantAlgorithm
LArNoisyROAlg(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
index 822c0f0568076b238eaa9d6f5ff3467029e2a2c8..d03908a402acd8c1977b96f79a2b50d0588560b3 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
@@ -45,7 +45,7 @@ StatusCode LArTimeVetoAlg::finalize()
}
//__________________________________________________________________________
-StatusCode LArTimeVetoAlg::execute_r( const EventContext& ctx ) const
+StatusCode LArTimeVetoAlg::execute( const EventContext& ctx ) const
{
ATH_MSG_DEBUG("LArTimeVetoAlg execute()");
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
index e4e5478e324382fc3ae877f39e14acee61d79901..87a34c39a99ed3e9de19eeacb6ed58dfa625dea7 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
@@ -24,7 +24,7 @@ class LArTimeVetoAlg : public AthReentrantAlgorithm {
~LArTimeVetoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h b/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
index aaf8ce4129d8fedf0eca5f807a75bfd96c36b592..31759dd1c341bde17cd202c0541794f8a36fd77f 100755
--- a/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
+++ b/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
@@ -43,7 +43,7 @@ class LArDigitThinnerFromEMClust : public AthReentrantAlgorithm
~LArDigitThinnerFromEMClust();
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx b/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
index 0f9a71a8ded823ac7117d449efa33543b30e62aa..0c7bf3cceadb55bdf43f84ba20fee87d3414a8f7 100755
--- a/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
+++ b/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
@@ -47,7 +47,7 @@ StatusCode LArDigitThinnerFromEMClust::finalize() {
}
-StatusCode LArDigitThinnerFromEMClust::execute_r(const EventContext& ctx) const {
+StatusCode LArDigitThinnerFromEMClust::execute(const EventContext& ctx) const {
//Get inputs from read handles:
SG::ReadHandle<LArDigitContainer> inputContainer(m_inputContainerKey,ctx);
diff --git a/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h b/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
index 069d42705444edc197f3b66c909cda20f371ddbc..e8b4b4081cc787e6bd8095af25f708088865d00c 100755
--- a/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
+++ b/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
@@ -43,7 +43,7 @@ class LArDigitThinner : public AthReentrantAlgorithm
~LArDigitThinner();
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
index cc4921c3d9d6d675aa9d0c985d79e46abdd95c80..f393c21811a28243d2c75a829b83a5ffac2a5a9f 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
@@ -30,7 +30,7 @@ class LArRawChannelBuilderAlg : public AthReentrantAlgorithm {
LArRawChannelBuilderAlg(const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/LArCalorimeter/LArROD/src/LArDigitThinner.cxx b/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
index 578b6eb4aad197a3fa3787f0a796133b27bbb2cb..48f23506b33132bcf7f47c0e6d8295596f4bcb59 100755
--- a/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
+++ b/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
@@ -136,7 +136,7 @@ StatusCode LArDigitThinner::finalize()
}
-StatusCode LArDigitThinner::execute_r(const EventContext& ctx) const {
+StatusCode LArDigitThinner::execute(const EventContext& ctx) const {
initCutValues(ctx); //Should return right away if the cut values are already initialized
diff --git a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
index fe5bf88b8e83cc027a8669ae8b885403a68bcdc3..06a86f4a7eebeb9bdd187376638db4543b278234 100644
--- a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
+++ b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
@@ -30,7 +30,7 @@ StatusCode LArRawChannelBuilderAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode LArRawChannelBuilderAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArRawChannelBuilderAlg::execute(const EventContext& ctx) const {
//Get event inputs from read handles:
SG::ReadHandle<LArDigitContainer> inputContainer(m_digitKey,ctx);
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
index 646e08e20c7c4903f1d7cdea3e0df3a6f5ec290d..56284850ad2ed0465d156d7ab188e647de8c7566 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
@@ -127,7 +127,7 @@ StatusCode LArHVCondAlg::initialize(){
}
-StatusCode LArHVCondAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArHVCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("executing");
bool doHVData=false;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
index b715569aa23a2e498668697666303d7ad6b65c52..b69427da2f8386b3d278b4c1a96c1d3aaeb7eb0b 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
@@ -55,7 +55,7 @@ class LArHVCondAlg: public AthReentrantAlgorithm
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
private:
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
index 4312ee307aa59877751bbc559f517e19196a03da..6c20c20337a8b89f3bc012e163b2671f3fdf9a2c 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
@@ -109,7 +109,7 @@ AthenaAttributeList* LArHVPathologyDbCondAlg::hvPathology2AttrList(const LArHVPa
}
*/
-StatusCode LArHVPathologyDbCondAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArHVPathologyDbCondAlg::execute(const EventContext& ctx) const {
SG::WriteCondHandle<LArHVPathology > writeHandle{m_hvPAthologyKey, ctx};
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
index 5006fd67d1bab0a64d5e5057f88360723417e878..95c034f44fff15a33dc3e4113eeb82cbb67b4f40 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
@@ -31,7 +31,7 @@ class LArHVPathologyDbCondAlg: public AthReentrantAlgorithm
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
private:
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
index fbbb7eda3ec48a56e424f1307f7effd6510bd9bb..00741af01daf2d686afaabaeab4bf1baf37dd76e 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
@@ -20,7 +20,7 @@ class MSVertexRecoAlg : public AthReentrantAlgorithm
~MSVertexRecoAlg();
StatusCode initialize() override;
- StatusCode execute_r (const EventContext& ctx) const override;
+ StatusCode execute (const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
index b0b5a2c344ad561b4095b9ffb32684153ad18110..3d9b0d6be1eb104b2c329125a0fbb6291123a653 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
@@ -48,7 +48,7 @@ StatusCode MSVertexRecoAlg::initialize(){
//** ----------------------------------------------------------------------------------------------------------------- **//
-StatusCode MSVertexRecoAlg::execute_r (const EventContext& ctx) const {
+StatusCode MSVertexRecoAlg::execute (const EventContext& ctx) const {
std::vector<Tracklet> tracklets;
std::vector<MSVertex*> vertices;
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
index 5476ffa4470b7ad931b3421b6fa8b342262b3e95..acbf504a1a370bdbebf9ee6cf50bef21088b95f8 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/IAddressCreator.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIoComponent.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
#include <map>
#include <vector>
@@ -30,7 +30,7 @@ class TTree;
class TBranch;
class AANTupleStream : virtual public IIoComponent,
- public AthAlgorithm
+ public AthLegacySequence
{
public:
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index c6199a7623b72a180a5888ca14963e64d85f8589..4375cdd5c952e2d297109d42bcdb0e003b83641a 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -47,7 +47,7 @@ using namespace AANTupleParams;
// Standard Constructor
AANTupleStream::AANTupleStream(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
+ : AthLegacySequence(name, pSvcLocator),
m_persSvc ("EventPersistencySvc", name),
m_attribSpec(0),
m_schemaDone(false),
@@ -153,8 +153,8 @@ StatusCode AANTupleStream::initialize()
}
ATH_MSG_DEBUG ("End initialize ");
-
- return StatusCode::SUCCESS;
+
+ return AthLegacySequence::initialize();
}
@@ -195,7 +195,7 @@ StatusCode AANTupleStream::finalize()
gDirectory->cd(curDir.c_str());
}
- return StatusCode::SUCCESS;
+ return AthLegacySequence::finalize();
}
@@ -606,6 +606,8 @@ StatusCode AANTupleStream::execute_subAlgos()
ATH_MSG_DEBUG ("in execute_subAlgos() ...");
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// -- run subalgorithms
for ( unsigned int i=0; i < m_membersNames.size(); ++i )
{
@@ -613,7 +615,7 @@ StatusCode AANTupleStream::execute_subAlgos()
// skip disabled algo
if (! (*(this->subAlgorithms()))[i]->isEnabled()) continue ;
- sc = (*(this->subAlgorithms()))[i]->execute();
+ sc = (*(this->subAlgorithms()))[i]->execute(ctx);
if ( sc.isFailure())
{
ATH_MSG_ERROR
@@ -695,14 +697,17 @@ bool AANTupleStream::isEventAccepted() const
// no filter
if (m_acceptAlgs.empty())
return true;
-
+
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// loop over all algs
std::vector<Algorithm*>::const_iterator it;
std::vector<Algorithm*>::const_iterator itend = m_acceptAlgs.end();
for (it = m_acceptAlgs.begin(); it != itend; ++it)
{
const Algorithm* theAlgorithm = (*it);
- if ( theAlgorithm->isExecuted() && (! theAlgorithm->filterPassed()))
+ if ( theAlgorithm->execState(ctx).state() == AlgExecState::State::Done &&
+ ( ! theAlgorithm->execState(ctx).filterPassed() ) )
return false;
}
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
index f103251e46e3902be4f6a653ca395526d1e01c13..6c7ce63a88aa924f5666a36580209f55250089f1 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
@@ -74,13 +74,13 @@ StatusCode PrimaryDPDPrescaler::initialize()
//Print summary info and declare all child filters to CutFlwSvc
ATH_MSG_DEBUG( "Accept Algs, Size: " << m_theAcceptAlgs.size() << " Empty: " << m_theAcceptAlgs.empty() );
- for(std::vector<Algorithm*>::iterator i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i) {
+ for(std::vector<Gaudi::Algorithm*>::iterator i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i) {
ATH_MSG_DEBUG( (*i)->name() );
cutFlowSvc()->registerCut((*i)->name(), "", cutID());
}
ATH_MSG_DEBUG( "Require Algs, Size: " << m_theRequireAlgs.size() << " Empty: " << m_theRequireAlgs.empty() );
- for(std::vector<Algorithm*>::iterator i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i) {
+ for(std::vector<Gaudi::Algorithm*>::iterator i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i) {
ATH_MSG_DEBUG( (*i)->name() );
cutFlowSvc()->registerCut((*i)->name(), "", cutID());
}
@@ -270,7 +270,7 @@ void PrimaryDPDPrescaler::handle(const Incident& inc) {
//__________________________________________________________________________
-StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Algorithm*> *theAlgs)
+StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Gaudi::Algorithm*> *theAlgs)
{
// Reset the list of Algorithms
theAlgs->clear( );
@@ -291,21 +291,21 @@ StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgName
// Algorithm object.
const std::string& theName = (*it);
IAlgorithm* theIAlg;
- Algorithm* theAlgorithm;
+ Gaudi::Algorithm* theAlgorithm;
result = theAlgMgr->getAlgorithm( theName, theIAlg );
if ( result.isSuccess( ) ) {
try{
- theAlgorithm = dynamic_cast<Algorithm*>(theIAlg);
+ theAlgorithm = dynamic_cast<Gaudi::Algorithm*>(theIAlg);
} catch(...){
result = StatusCode::FAILURE;
}
}
if ( result.isSuccess( ) ) {
// Check that the specified algorithm doesn't already exist in the list
- std::vector<Algorithm*>::iterator ita;
- std::vector<Algorithm*>::iterator itaend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator ita;
+ std::vector<Gaudi::Algorithm*>::iterator itaend = theAlgs->end( );
for (ita = theAlgs->begin(); ita != itaend; ita++) {
- Algorithm* existAlgorithm = (*ita);
+ Gaudi::Algorithm* existAlgorithm = (*ita);
if ( theAlgorithm == existAlgorithm ) {
result = StatusCode::FAILURE;
break;
@@ -332,7 +332,7 @@ StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgName
//__________________________________________________________________________
bool PrimaryDPDPrescaler::isEventAccepted()
{
- typedef std::vector<Algorithm*>::iterator AlgIter;
+ typedef std::vector<Gaudi::Algorithm*>::iterator AlgIter;
bool result = true;
// Loop over all Algorithms in the accept list to see
@@ -352,6 +352,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
bool passRequireAlgs(true);
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// Accept Algs (OR)
bool isPassed(false);
if ( m_theAcceptAlgs.empty() )
@@ -360,7 +362,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
}
for(AlgIter i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i)
{
- if ( (*i)->isExecuted() && (*i)->filterPassed() )
+ if ( (*i)->execState(ctx).state() == AlgExecState::State::Done &&
+ (*i)->execState(ctx).filterPassed() )
{
isPassed = true;
break;
@@ -373,7 +376,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
bool isFailed(false);
for(AlgIter i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i)
{
- if ( (*i)->isExecuted() && !(*i)->filterPassed() )
+ if ( (*i)->execState(ctx).state() == AlgExecState::State::Done &&
+ ! (*i)->execState(ctx).filterPassed() )
{
isFailed = true;
break;
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
index 90b76e6e7f61aba8510c341a48bc6f5079a4ef1a..759de6ede7e7bd1b6435e780f730340f806caee4 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
@@ -46,7 +46,7 @@ public:
// Private methods
private:
- StatusCode decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Algorithm*> *theAlgs);
+ StatusCode decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Gaudi::Algorithm*> *theAlgs);
bool isEventAccepted();
void ResetSelfDescription();
@@ -78,10 +78,10 @@ private:
double m_prescale;
/// List of algorithms to combine with logical OR
- std::vector<Algorithm*> m_theAcceptAlgs;
+ std::vector<Gaudi::Algorithm*> m_theAcceptAlgs;
/// List of algorithms to combine with logical AND
- std::vector<Algorithm*> m_theRequireAlgs;
+ std::vector<Gaudi::Algorithm*> m_theRequireAlgs;
/// List of algorithms names to combine with logical OR
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 8e6da56d3719325b70e94448557f1fe64750a4bd..6ef7f9b82ab2bfc02891e25f8d25aa252727cdc4 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.15
# The version of atlas/Gaudi to use:
-GaudiVersion = v30r5.003
+GaudiVersion = v31r0.000
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 3d7575d135ab79d071cf57f3c2418c25acd361f3..9527c8037d384bb5a54beb38cb7d466c0b0c4ce9 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.15
# The version of atlas/Gaudi to use:
-GaudiVersion = v30r5.003
+GaudiVersion = v31r0.000
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 0bc39015a1adde3d90f5ac8d0bdf4bed8d6f96ee..2c431ffaabe675392dcbe21e3af287dd3cff3724 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -64,3 +64,7 @@
# Don't build PerfMonVTune which has external Intel tool dependency
- Control/PerformanceMonitoring/PerfMonVTune
+
+# Old packages that don't work with AthenaMT
+- LArCalorimeter/LArSim
+- PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
diff --git a/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx b/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
index 8578113b765cb44ea6632dadba503f478862e142..347e5f2fc3d7f60867188c3e3f8ab86874b11a22 100644
--- a/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
+++ b/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
@@ -62,7 +62,7 @@ namespace met {
//**********************************************************************
- StatusCode METReaderAlg::execute_r (const EventContext& ctx) const{
+ StatusCode METReaderAlg::execute (const EventContext& ctx) const{
ATH_MSG_VERBOSE("Executing " << name() << "...");
// Loop over tools.
diff --git a/Reconstruction/MET/METReconstruction/src/METReaderAlg.h b/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
index 932ccc688b4f6427dac08d5d9d619df1a8f8ddbe..befc14ef5d587aea94cbd9ac96fd6c73ec343fd2 100644
--- a/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
+++ b/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
@@ -26,7 +26,7 @@ namespace met {
/// Athena algorithm's Hooks
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
index 125240dd1a231878fd79e62b7b7b225c37a99b00..fb4b6e926cd776650912d5c45ee13f428f7d108f 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
@@ -73,7 +73,7 @@ namespace ClusterMatching {
return StatusCode::SUCCESS;
}
- StatusCode CaloClusterMatchLinkAlg::execute_r(const EventContext& ctx) const
+ StatusCode CaloClusterMatchLinkAlg::execute(const EventContext& ctx) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
index b0db9fb7dfd46eea58cc5852f9a5c341f5bf0954..2cc19713aa61d1a96a7bc47f865503f79f8632d6 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
@@ -44,7 +44,7 @@ namespace ClusterMatching {
// Athena algorithm's Hooks
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const;
virtual StatusCode finalize();
///////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
index a021c920ee85a9108c96a9fdf5f6db74e2a15902..d50a56161fcf3712a8e599ac8f58c702fa209205 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
@@ -91,7 +91,7 @@ StatusCode egammaForwardBuilder::finalize()
}
// ======================================================================
-StatusCode egammaForwardBuilder::execute_r(const EventContext& ctx) const
+StatusCode egammaForwardBuilder::execute(const EventContext& ctx) const
{
ATH_MSG_DEBUG("Executing egammaForwardBuilder ");
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
index babf2d4e0b3b32f950fd8d70614162be314e9f56..9af4efff34b8ecca4fca849e374789b11d099dae 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
@@ -60,7 +60,7 @@ class egammaForwardBuilder : public AthReentrantAlgorithm
/** @brief finalize method*/
virtual StatusCode finalize() override final;
/** @brief execute method*/
- virtual StatusCode execute_r(const EventContext& ctx) const override final;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
private:
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
index 95fdb681f65f87b81e0181d422e5a00cf62c4196..e571a700fb7366b0f672b7a108a6238b714a3ccc 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
@@ -62,7 +62,7 @@ StatusCode egammaTopoClusterCopier::finalize() {
}
// =========================================================================
-StatusCode egammaTopoClusterCopier::execute_r(const EventContext& ctx) const {
+StatusCode egammaTopoClusterCopier::execute(const EventContext& ctx) const {
SG::ReadHandle<xAOD::CaloClusterContainer> inputTopoclusters(m_inputTopoCollection, ctx);
SG::WriteHandle<xAOD::CaloClusterContainer> outputTopoclustersShallow(m_outputTopoCollectionShallow, ctx);
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
index 4966225d026880cc97147e03ae4d8bfe3bf86c95..3daa1124432952d0a3f4485eca83d38a7b348649 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
@@ -23,7 +23,7 @@ class egammaTopoClusterCopier : public AthReentrantAlgorithm {
/** @brief initialize method */
virtual StatusCode initialize() override final;
/** @brief execute on container */
- virtual StatusCode execute_r(const EventContext& ctx) const override final;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
/** @brief finalize method */
virtual StatusCode finalize() override final;
diff --git a/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h b/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
index c84ebd79f358fc9e44ce09212fd75c844ed25d0a..efda43314d69d54dd6cb37ecb1053403727048f0 100755
--- a/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
+++ b/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
@@ -26,7 +26,7 @@ public:
StatusCode initialize() override;
StatusCode finalize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
private:
SG::ReadHandleKey<TrackRecordCollection> m_inputKey;
diff --git a/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx b/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
index d0002f3986f571114e37a2d1e0be59757ea2b432..7dbd73b229c10bb23cefb19c51c1a76c186375c8 100755
--- a/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
+++ b/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
@@ -43,7 +43,7 @@ StatusCode TrackRecordFilter::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode TrackRecordFilter::execute_r(const EventContext& ctx) const {
+StatusCode TrackRecordFilter::execute(const EventContext& ctx) const {
// Get message service
ATH_MSG_DEBUG ( "TrackRecordFilter::execute()" );
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.cxx b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
index f10becf0d506dece97304217cb0f12bff0fa2c8e..2ebd155c0aef66271b2a518a12a53203f556d47d 100644
--- a/TestBeam/TBRec/src/TBAlgoSequencer.cxx
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
@@ -16,7 +16,7 @@
TBAlgoSequencer::TBAlgoSequencer(const std::string& name,
ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator)
+ ::AthLegacySequence ( name, pSvcLocator )
, m_timingOn(true)
, m_eventPrintFreq(100)
, m_eventCounter(0)
@@ -56,7 +56,7 @@ TBAlgoSequencer::initialize()
! registerAlgs.isFailure() )
{
ListItem theAlgItem(*subAlgos);
- Algorithm* theAlgo;
+ Gaudi::Algorithm* theAlgo;
registerAlgs = createSubAlgorithm(theAlgItem.type(),theAlgItem.name(),
theAlgo);
if ( ! registerAlgs.isFailure() && theAlgo != 0 )
@@ -93,9 +93,14 @@ TBAlgoSequencer::initialize()
m_rejectPattern.clear();
- return numberOfAlgorithms > 0
- ? StatusCode::SUCCESS
- : StatusCode::FAILURE;
+ // return numberOfAlgorithms > 0
+ // ? StatusCode::SUCCESS
+ // : StatusCode::FAILURE;
+
+ if (numberOfAlgorithms == 0) return StatusCode::FAILURE;
+
+ return AthLegacySequence::initialize();
+
}
/////////////
@@ -137,12 +142,14 @@ TBAlgoSequencer::execute()
AlgoIterator algoCounter = m_subAlgos.begin();
StatusCode executeAlgs;
+ const EventContext& ctx = getContext();
+
unsigned int algoIndex = 0;
while ( ! executeAlgs.isFailure() && algoCounter != m_subAlgos.end() )
{
// execute the algorithm
if ( m_timingOn ) theTicker->chronoStart(m_algoNameStore[algoIndex]);
- executeAlgs = (*algoCounter)->execute();
+ executeAlgs = (*algoCounter)->execute(ctx);
if ( m_timingOn ) theTicker->chronoStop(m_algoNameStore[algoIndex]);
// failure/reject
if ( executeAlgs.isFailure() )
@@ -264,6 +271,7 @@ TBAlgoSequencer::finalize()
ATH_MSG_INFO
( "======================================================== " );
- return StatusCode::SUCCESS;
+
+ return AthLegacySequence::finalize();
}
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.h b/TestBeam/TBRec/src/TBAlgoSequencer.h
index d21fcdf5dd80e486297b4d152639775d7351839e..1566142c148018f0f3078b3efaa3f46cf879aa65 100755
--- a/TestBeam/TBRec/src/TBAlgoSequencer.h
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.h
@@ -11,7 +11,8 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
+
#include <string>
#include <vector>
@@ -19,11 +20,11 @@
class StoreGateSvc;
-class TBAlgoSequencer : public AthAlgorithm
+class TBAlgoSequencer : public AthLegacySequence
{
typedef std::string KeyType;
- typedef std::vector<Algorithm*> AlgoStore;
+ typedef std::vector<Gaudi::Algorithm*> AlgoStore;
typedef AlgoStore::iterator AlgoIterator;
public:
diff --git a/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h b/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
index 7ad48b8a60f1292784f97e54112cb81c8b41a6ee..af6181678c78a3bb4e52f04a2649e090891f8273 100755
--- a/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
+++ b/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
@@ -48,7 +48,7 @@ class TileLookForMuAlg: public AthReentrantAlgorithm {
virtual ~TileLookForMuAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
diff --git a/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx b/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
index 89571a11404d25e2c8ea327d5b245ef6a04e1b0f..01e677edb703ec279ea516d61efd56bb0cfaf9c9 100755
--- a/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
+++ b/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
@@ -100,7 +100,7 @@ StatusCode TileLookForMuAlg::initialize() {
/////////////////////////////////////////////////////////////////////////////////
//Execution /
/////////////////////////////////////////////////////////////////////////////////
-StatusCode TileLookForMuAlg::execute_r (const EventContext& ctx) const {
+StatusCode TileLookForMuAlg::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("TileLookForMuAlg execution started");
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
index 977e4f640ddd936bb5b2c2713ac56978e3a523bd..f65eabf31d87a8a4c44d68571590897a6b565c4c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
@@ -40,7 +40,7 @@ StatusCode TileBeamElemDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileBeamElemDumper::execute_r (const EventContext& ctx) const
+StatusCode TileBeamElemDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
index 9dcf3b0b64d15b83279a9a0d945ea8b60b0a362f..2cc0c353cd1d524a107b9d848d0057e880040ec9 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
index 562eececf444d418f1752ec1895bbe7924bca9f3..3b259a007585ccbdedd00360e534629feb267c0d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
@@ -55,7 +55,7 @@ StatusCode TileDQstatusAlg::initialize()
* @brief Gaudi execute method.
* @param ctx Event context.
*/
-StatusCode TileDQstatusAlg::execute_r (const EventContext& ctx) const
+StatusCode TileDQstatusAlg::execute (const EventContext& ctx) const
{
auto dqstatus = std::make_unique<TileDQstatus>();
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
index 29385046411b961ada01aa7e493b3451101eaa80..59d669ff21a49ec0ea5773f263bcbf13dabb2299 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
@@ -56,7 +56,7 @@ public:
* @brief Gaudi execute method.
* @param ctx Event context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
index 4584e32a62284f821dfb3437164195da32e98b7b..6c5e1cb20238e4f01c0606a79776f11f3a152661 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
@@ -43,7 +43,7 @@ StatusCode TileDigitsDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileDigitsDumper::execute_r (const EventContext& ctx) const
+StatusCode TileDigitsDumper::execute (const EventContext& ctx) const
{
if (!m_altContKey.key().empty()) {
SG::ReadHandle<TileDigitsContainer> altCont (m_altContKey, ctx);
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
index 501efd757fafbb9bca604cd30571c6c1d84a4a57..6a21a149ae025319b0adb2863a530459f1b89b20 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
index 8a731996b690668dc72f9b8f4b1166c3d808f33d..e3f84153fd5cd46297ef3a9cab3f13178e1c56ae 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
@@ -40,7 +40,7 @@ StatusCode TileL2Dumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileL2Dumper::execute_r (const EventContext& ctx) const
+StatusCode TileL2Dumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
index 368379badfd1c636a38180bcfcfcd7ad7c085a61..d5c5a310a528b64aafe2b01d84b15c1d01b02e1c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
index c969c075ea18423f236276109e5a921ef759a8d5..da2754dc514eab0dd8ecacfe5bff018ea21dcc8b 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
@@ -41,7 +41,7 @@ StatusCode TileLaserObjectDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileLaserObjectDumper::execute_r (const EventContext& ctx) const
+StatusCode TileLaserObjectDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
index c953c0a2308182bd907a456dd9f60de0c689e683..ad458a8eda303683f856d85fac7d34258b5335ad 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
index d676d51ba1241f1e94b82e7c16e202b0cff8ded6..faf244c0cb9c1c5ab7c79cae06657cec3ec1fe03 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
@@ -41,7 +41,7 @@ StatusCode TileMuonReceiverDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileMuonReceiverDumper::execute_r (const EventContext& ctx) const
+StatusCode TileMuonReceiverDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
index 9af75e8b83cae941d92f6c45cd02d85d087bbb95..ad56a6e270a16dd67a9866d3cddd4c4ec58a0610 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
index 4879ff2be1024880ef18d6796803b6adb4ca47b0..0995c768dde11a3fcc4db3b7a2f94f3277ffc2b4 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
@@ -43,7 +43,7 @@ StatusCode TileRawChannelDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileRawChannelDumper::execute_r (const EventContext& ctx) const
+StatusCode TileRawChannelDumper::execute (const EventContext& ctx) const
{
if (!m_altContKey.key().empty()) {
SG::ReadHandle<TileRawChannelContainer> altCont (m_altContKey, ctx);
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
index 2e6e0fa0b5907752d563a05d03a53e4c4eac4065..0d27cd0b598d923bb887c0f904bce77f015851ba 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Tools/PyUtils/python/scripts/gen_klass.py b/Tools/PyUtils/python/scripts/gen_klass.py
index 6dfe33145024f4cf249233a708e9b16559f1cebb..8b76c4c07907d0a43f01f5f758883f2c09b5e1dd 100644
--- a/Tools/PyUtils/python/scripts/gen_klass.py
+++ b/Tools/PyUtils/python/scripts/gen_klass.py
@@ -269,7 +269,7 @@ public:
virtual ~%(klass)s() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
@@ -306,7 +306,7 @@ StatusCode %(klass)s::finalize()
return StatusCode::SUCCESS;
}
-StatusCode %(klass)s::execute_r(const EventContext& context) const
+StatusCode %(klass)s::execute(const EventContext& context) const
{
return StatusCode::SUCCESS;
}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index 804781a38aa82fca8aca5ae6259e5038a1925493..8199f5b18be8772ded74582195f383c91f6b7777 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -51,7 +51,7 @@ class ActsExtrapolationAlg : public AthReentrantAlgorithm {
public:
ActsExtrapolationAlg (const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
index f3b6efd85c0d10ea1ad21ede143aa2d5852a1f0e..7116c589e66a3718333779faaf679bd98fb98f0f 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
@@ -58,7 +58,7 @@ StatusCode ActsExtrapolationAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode ActsExtrapolationAlg::execute_r(const EventContext& ctx) const
+StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
{
ATH_MSG_VERBOSE(name() << "::" << __FUNCTION__);
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
index 76247d48f6bdb14b0aa2ee5476404d67070045fb..f04d848c49879d0c212b8029efb4dcbafa8e50d9 100755
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
@@ -39,7 +39,7 @@ namespace Trk
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
index 74255a52b705ea39e43ad40308262d010c15ca14..5f8f82ab459cbedc01d3a6e6f5739eafe8c70b6b 100755
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
@@ -43,7 +43,7 @@ StatusCode Trk::TrkCollectionAliasAlg::finalize()
//================ Execution ====================================================
-StatusCode Trk::TrkCollectionAliasAlg::execute_r(const EventContext& ctx) const
+StatusCode Trk::TrkCollectionAliasAlg::execute(const EventContext& ctx) const
{
SG::ReadHandle<TrackCollection> tracks(m_collectionName, ctx );
return tracks.alias(m_aliasName);
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
index cf49de8f78d389055edc392200a96fdef1335339..66e7c47f03ac14810961ed1bf9e375fd7c45eb6e 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
@@ -44,7 +44,7 @@ StatusCode HLTCaloCellMaker::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTCaloCellMaker::execute_r( const EventContext& context ) const {
+StatusCode HLTCaloCellMaker::execute( const EventContext& context ) const {
auto roisHandle = SG::makeHandle( m_roiCollectionKey );
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
index 8bc57f09856657a5cb1d15efaeb6b0ea7ef07bf3..db57c58b91c267161d379c23618545f4bed6b2d4 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
@@ -39,7 +39,7 @@ class HLTCaloCellMaker: public AthReentrantAlgorithm {
HLTCaloCellMaker(const std::string & name, ISvcLocator* pSvcLocator);
~HLTCaloCellMaker();
- StatusCode execute_r(const EventContext& context ) const ;
+ StatusCode execute(const EventContext& context ) const ;
StatusCode initialize();
private:
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
index dbe2c9194df939bcea33aaf02a96c3d3a0bc6ef4..873b4471cc9d0a18d6474b356e0b5eb2e3fb42b0 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
@@ -36,7 +36,7 @@ StatusCode HLTCaloCellSumMaker::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTCaloCellSumMaker::execute_r( const EventContext& /*context*/ ) const {
+StatusCode HLTCaloCellSumMaker::execute( const EventContext& /*context*/ ) const {
if ( m_roiMode ) {
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
index 95349f86e12128d721b83addeef65f116e9b1c1a..573c70c15335785fde18389d8662c300e271ffc3 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
@@ -29,7 +29,7 @@ class HLTCaloCellSumMaker: public AthReentrantAlgorithm {
HLTCaloCellSumMaker(const std::string & name, ISvcLocator* pSvcLocator);
~HLTCaloCellSumMaker();
- StatusCode execute_r(const EventContext& context ) const ;
+ StatusCode execute(const EventContext& context ) const ;
StatusCode initialize();
private:
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h b/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
index 6c844543d1222b3f194da1d062318e7b97268909..3c463bc32749454104eba126ac9fd85100d6c096 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
@@ -32,7 +32,7 @@ class EFMissingETAlgMT : public ::AthReentrantAlgorithm
//EFMissingETMT &operator=(const EFMissingETMT &alg);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
index 55b1375d0a63636ae2f169479a4c770514f08926..1deffc8ab57dcc42a03fd5623cbc16ead2bc65d4 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
@@ -41,7 +41,7 @@ double toLinGeV( double x, double fallback = 0, double epsilon = 1e-6 ) {
}
-StatusCode EFMissingETAlgMT::execute_r( const EventContext& context ) const {
+StatusCode EFMissingETAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
using namespace Monitored;
auto totalTimer = MonitoredTimer::declare( "TIME_Total" );
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
index 0d5c56479898d99bc186a32888dca5cc1e801319..99ac204d60a5bcca8c1124f405019def259a745c 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
@@ -326,7 +326,7 @@ void TestCaloDataAccess::emulateFixedRoIs( const EventContext& context, std::vec
}
-StatusCode TestCaloDataAccess::execute_r( const EventContext& context ) const {
+StatusCode TestCaloDataAccess::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
std::vector<ParallelCallTest*> allRoIs;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
index 4e1adeb69133606e6156fcac959b7bbc16997cb4..2773288de16ea464296e4524346b01d52b402922 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
@@ -26,7 +26,7 @@ class TestCaloDataAccess
TestCaloDataAccess( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~TestCaloDataAccess();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
TestCaloDataAccess();
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
index cac73b16f54145144f13e240ae2bf1521a20b21c..e8eaf1b5b194d5f9a663ec25bb09d6fe7d440145 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
@@ -47,7 +47,7 @@ class T2CaloEgammaReFastAlgo: public AthReentrantAlgorithm {
/** main execute will call FEX IAlgToolCalo::execute() to process RoI.
called by the Steering per EMRoI. */
- StatusCode execute_r(const EventContext& context ) const;
+ StatusCode execute(const EventContext& context ) const;
/** initialize. Called by the Steering. */
StatusCode initialize();
/** hltFinalize. Called by the Steering. */
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
index 5b16ba06c3b4f949b2658b8cd0fc79ff046dc4ed..23bf17a054db29331815d5e65a2d23e9dbf57aec 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
@@ -73,7 +73,7 @@ StatusCode T2CaloEgammaReFastAlgo::initialize()
}
-StatusCode T2CaloEgammaReFastAlgo::execute_r(const EventContext& context) const
+StatusCode T2CaloEgammaReFastAlgo::execute(const EventContext& context) const
{
// Time total T2CaloEgamma execution time.
// if ( m_timersvc ) m_timer[0]->start();
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
index 63f722c1d4e0894f86ab16b00b60b30518ebdb3d..53a9b8cc4b22b0d3984f9dcfb1525f942ba66b73 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
@@ -66,7 +66,7 @@ StatusCode TrigDecisionMakerMT::finalize()
}
-StatusCode TrigDecisionMakerMT::execute_r(const EventContext& context) const
+StatusCode TrigDecisionMakerMT::execute(const EventContext& context) const
{
// increment event counter
m_nEvents++;
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
index 1d9e3a0af5e77d6d623734a98bdb66ca2a9d0446..4a9866733263c9d6959af6dc777241d7a6026e8d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
@@ -76,7 +76,7 @@ namespace TrigDec {
// IAlgorithm virtual methods to implement
virtual StatusCode initialize() override; //!< std Gaudi initialize method -> read-in trigger configuration
- virtual StatusCode execute_r( const EventContext& context ) const override; //!< Re-entrant execute to create the xAOD::TrigDecision
+ virtual StatusCode execute( const EventContext& context ) const override; //!< Re-entrant execute to create the xAOD::TrigDecision
virtual StatusCode finalize() override; //!< std Gaudi finalize method -> print out statistics
StatusCode getL1Result (const LVL1CTP::Lvl1Result*& result, const EventContext& context) const; //!< retrieve LVL1 result (called in execute)
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
index b9c8b500004b421308b398d27277a97e25616e7e..d083718397719868fd2543b1a8bab2cae062c381 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
@@ -42,7 +42,7 @@ StatusCode TrigBjetEtHypoAlgMT::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigBjetEtHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigBjetEtHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_INFO ( "Executing " << name() << "..." );
// ==========================================================================================================================
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
index 675eac792f5e821307240ad202bc7ff03c20fddc..fa57097df4b891a19c70375aef732c52ebbd777d 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
@@ -34,7 +34,7 @@ class TrigBjetEtHypoAlgMT : public ::HypoBase {
virtual ~TrigBjetEtHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
index fa48a143de29d341530831641eeda641bf817a8a..3d5da42c57c207306c46c1320c17777f548b0022 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
@@ -42,7 +42,7 @@ StatusCode TrigBjetHypoAlgMT::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigBjetHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigBjetHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
SG::ReadHandle< TrigCompositeUtils::DecisionContainer > prevDecisionHandle = SG::makeHandle( decisionInput(),context );
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
index a4d71f886a8ed5dced9a8bf6dce19a1b71b9aafc..e141515784890d8a6fc2c69a9b8a26195df3659a 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
@@ -34,7 +34,7 @@ class TrigBjetHypoAlgMT : public ::HypoBase {
virtual ~TrigBjetHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
index c85abd2c4bf60516c1372221b0d480513b87a603..b5d7bcf9eb119224617abc759c0c677095712bd5 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
@@ -33,7 +33,7 @@ StatusCode TrigL2CaloHypoAlgMT::finalize() {
}
-StatusCode TrigL2CaloHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2CaloHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
index 39d75c7f156c0bba703a36d0cac731c0fe26e4aa..a7a7d4697ba66aafbf9b9855fb01f1d0bc5f5d87 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
@@ -27,7 +27,7 @@ class TrigL2CaloHypoAlgMT : public ::HypoBase {
virtual ~TrigL2CaloHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
index 439a3922b24cd7f7052ec20d760abcd32c351841..4d0b0016031389a77c63dbf2cde14e5d03f7de98 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
@@ -38,7 +38,7 @@ StatusCode TrigL2ElectronHypoAlgMT::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigL2ElectronHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2ElectronHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
index de5c9354cfb0b23c729732835722c0ce09bc46ba..530a4f1970d862165c1bd7f57ab354c35551eb59 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
@@ -30,7 +30,7 @@ class TrigL2ElectronHypoAlgMT : public ::HypoBase
virtual ~TrigL2ElectronHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
index 5eee805ee8ad0bb6426596f585d3b35e45bec084..84267f8b9667c54870e1552dca856922bdebf6d8 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
@@ -38,7 +38,7 @@ StatusCode TrigL2PhotonHypoAlgMT::finalize() {
}
-StatusCode TrigL2PhotonHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2PhotonHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
index b0c40fb1f76aabba75e568862942daa5b883a596..2961c2f5ef6545f82163b81e6d298a315d47c389 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
@@ -33,7 +33,7 @@ class TrigL2PhotonHypoAlgMT : public ::HypoBase
virtual ~TrigL2PhotonHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
index b655c25ca093819010ec3514b98dd95ba648c975..e9d1626f137932879a9b57e8e759c0fecae60abb 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
@@ -34,7 +34,7 @@ StatusCode TrigJetHypoAlgMT::initialize() {
}
-StatusCode TrigJetHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigJetHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
index c9284f39d28f0ebf645fd072eef40d3f399f8c6d..d4413eb184e538ed3e8714bd6a22e9ae32f5cd13 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
@@ -26,7 +26,7 @@ class TrigJetHypoAlgMT : public ::HypoBase {
virtual ~TrigJetHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
index 31dded544e14b61cdf1090b214446c424dd22388..5e2a85c76c9cb8fea45de1a47af2b19d8e715545 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
@@ -34,7 +34,7 @@ StatusCode TrigL2CaloRingerHypoAlgMT::initialize() {
}
-StatusCode TrigL2CaloRingerHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2CaloRingerHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
// prepare decisions container and link back to the clusters, and decision on clusters
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
index a6bb833cd96faf7cd24da68672968ec5a64a8f30..2163e6e2840f9efadb5a976f97b7ee8cf739ca67 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
@@ -27,7 +27,7 @@ class TrigL2CaloRingerHypoAlgMT
virtual ~TrigL2CaloRingerHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
index f0e47910b76f3417bda74bee9ce8204b9cd0fc04..c8582c347b07aa8e697151f7a3e76a47d057e42b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
@@ -33,7 +33,7 @@ class TrigMufastHypoAlg
virtual ~TrigMufastHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
index a1f2d650b0fcd1488fc3789f503e6dc015ffe5b4..7c312b640cd9ab5eef50a8c143922153e06c07c6 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
@@ -42,7 +42,7 @@ class TrigMuisoHypoAlg
virtual ~TrigMuisoHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
index d1b8a8436f0f79e1a5b4806d28c31589b03334a9..01e488d97d9de7505b4a81af482c60cda62c64b6 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFCombinerHypoAlg
virtual ~TrigMuonEFCombinerHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
index de0f356c40da839334ecc32a1cc4083542ca953b..52d0cc03178b3bcbf241fb32512432d02023a380 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFMSonlyHypoAlg
virtual ~TrigMuonEFMSonlyHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
index c6fd5ff06fe445a78f13b1d7c7fbd81322c701db..490db37657c8a7d48e7293b5f6a5f13e7084d084 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFTrackIsolationHypoAlg
virtual ~TrigMuonEFTrackIsolationHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
index 6562a9155bf5c6a7e2ef7190cd2656664daa5a32..42e381e5de836f7e3570c53a90e919a123198edc 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
@@ -34,7 +34,7 @@ class TrigmuCombHypoAlg
virtual ~TrigmuCombHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
index 66634e983a4f5d6986f878c9512705a8e5866225..b76a04d1788087882d799b0391eac5df3c957d97 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
@@ -53,11 +53,11 @@ StatusCode TrigMufastHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMufastHypoAlg::execute( const EventContext& context ) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit RH for previous decisions "<< decisionInput().key()<<": is this expected?" );
@@ -142,7 +142,7 @@ StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
}
- ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
index 24be8036725e67f6a3cd7c7e98afa0a0fa0ce607..ee8041bba84fac3254da4a89ba7ea032a5f7bfa6 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
@@ -50,10 +50,10 @@ StatusCode TrigMuisoHypoAlg::finalize()
}
-StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
+StatusCode TrigMuisoHypoAlg::execute( const EventContext& context) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit RH for previous decisions "<< decisionInput().key()<<": is this expected?" );
@@ -128,7 +128,7 @@ StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
}
- ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
index 1db2340bed6fd998fed1633c5d06ca6c0ff1b3dc..6deee0ce7584e916bfe5dce1896bae4c39b9e1ad 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
@@ -54,9 +54,9 @@ StatusCode TrigMuonEFCombinerHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFCombinerHypoAlg::execute( const EventContext& context ) const
{
- ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute start");
// common for all hypos, to move in the base class
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -146,7 +146,7 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) c
} else ATH_MSG_WARNING( "Output decisions are NOT valid with key : " << decisionOutput().key() );
}
- ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
index 1a8f180b3e7ffa617c86341078c0d260c52d651d..c301fbfa3f472c3d63d8eb17ddd917bf0f36dcb4 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
@@ -54,9 +54,9 @@ StatusCode TrigMuonEFMSonlyHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFMSonlyHypoAlg::execute( const EventContext& context ) const
{
- ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute start");
// common for all hypos, to move in the base class
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -146,7 +146,7 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) con
} else ATH_MSG_WARNING( "Output decisions are NOT valid with key : " << decisionOutput().key() );
}
- ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
index ab0f9afd912d1e8498524c75b6767cd3153e6691..f3826e60d652084cbd3da065d67563566e1bdb14 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
@@ -53,7 +53,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFTrackIsolationHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFTrackIsolationHypoAlg::execute( const EventContext& context ) const
{
ATH_MSG_DEBUG("Executing ...");
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
index 9de510e8c804cdf6f56d85801f5ec3b683231912..72609a6d2a914659c8a88ce28cb3ed52520c9696 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
@@ -55,10 +55,10 @@ StatusCode TrigmuCombHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
+StatusCode TrigmuCombHypoAlg::execute(const EventContext& context) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context);
if ( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit ReadHandles for previous decisions " << decisionInput().key() << ": is this expected?");
@@ -133,7 +133,7 @@ StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
}
}
- ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
index 3d42335fe41582536cef005dbf28afe804ba262c..7a9e1a901de16f9123aee2c7a292e046d2eb8850 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
@@ -84,7 +84,7 @@ StatusCode TrigROBMoni::initialize()
if ( m_steering ) {
// Make list of algorithms able to request data (all but Hypo)
- vector<Algorithm*>::const_iterator a;
+ vector<Gaudi::Algorithm*>::const_iterator a;
for ( a = m_steering->subAlgorithms()->begin();
a != m_steering->subAlgorithms()->end(); ++a ) {
if ( dynamic_cast<const HLT::TECreateAlgo*>(*a) ) m_fexAlgos.push_back(*a);
@@ -153,7 +153,7 @@ StatusCode TrigROBMoni::bookHists()
m_fexAlgos.size(), 0, m_fexAlgos.size(),
m_fexAlgos.size(), 0, m_fexAlgos.size());
- vector<Algorithm*>::const_iterator a;
+ vector<Gaudi::Algorithm*>::const_iterator a;
int bin;
for ( a = m_fexAlgos.begin(), bin=1; a != m_fexAlgos.end(); ++a, ++bin ) {
m_h_shared_requests->GetXaxis()->SetBinLabel(bin, (*a)->name().c_str());
@@ -341,7 +341,7 @@ StatusCode HistSet<HTYPE>::book(TrigMonitorToolBase::TrigMonGroup& monGroup,
hist[SDGROUP]->GetXaxis()->SetBinLabel(bin, (*sdg).second.c_str());
}
- //vector<Algorithm*>::const_iterator a;
+ //vector<Gaudi::Algorithm*>::const_iterator a;
//for ( a = montool->m_fexAlgos.begin(), bin=1;
// a != montool->m_fexAlgos.end(); ++a, ++bin ) {
// hist[ALGO]->GetXaxis()->SetBinLabel(bin, (*a)->name().c_str());
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
index 2974759e0abfabc82967799477c4a74c150f01ef..9c3670b2b103e2156efb4197063e673f37c2188d 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
@@ -148,7 +148,7 @@ private:
const HLT::TrigSteer* m_steering;
/// Steering FEX algos (the ones that can request data)
- std::vector<Algorithm*> m_fexAlgos;
+ std::vector<Gaudi::Algorithm*> m_fexAlgos;
/// Map to assign ROB history codes to bins
std::map<robmonitor::ROBHistory, short> m_ROBHistoryToBin;
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
index 7df3776e4220f5f5aead1158b47c60e32b5893ef..49e9e6e9e78f18e0a94b4ad018f186341e15c33e 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
@@ -66,7 +66,7 @@ StatusCode TrigTimeHistTool::bookHists()
ATH_CHECK(timerSvc.retrieve());
// find out for whom we are running (i.e. Algo)
- const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
+ const Gaudi::Algorithm *parentAlg = dynamic_cast<const Gaudi::Algorithm*>(parent());
if ( parentAlg )
m_parentName = parentAlg->name();
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
index f0cb0cc94334029ebb4b4eeae4d2f01791baf6a5..a6a20a9b48c91cc8043a9e5be567e2f2a80de805 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
@@ -47,7 +47,7 @@ StatusCode TrigTimeTreeTool::bookHists() {
ATH_CHECK(rootHistSvc.retrieve());
// find out for whom we are running (i.e. Algo)
- const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
+ const Gaudi::Algorithm *parentAlg = dynamic_cast<const Gaudi::Algorithm*>(parent());
if ( parentAlg )
m_parentName = parentAlg->name();
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
index 3a83457515bd4c33ccc6c8fd0b8613c7582219d6..dfbb61fcbd841b126100994b91de23ed700095a5 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
@@ -24,7 +24,7 @@ This is a base class for HLT Hypos to reduce boilerplate and enforce the common
/// initialise this base class and renounce input decision key handles
virtual StatusCode sysInitialize() override;
/// execute to be implemented in derived clas
- virtual StatusCode execute_r(const EventContext&) const override = 0;
+ virtual StatusCode execute(const EventContext&) const override = 0;
virtual StatusCode finalize() override = 0;
virtual StatusCode initialize() override = 0;
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
index e904f8e67e1fa47e51643a30f8be941a54741212..7c5ce693f4f061d0005e5f68cc32201194d7d26a 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
@@ -24,7 +24,7 @@ This is a base class for HLT InputMakers to reduce boilerplate and enforce the c
/// initialise this base class and renounce input decision key handles
virtual StatusCode sysInitialize() override;
/// execute to be implemented in derived clas
- virtual StatusCode execute_r(const EventContext&) const override = 0;
+ virtual StatusCode execute(const EventContext&) const override = 0;
virtual StatusCode finalize() override = 0;
virtual StatusCode initialize() override = 0;
protected:
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
index dc0c230132d44fab0b046f1a4af69bcd9cd2eeea..c78f3be5a1193b14b2f8f79edd2ea02f7d56ee58 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
@@ -31,7 +31,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* Returns the WriteHandle.
* No Aux store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT>
SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
@@ -40,7 +40,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* Returns the WriteHandle.
* With Aux store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT, class AUX>
SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
@@ -48,7 +48,7 @@ namespace TrigCompositeUtils {
/**
* @brief Creates and right away records the DecisionContainer with the key.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
SG::WriteHandle<DecisionContainer> createAndStore( const SG::WriteHandleKey<DecisionContainer>& key, const EventContext& ctx = Gaudi::Hive::currentContext() );
@@ -67,7 +67,7 @@ namespace TrigCompositeUtils {
* output->push_back(d);
* If provided, the name is assigned to the TC object
* Note that the supplied DecisionContainer must have been recorded in the event store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
Decision* newDecisionIn ( DecisionContainer* dc, const std::string& name = "", const EventContext& ctx = Gaudi::Hive::currentContext() );
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
index a11b4bb04e0975fbec40ec01cadc899ecc22dba4..93edfe6534b6e3d21ea276e02ca6c463b14204ae 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
@@ -7,7 +7,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* No Aux store.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT>
SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
@@ -21,7 +21,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* With Aux store.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT, class AUX>
SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
index 0408728dccd2fd5652982e01807e3ee33b73473e..3627d105deada3a356aaa43b695f2e4b4adf65a8 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
@@ -167,7 +167,7 @@ void ComboHypo::fillDecisionsMap( std::vector< MultiplicityMap >& dmap, const E
}
}
-StatusCode ComboHypo::execute_r(const EventContext& context ) const {
+StatusCode ComboHypo::execute(const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
index df97b79b2c6815cf903b5f92cbf8439125d6f705..73879a2ce883a782d2d2eea1a73feba573e91583 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
@@ -27,7 +27,7 @@ public:
virtual ~ComboHypo() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
index f05fdb890ec8edee689c0411cf31e05a2766fb08..46fb361a6da8485b3d041c294c2228c4935fa484 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
@@ -42,7 +42,7 @@ StatusCode DumpDecisions::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode DumpDecisions:: execute_r( const EventContext& ctx ) const {
+StatusCode DumpDecisions:: execute( const EventContext& ctx ) const {
using namespace TrigCompositeUtils;
// DecisionInput decisionInput;
auto decisionInput = SG::makeHandle( m_decisionKey, ctx );
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
index 71ec3ce57ac56ece71b872d08a6fbd93d72b6524..dc0af6a2977760ca9d4907b0259a6b7f445fe383 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
@@ -31,7 +31,7 @@ class DumpDecisions
// Athena algorithm's Hooks
StatusCode initialize() override;
- StatusCode execute_r( const EventContext& ctx ) const override;
+ StatusCode execute( const EventContext& ctx ) const override;
StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index fdcdb8307ae9e53b977708e7107b5f7d477ee211..b116703641bbbc165852500111ca7c3dbae898b0 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -31,7 +31,7 @@ StatusCode InputMakerForRoI::finalize() {
}
-StatusCode InputMakerForRoI::execute_r( const EventContext& context ) const {
+StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
index a9cc8db965f5cdcf51e82fbbdcb763f12141b116..0f015a07614229406e243ff30bbbfbd95ad724fd 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
@@ -24,7 +24,7 @@
InputMakerForRoI( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~ InputMakerForRoI();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
index 5bdc223042b29986dccd3e666158147f862bedb7..332b3dd1692d94d51b956e1320f533e6d3e154df 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
@@ -45,7 +45,7 @@ StatusCode TriggerSummaryAlg::initialize()
return StatusCode::SUCCESS;
}
-StatusCode TriggerSummaryAlg::execute_r(const EventContext& context) const
+StatusCode TriggerSummaryAlg::execute(const EventContext& context) const
{
// that is certain input
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
index 10f0f19d7add72905b68139048031a8c06ec3b53..e1e58dce8d2424457e1f6a97d0b65eeca52de3eb 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
@@ -26,7 +26,7 @@ class TriggerSummaryAlg : public ::AthReentrantAlgorithm {
virtual ~TriggerSummaryAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
private:
diff --git a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
index 5dc84ebea373fb5e730e0868dd3dc5d1238a9ae4..fa9c2a3a4b5402d3daebe77106c6ad2a705b849d 100644
--- a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
@@ -27,7 +27,7 @@ StatusCode CreateFullScanRoI::finalize()
return StatusCode::SUCCESS;
}
-StatusCode CreateFullScanRoI::execute_r(const EventContext& ctx) const
+StatusCode CreateFullScanRoI::execute(const EventContext& ctx) const
{
using namespace TrigCompositeUtils;
SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_roisKey, ctx );
diff --git a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
index 884eec97ca479a306f23c6b8442baefeb6765459..7c2e0acda93f1cb65e5895c32202605d839d4ccd 100644
--- a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
+++ b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
@@ -20,7 +20,7 @@ public:
virtual ~CreateFullScanRoI() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
index 69930d8318c3f2ae3e9d3b84fb4cfa7df5bf025b..7a48e1618f1bc5066457cfc076105810a3ed24a5 100644
--- a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
@@ -63,7 +63,7 @@ StatusCode L1Decoder::readConfiguration() {
return StatusCode::SUCCESS;
}
-StatusCode L1Decoder::execute_r (const EventContext& ctx) const {
+StatusCode L1Decoder::execute (const EventContext& ctx) const {
{
auto timeStampHandle = SG::makeHandle( m_startStampKey, ctx );
ATH_CHECK( timeStampHandle.record( std::make_unique<TrigTimeStamp>() ) );
diff --git a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
index dff2b0dcbcf6306a1ff9e5acba56a65de850e018..21d7b7791891fcb00b1957e9322f94dfaca66e21 100644
--- a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
+++ b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
@@ -30,7 +30,7 @@ public:
L1Decoder(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override;
virtual void handle(const Incident& incident) override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected: // protected to support unit testing
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
index afec96c42b8db34fbafece5ba3802b053f738280..85e0064e0d7fa450b94fd034192c78512b78cbf1 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
@@ -38,9 +38,9 @@ StatusCode HLTResultMTByteStreamDecoderAlg::finalize() {
}
// =============================================================================
-// Implementation of AthReentrantAlgorithm::execute_r
+// Implementation of AthReentrantAlgorithm::execute
// =============================================================================
-StatusCode HLTResultMTByteStreamDecoderAlg::execute_r(const EventContext& eventContext) const {
+StatusCode HLTResultMTByteStreamDecoderAlg::execute(const EventContext& eventContext) const {
ATH_MSG_DEBUG("Executing " << name());
// Create and record the HLTResultMT object
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
index 64e4b468ea581278362fe09194332f53fbfce26c..cf9b1eb5c114d3b0ed72210eac8ed8367676776a 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
@@ -25,7 +25,7 @@ public:
// ------------------------- AthReentrantAlgorithm methods -------------------
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& eventContext) const override;
+ virtual StatusCode execute(const EventContext& eventContext) const override;
private:
// ------------------------- Properties --------------------------------------
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
index c1c18bdb09eb9bb93cbe415584ef37dba017f332..b39c0a242a603c7ca1177ca803032b366d252a70 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
@@ -28,7 +28,7 @@ StatusCode DecisionSummaryMakerAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode DecisionSummaryMakerAlg::execute_r(const EventContext& context) const {
+StatusCode DecisionSummaryMakerAlg::execute(const EventContext& context) const {
SG::WriteHandle<TrigCompositeUtils::DecisionContainer> outputHandle = TrigCompositeUtils::createAndStore( m_summaryKey, context );
auto container = outputHandle.ptr();
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
index 4fc76f6d72caa2c292145b18876789eaa6094ec5..ab6e7740a364448a9f8a45ac9320710742cd0499 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
@@ -19,7 +19,7 @@ public:
virtual ~DecisionSummaryMakerAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
index f73e203cec8a921b94c7025882674e5a0a5d282f..17fae8a7e6be48423e159404ed0655add3a3022e 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
@@ -19,6 +19,6 @@ StatusCode HLTResultMTMakerAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTResultMTMakerAlg::execute_r(const EventContext& context) const {
+StatusCode HLTResultMTMakerAlg::execute(const EventContext& context) const {
return m_resultMaker->makeResult(context);
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
index 3a53f49c3530fec4b484e5df2d2b08bd2f3f90a5..b5b4577f2dfb0de21fccb70c7a35f48fcc4413d0 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
@@ -18,7 +18,7 @@ public:
virtual ~HLTResultMTMakerAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
index a4cbf6356c6ccbbc2d562e6990e30528aaa38119..ffa7506e9973c22abd9f7d70dbbf492d03eae9b0 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
@@ -34,7 +34,7 @@ StatusCode TriggerEDMDeserialiserAlg::finalize()
return StatusCode::SUCCESS;
}
-StatusCode TriggerEDMDeserialiserAlg::execute_r(const EventContext& context) const
+StatusCode TriggerEDMDeserialiserAlg::execute(const EventContext& context) const
{
size_t buffSize = m_initialSerialisationBufferSize;
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
index b5dd0bd519e5550a42749907a31e6197b1e1d833..5b90c8094c48df5f5ba92cba0111549f6af2d5d1 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
@@ -34,7 +34,7 @@ public:
virtual ~TriggerEDMDeserialiserAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h b/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
index 7d27e2fe44fc1dcaa15b35bb6befa9c8a120cd1e..0a5e47ea228f4515e3a2736e73fd9fc74d6ba566 100755
--- a/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
+++ b/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
@@ -33,7 +33,7 @@
#include "TrigConfHLTData/HLTSequence.h"
#include "TrigNavigation/Navigation.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
@@ -101,7 +101,7 @@ namespace HLT {
@author Nicolas Berger <Nicolas.Berger@cern.ch>
@author Tomasz Bold <Tomasz.Bold@cern.ch>
*/
- class TrigSteer : public AthAlgorithm,
+ class TrigSteer : public AthLegacySequence,
public Athena::TimeoutMaster,
public virtual ISequenceProvider,
public virtual IIncidentListener
diff --git a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
index 696e1d402f6dad01b70a83a8f435ed215f1abbba..9ca0d442a3b616acc178f227b9f12282e241f8a8 100755
--- a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
@@ -73,7 +73,7 @@ Sequence::Sequence(std::vector<unsigned int> inputTypes,
return;
}
- const Algorithm* parentAlg = dynamic_cast<const Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
+ const Gaudi::Algorithm* parentAlg = dynamic_cast<const Gaudi::Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
if ( !parentAlg ) {
m_config->getMsgStream() << MSG::WARNING << "No parent algorithm for the sequence" << endmsg;
return;
diff --git a/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx b/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
index 28facadea11a37addd75dadf5d24e09edcbf80bd..b2d2b5f1fa9f8a778cf4393b1f059967d8927ce0 100644
--- a/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
@@ -125,7 +125,7 @@ SteeringChain::SteeringChain( const TrigConf::HLTChain* configChain, ISequencePr
m_config->getMsgStream() << MSG::WARNING << "Navigation tool not available" << endmsg;
return;
}
- const Algorithm* parentAlg = dynamic_cast<const Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
+ const Gaudi::Algorithm* parentAlg = dynamic_cast<const Gaudi::Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
if ( !parentAlg ) {
m_config->getMsgStream() << MSG::WARNING << "Parent alg not available" << endmsg;
return;
diff --git a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
index 07c4c97239b4f07f0378c3258470eec24b22cdd1..a18eeeaedb2b70c326c4863f7f81d41cab7d7f55 100755
--- a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
@@ -88,7 +88,7 @@ using namespace HLT;
using namespace std;
TrigSteer::TrigSteer(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
+ : AthLegacySequence(name, pSvcLocator),
m_config(0),
m_stepForEB(0),
m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
@@ -417,12 +417,10 @@ StatusCode TrigSteer::initialize()
}
-
-
-
ATH_MSG_DEBUG("initializing done");
- return StatusCode::SUCCESS;
+ ATH_MSG_DEBUG("initializing subAlgs");
+ return AthLegacySequence::initialize();
}
@@ -449,7 +447,7 @@ StatusCode TrigSteer::finalize()
delete m_config; m_config=0;
- return StatusCode::SUCCESS;
+ return AthLegacySequence::finalize();
}
@@ -1023,7 +1021,7 @@ HLT::Algo* TrigSteer::getAlgo(std::string name)
if (iter != m_algos.end())
algo = iter->second;
else {
- Algorithm* algPointer;
+ Gaudi::Algorithm* algPointer;
if (createSubAlgorithm(subAlg_type, subAlg_name, algPointer).isSuccess()) {
algo = static_cast<HLT::Algo*>(algPointer);
algo->setConfig(m_config);
@@ -1136,7 +1134,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// get input TE types and sequences
std::vector<unsigned int> inputTypes;
- std::vector< Sequence* > inputSequences;
+ std::vector< HLT::Sequence* > inputSequences;
for( TrigConf::HLTTriggerElement* inputTE : seq.inputTEs() ) {
unsigned int inputId = inputTE->id();
@@ -1144,7 +1142,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// make sure we have the sequences producing these inputTEs:
if ( producedFirstAtLevel(inputId) == m_hltLevel ) {
- Sequence* newseq = findSeqForOutputTeType( inputId );
+ HLT::Sequence* newseq = findSeqForOutputTeType( inputId );
// if seq not NULL and not in vector already, save it:
if (newseq && find(inputSequences.begin(), inputSequences.end(), newseq) == inputSequences.end() ) {
inputSequences.push_back(newseq);
@@ -1160,7 +1158,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// get topo_start_from TE types
const TrigConf::HLTTriggerElement* hltTopoTE = seq.topoStartTE();
std::vector<unsigned int> topoStartTypes;
- Sequence * topoStartFromSequence = 0;
+ HLT::Sequence * topoStartFromSequence = 0;
// only add an entry if pointer not NULL
if (hltTopoTE) {
topoStartTypes.push_back( hltTopoTE->id() );
@@ -1188,7 +1186,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
HLT::Sequence* newseq = new HLT::Sequence(inputTypes, outputType,
firstAlgo, tailAlgos, m_config, topoStartTypes);
- for (std::vector< Sequence* >::const_iterator it = inputSequences.begin();
+ for (std::vector< HLT::Sequence* >::const_iterator it = inputSequences.begin();
it != inputSequences.end(); ++it) {
newseq->m_previousSequences.push_back( *it );
}
@@ -1238,7 +1236,8 @@ StatusCode TrigSteer::start()
ATH_MSG_DEBUG("monitoring tools bookHists done " << m_monTools << " " << m_opiTools);
- return StatusCode::SUCCESS;
+ return AthLegacySequence::start();
+
}
@@ -1281,7 +1280,7 @@ StatusCode TrigSteer::stop()
ATH_MSG_DEBUG("monitoring tools finalHists done " << m_monTools << " " << m_opiTools);
- return StatusCode::SUCCESS;
+ return AthLegacySequence::stop();
}
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
index f10503ada9c60943f72d415f63be11dbc587b938..6b9f57f656147e8895f6f02394f7c8299b4b715a 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
@@ -25,7 +25,7 @@ StatusCode EventViewCreatorAlgorithm::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode EventViewCreatorAlgorithm::execute_r( const EventContext& context ) const {
+StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) const {
auto outputHandles = decisionOutputs().makeHandles( context );
// make and store the views
auto viewsHandle = SG::makeHandle( m_viewsKey );
@@ -35,7 +35,7 @@ StatusCode EventViewCreatorAlgorithm::execute_r( const EventContext& context ) c
auto contexts = std::vector<EventContext>( );
unsigned int viewCounter = 0;
- unsigned int conditionsRun = getContext().getExtension<Atlas::ExtendedEventContext>().conditionsRun();
+ unsigned int conditionsRun = context.getExtension<Atlas::ExtendedEventContext>().conditionsRun();
// const TrigRoiDescriptor* previousRoI = 0;
// mapping RoI with index of the View in the vector
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
index 8a85120a95ac3da53280d04d667afb89821cb3ec..4e2b4974950b65f7857545ddf1bac53225ed9b5c 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
@@ -32,7 +32,7 @@ class EventViewCreatorAlgorithm : public ::InputMakerBase
EventViewCreatorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~EventViewCreatorAlgorithm();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override { return StatusCode::SUCCESS; }
protected:
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
index 21544ce9036b82de4724c5220f8b5c28d44e4850..0dc87e50cfa84d057e8e147022fc41185d2d14e0 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
@@ -25,7 +25,7 @@ StatusCode EventViewCreatorAlgorithmWithJets::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode EventViewCreatorAlgorithmWithJets::execute_r( const EventContext& context ) const {
+StatusCode EventViewCreatorAlgorithmWithJets::execute( const EventContext& context ) const {
auto outputHandles = decisionOutputs().makeHandles( context );
// make and store the views
auto viewsHandle = SG::makeHandle( m_viewsKey );
@@ -35,7 +35,7 @@ StatusCode EventViewCreatorAlgorithmWithJets::execute_r( const EventContext& con
auto contexts = std::vector<EventContext>( );
unsigned int viewCounter = 0;
- unsigned int conditionsRun = getContext().getExtension<Atlas::ExtendedEventContext>().conditionsRun();
+ unsigned int conditionsRun = context.getExtension<Atlas::ExtendedEventContext>().conditionsRun();
// const TrigRoiDescriptor* previousRoI = 0;
// mapping RoI with index of the View in the vector
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
index ff84d82709d468fccd032bdf2fdb76aaa2d09b2f..6d39520d6e56dada64fc554ee5c8404285ae2583 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
@@ -21,7 +21,7 @@ class EventViewCreatorAlgorithmWithJets : public EventViewCreatorAlgorithm {
virtual ~EventViewCreatorAlgorithmWithJets();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
private:
diff --git a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
index bcb8ce19512f940c2b998a54ea6c01ae2ef88cd6..a930db5a5314aff108fd760c9cc5d906be172dc9 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
@@ -11,7 +11,7 @@ StatusCode MergeViews::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode MergeViews::execute_r( const EventContext& context ) const {
+StatusCode MergeViews::execute( const EventContext& context ) const {
auto viewsHandle = SG::makeHandle( m_viewsKey, context );
const ViewContainer& viewsRef = *viewsHandle;
diff --git a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
index 51ccf3339f6cfc2665c6e11fcebd2d779e71aef6..d07e60f4b04d37413d8d02e7fdf0c7b338237666 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
@@ -9,7 +9,7 @@ class MergeViews : virtual public AthReentrantAlgorithm {
public:
MergeViews(const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r( const EventContext& context ) const override;
+ StatusCode execute( const EventContext& context ) const override;
private:
SG::ReadHandleKey< ViewContainer > m_viewsKey { this, "Views", "Views", "Collection of views to read from" };
ToolHandleArray<IViewsMergerTool> m_mergingTools {this, "MergingTools", {}, "Merging tools used to perform the merging action" };
diff --git a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
index 58aba266704332970a150861afdd1740ac7caa62..b62dec32b329f8140dfb05bdc1dc41e15c060f08 100644
--- a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
+++ b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
@@ -34,7 +34,7 @@ StatusCode TestViewMerger::initialize() {
}
-//StatusCode TestViewMerger::execute_r( const EventContext& ctx ) const {
+//StatusCode TestViewMerger::execute( const EventContext& ctx ) const {
StatusCode TestViewMerger::execute(){
// auto viewsHandle = SG::makeHandle( m_viewsKey, ctx );
auto viewsHandle = SG::makeHandle( m_viewsKey );
diff --git a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
index fde767a3c1605c90ae29a279e2dfb26521ef0de8..13c7b85b641ed3b7b739dd81c599665cbe2701bf 100644
--- a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
+++ b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
@@ -26,7 +26,7 @@ public:
TestViewMerger( const std::string& name, ISvcLocator* pSvcLocator );
StatusCode initialize();
StatusCode execute();
- // StatusCode execute_r( const EventContext& ctx ) const;
+ // StatusCode execute( const EventContext& ctx ) const;
private:
SG::ReadHandleKey< ViewContainer > m_viewsKey; // will be used in evt context
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
index b3fd0d71f413ff878f87e8c40da6036379ce45ce..f0572ac9b0e3dc735f7f9969ab7224ff1b7f1722 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
@@ -52,7 +52,7 @@ LVL1::RoiB2TopoInputDataCnv::initialize()
}
StatusCode
-LVL1::RoiB2TopoInputDataCnv::execute_r (const EventContext& ctx) const
+LVL1::RoiB2TopoInputDataCnv::execute (const EventContext& ctx) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
index 98a1e46d94f4df7d672f4807edad36c56e483688..b3d947a2e47142bfd738d66543537a3179794217 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
@@ -35,7 +35,7 @@ namespace LVL1 {
virtual ~RoiB2TopoInputDataCnv();
// Athena algorithm's Hooks
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode initialize() override;
//Finalize not overriden because no work is required
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
index 6d125cd6ca598e121779c33a195e754b19c512bd..0bba744bd22dc28934c2946c9ca5aaf5a30d8e7a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
@@ -163,7 +163,7 @@ namespace HLTTest {
// }
- StatusCode TestComboHypoAlg::execute_r( const EventContext& context ) const {
+ StatusCode TestComboHypoAlg::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
index fcea988e91ee3f4dad5c2c18f3963a3589814ad1..b9dd34708198a4a750f0c559f1de38130cb11ae2 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
@@ -29,7 +29,7 @@ namespace HLTTest {
//TestComboHypoAlg &operator=(const TestComboHypoAlg &alg);
StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
//StatusCode execute() override;
StatusCode finalize() override;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
index eacfb63beaa7ddee97216eb61a4be1ed5430df67..3df9f4318bd666bd15b82d1ae6274ae3a598a033 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
@@ -27,7 +27,7 @@ namespace HLTTest {
}
- StatusCode TestHypoAlg::execute_r( const EventContext& context ) const {
+ StatusCode TestHypoAlg::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
if ( m_recoInput.key().empty() ) {
ATH_MSG_DEBUG( "No input configured, not producing the output" );
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
index 17f3acd6bf34ae342433ed92f330537c0921dc29..07ec5d0e412251a55ce7c2b062f0cb9093f8fc68 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
@@ -28,7 +28,7 @@ namespace HLTTest {
virtual ~TestHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
index 34331f60ec258b990987680a3780072f25029ca3..4a4a72d69bbf0f460a4fc2abca8e31476e2f760f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
@@ -34,7 +34,7 @@ namespace HLTTest {
}
- StatusCode TestInputMaker::execute_r( const EventContext& context ) const {
+ StatusCode TestInputMaker::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
index 85e463865d975ceba8bb7c0a856deba0fda71135..8039db3e582bd1bf61614fff7fac982395c05d42 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
@@ -29,7 +29,7 @@ namespace HLTTest {
TestInputMaker( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~TestInputMaker();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override;
private: