EMBremCollectionBuilder reentrant

Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx

@@ -32,7 +32,7 @@
 
 EMBremCollectionBuilder::EMBremCollectionBuilder(const std::string& name,
                                                  ISvcLocator* pSvcLocator)
-  : AthAlgorithm(name, pSvcLocator)
+  : AthReentrantAlgorithm(name, pSvcLocator)
 {
 }
 
@@ -66,7 +66,7 @@ StatusCode EMBremCollectionBuilder::EMBremCollectionBuilder::finalize(){
 }
 
 StatusCode
-EMBremCollectionBuilder::execute_r(const EventContext& ctx) const
+EMBremCollectionBuilder::execute(const EventContext& ctx) const
 {
   /*
    * Read in the input

Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h

@@ -16,7 +16,7 @@
 #include "TrkToolInterfaces/ITrackSlimmingTool.h"
 #include "TrkToolInterfaces/ITrackSummaryTool.h"
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/EventContext.h"
 #include "StoreGate/ReadHandleKey.h"
@@ -30,7 +30,7 @@
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 
 #include <memory>
-class EMBremCollectionBuilder : public AthAlgorithm 
+class EMBremCollectionBuilder : public AthReentrantAlgorithm 
 {
 
 public:
@@ -39,13 +39,7 @@ public:
 
   virtual StatusCode initialize() override final;
   virtual StatusCode finalize() override final;
-  virtual StatusCode execute() override final
-  {
-    return execute_r(Algorithm::getContext());
-  }
-  // This will become the normal execute when
-  // inheriting from AthReentrantAlgorithm
-  StatusCode execute_r(const EventContext& ctx) const;
+  virtual StatusCode execute(const EventContext& ctx) const override final;
 
 
   struct TrackWithIndex