Do not use GaudiAlg

- Change headers and add EventContext in algorithms not to use GaudiAlg
- Replace `GaudiTool` with `AlgTool`

RecCalorimeter/CMakeLists.txt

@@ -8,7 +8,6 @@ gaudi_add_module(k4RecCalorimeterPlugins
                  SOURCES ${_module_sources}
                  LINK k4FWCore::k4FWCore
                       k4FWCore::k4Interface
-                      Gaudi::GaudiAlgLib
                       Gaudi::GaudiKernel
                       DD4hep::DDCore
                       DD4hep::DDG4

RecCalorimeter/src/components/CalibrateBenchmarkMethod.cpp

@@ -26,7 +26,7 @@ DECLARE_COMPONENT(CalibrateBenchmarkMethod)
 
 
 CalibrateBenchmarkMethod::CalibrateBenchmarkMethod(const std::string& aName, ISvcLocator* aSvcLoc)
-    : GaudiAlgorithm(aName, aSvcLoc), 
+    : Gaudi::Algorithm(aName, aSvcLoc), 
     m_geoSvc("GeoSvc", aName), 
     m_histSvc("THistSvc", aName),
     m_totalEnergyECal(nullptr),
@@ -43,7 +43,7 @@ CalibrateBenchmarkMethod::~CalibrateBenchmarkMethod() {}
 
 
 StatusCode CalibrateBenchmarkMethod::initialize() {
-  if (GaudiAlgorithm::initialize().isFailure()) return StatusCode::FAILURE;
+  if (Gaudi::Algorithm::initialize().isFailure()) return StatusCode::FAILURE;
 
   // Check geometry service
   if (!m_geoSvc) {
@@ -102,7 +102,7 @@ StatusCode CalibrateBenchmarkMethod::initialize() {
 }
 
 
-StatusCode CalibrateBenchmarkMethod::execute() {
+StatusCode CalibrateBenchmarkMethod::execute(const EventContext&) const {
   double totalEnergyInECal = 0.;
   double totalEnergyInHCal = 0.;
   double energyInFirstLayerECal = 0; 
@@ -253,7 +253,7 @@ StatusCode CalibrateBenchmarkMethod::finalize() {
 
   runMinimization(n_param, variable, steps, m_fixedParameters);
 
-  return GaudiAlgorithm::finalize();
+  return Gaudi::Algorithm::finalize();
 }
 
 void CalibrateBenchmarkMethod::registerHistogram(const std::string& path, TH1F*& histogramName) {

RecCalorimeter/src/components/CalibrateBenchmarkMethod.h

@@ -2,7 +2,7 @@
 #define RECCALORIMETER_CALIBRATEBENCHMARKMETHOD_H
 
 // GAUDI
-#include "GaudiAlg/GaudiAlgorithm.h"
+#include "Gaudi/Algorithm.h"
 
 // Key4HEP
 #include "k4FWCore/DataHandle.h"
@@ -39,7 +39,7 @@ class ITHistSvc;
  *  @author Michaela Mlynarikova
  */
 
-class CalibrateBenchmarkMethod : public GaudiAlgorithm {
+class CalibrateBenchmarkMethod : public Gaudi::Algorithm {
 public:
   explicit CalibrateBenchmarkMethod(const std::string&, ISvcLocator*);
   virtual ~CalibrateBenchmarkMethod();
@@ -50,7 +50,7 @@ class CalibrateBenchmarkMethod : public GaudiAlgorithm {
   /**  Fills the histograms.
    *   @return status code
    */
-  virtual StatusCode execute() final;
+  virtual StatusCode execute(const EventContext&) const final;
   /**  Finalize.
    *   @return status code
    */
@@ -68,9 +68,9 @@ class CalibrateBenchmarkMethod : public GaudiAlgorithm {
   void runMinimization(int n_param, const std::vector<double>& variable, const std::vector<double>& steps, const std::vector<int>& fixedParameters) const;
 
   /// Handle for electromagnetic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hadronic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
 
   /// Histogram of total deposited energy in the calorimeters 
   TH1F* m_totalEnergyECal;
@@ -116,4 +116,4 @@ class CalibrateBenchmarkMethod : public GaudiAlgorithm {
   Gaudi::Property<std::vector<int>> m_fixedParameters = {this, "fixedParameters", {1,5},"Fixed parameters that will not be minimized"};
 
 };
-#endif /* RECCALORIMETER_CALIBRATEBENCHMARKMETHOD_H */
+#endif /* RECCALORIMETER_CALIBRATEBENCHMARKMETHOD_H */

RecCalorimeter/src/components/CaloTopoCluster.cpp

@@ -27,7 +27,7 @@
 
 DECLARE_COMPONENT(CaloTopoCluster)
 
-CaloTopoCluster::CaloTopoCluster(const std::string& name, ISvcLocator* svcLoc) : GaudiAlgorithm(name, svcLoc) {
+CaloTopoCluster::CaloTopoCluster(const std::string& name, ISvcLocator* svcLoc) : Gaudi::Algorithm(name, svcLoc) {
   declareProperty("TopoClusterInput", m_inputTool, "Handle for input map of cells");
   declareProperty("noiseTool", m_noiseTool, "Handle for the cells noise tool");
   declareProperty("neigboursTool", m_neighboursTool, "Handle for tool to retrieve cell neighbours");
@@ -47,7 +47,7 @@ CaloTopoCluster::CaloTopoCluster(const std::string& name, ISvcLocator* svcLoc) :
   declareProperty("clusterCells", m_clusterCellsCollection, "Handle for clusters (output collection)");
 }
 StatusCode CaloTopoCluster::initialize() {
-  if (GaudiAlgorithm::initialize().isFailure()) return StatusCode::FAILURE;
+  if (Gaudi::Algorithm::initialize().isFailure()) return StatusCode::FAILURE;
   m_geoSvc = service("GeoSvc");
   if (!m_geoSvc) {
     error() << "Unable to locate Geometry Service. "
@@ -82,7 +82,7 @@ StatusCode CaloTopoCluster::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode CaloTopoCluster::execute() {
+StatusCode CaloTopoCluster::execute(const EventContext&) const {
 
   std::unordered_map<uint64_t, double> allCells;
   std::vector<std::pair<uint64_t, double>> firstSeeds;
@@ -396,4 +396,4 @@ CaloTopoCluster::searchForNeighbours(const uint64_t aCellId,
   return addedNeighbourIds;
 }
 
-StatusCode CaloTopoCluster::finalize() { return GaudiAlgorithm::finalize(); }
+StatusCode CaloTopoCluster::finalize() { return Gaudi::Algorithm::finalize(); }

RecCalorimeter/src/components/CaloTopoCluster.h

@@ -2,7 +2,7 @@
 #define RECCALORIMETER_CALOTOPOCLUSTER_H
 
 // Gaudi
-#include "GaudiAlg/GaudiAlgorithm.h"
+#include "Gaudi/Algorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 
 // k4FWCore
@@ -42,7 +42,7 @@ class Segmentation;
  *  @author Coralie Neubueser
  */
 
-class CaloTopoCluster : public GaudiAlgorithm {
+class CaloTopoCluster : public Gaudi::Algorithm {
 public:
   CaloTopoCluster(const std::string& name, ISvcLocator* svcLoc);
 
@@ -88,15 +88,15 @@ class CaloTopoCluster : public GaudiAlgorithm {
                       std::map<uint, std::vector<std::pair<uint64_t, int>>>& aPreClusterCollection,
 		      bool aAllowClusterMerge);
 
-  StatusCode execute();
+  StatusCode execute(const EventContext&) const;
 
   StatusCode finalize();
 
 private:
   // Cluster collection
-  DataHandle<edm4hep::ClusterCollection> m_clusterCollection{"calo/clusters", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::ClusterCollection> m_clusterCollection{"calo/clusters", Gaudi::DataHandle::Writer, this};
   // Cluster cells in collection
-  DataHandle<edm4hep::CalorimeterHitCollection> m_clusterCellsCollection{"calo/clusterCells", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_clusterCellsCollection{"calo/clusterCells", Gaudi::DataHandle::Writer, this};
   /// Pointer to the geometry service
   SmartIF<IGeoSvc> m_geoSvc;
   /// Handle for the input tool

RecCalorimeter/src/components/CaloTopoClusterInputTool.h

@@ -55,19 +55,19 @@ class CaloTopoClusterInputTool : public GaudiTool, virtual public ITopoClusterIn
 
 private:
   /// Handle for electromagnetic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for ecal endcap calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalEndcapCells{"ecalEndcapCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalEndcapCells{"ecalEndcapCells", Gaudi::DataHandle::Reader, this};
   /// Handle for ecal forward calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalFwdCells{"ecalFwdCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalFwdCells{"ecalFwdCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hadronic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hadronic extended barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalExtBarrelCells{"hcalExtBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalExtBarrelCells{"hcalExtBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hcal endcap calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalEndcapCells{"hcalEndcapCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalEndcapCells{"hcalEndcapCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hcal forward calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalFwdCells{"hcalFwdCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalFwdCells{"hcalFwdCells", Gaudi::DataHandle::Reader, this};
   /// Pointer to the geometry service
   SmartIF<IGeoSvc> m_geoSvc;
   /// Name of the electromagnetic barrel readout

RecCalorimeter/src/components/CaloTowerTool.h

@@ -138,19 +138,19 @@ class CaloTowerTool : public GaudiTool, virtual public ITowerTool {
   std::pair<double, double> retrievePhiEtaExtrema(dd4hep::DDSegmentation::Segmentation* aSegmentation, SegmentationType aType);
   std::pair<dd4hep::DDSegmentation::Segmentation*, SegmentationType> retrieveSegmentation(std::string aReadoutName);
   /// Handle for electromagnetic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalBarrelCells{"ecalBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for ecal endcap calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalEndcapCells{"ecalEndcapCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalEndcapCells{"ecalEndcapCells", Gaudi::DataHandle::Reader, this};
   /// Handle for ecal forward calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_ecalFwdCells{"ecalFwdCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_ecalFwdCells{"ecalFwdCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hadronic barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalBarrelCells{"hcalBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hadronic extended barrel cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalExtBarrelCells{"hcalExtBarrelCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalExtBarrelCells{"hcalExtBarrelCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hcal endcap calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalEndcapCells{"hcalEndcapCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalEndcapCells{"hcalEndcapCells", Gaudi::DataHandle::Reader, this};
   /// Handle for hcal forward calorimeter cells (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_hcalFwdCells{"hcalFwdCells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_hcalFwdCells{"hcalFwdCells", Gaudi::DataHandle::Reader, this};
   /// Pointer to the geometry service
   ServiceHandle<IGeoSvc> m_geoSvc;
   /// Name of the electromagnetic barrel readout

RecCalorimeter/src/components/ConeSelection.cpp

@@ -18,7 +18,7 @@
 
 DECLARE_COMPONENT(ConeSelection)
 
-ConeSelection::ConeSelection(const std::string& name, ISvcLocator* svcLoc) : GaudiAlgorithm(name, svcLoc) {
+ConeSelection::ConeSelection(const std::string& name, ISvcLocator* svcLoc) : Gaudi::Algorithm(name, svcLoc) {
   declareProperty("cells", m_cells, "The cells (input)");
   declareProperty("particles", m_particles, "The geant particles (input)");
   declareProperty("selCells", m_selCells, "The selected cells (output)");
@@ -36,13 +36,13 @@ StatusCode ConeSelection::initialize() {
   info() << "ConeSelection initialized" << endmsg;
   debug() << "Cone radius: " << m_r << endmsg;
 
-  StatusCode sc = GaudiAlgorithm::initialize();
+  StatusCode sc = Gaudi::Algorithm::initialize();
   if (sc.isFailure()) return sc;
 
   return StatusCode::SUCCESS;
 }
 
-StatusCode ConeSelection::execute() {
+StatusCode ConeSelection::execute(const EventContext&) const {
 
   m_cellsMap.clear();
 
@@ -89,4 +89,4 @@ StatusCode ConeSelection::execute() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode ConeSelection::finalize() { return GaudiAlgorithm::finalize(); }
+StatusCode ConeSelection::finalize() { return Gaudi::Algorithm::finalize(); }

RecCalorimeter/src/components/ConeSelection.h

@@ -2,7 +2,7 @@
 #define RECCALORIMETER_CONESELECTION_H
 
 // Gaudi
-#include "GaudiAlg/GaudiAlgorithm.h"
+#include "Gaudi/Algorithm.h"
 
 // Key4HEP
 #include "k4FWCore/DataHandle.h"
@@ -24,14 +24,14 @@ class IGeoSvc;
  *
  */
 
-class ConeSelection : public GaudiAlgorithm {
+class ConeSelection : public Gaudi::Algorithm {
 
 public:
   ConeSelection(const std::string& name, ISvcLocator* svcLoc);
 
   StatusCode initialize();
 
-  StatusCode execute();
+  StatusCode execute(const EventContext&) const;
 
   StatusCode finalize();
 
@@ -40,11 +40,11 @@ class ConeSelection : public GaudiAlgorithm {
   ToolHandle<ICellPositionsTool> m_cellPositionsTool{"CellPositionsTool", this};
 
   /// Handle for calo hits (input collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_cells{"cells", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_cells{"cells", Gaudi::DataHandle::Reader, this};
   /// Handle for calo hits (input collection)
-  DataHandle<edm4hep::MCParticleCollection> m_particles{"particles", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::MCParticleCollection> m_particles{"particles", Gaudi::DataHandle::Reader, this};
   /// Handle for calo cells (output collection)
-  DataHandle<edm4hep::CalorimeterHitCollection> m_selCells{"selCells", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::CalorimeterHitCollection> m_selCells{"selCells", Gaudi::DataHandle::Writer, this};
   /// Map of cell IDs (corresponding to DD4hep IDs) and energy
   std::unordered_map<uint64_t, double> m_cellsMap;
 

RecCalorimeter/src/components/CorrectCaloClusters.cpp

@@ -33,7 +33,7 @@ DECLARE_COMPONENT(CorrectCaloClusters)
 
 CorrectCaloClusters::CorrectCaloClusters(const std::string& name,
                                          ISvcLocator* svcLoc)
-    : GaudiAlgorithm(name, svcLoc),
+    : Gaudi::Algorithm(name, svcLoc),
       m_geoSvc("GeoSvc", "CorrectCaloClusters") {
   declareProperty("inClusters", m_inClusters,
                   "Input cluster collection");
@@ -43,7 +43,7 @@ CorrectCaloClusters::CorrectCaloClusters(const std::string& name,
 
 StatusCode CorrectCaloClusters::initialize() {
   {
-    StatusCode sc = GaudiAlgorithm::initialize();
+    StatusCode sc = Gaudi::Algorithm::initialize();
     if (sc.isFailure()) {
       return sc;
     }
@@ -215,7 +215,7 @@ StatusCode CorrectCaloClusters::initialize() {
 }
 
 
-StatusCode CorrectCaloClusters::execute() {
+StatusCode CorrectCaloClusters::execute(const EventContext&) const {
   verbose() << "-------------------------------------------" << endmsg;
 
   // Get the input collection with clusters
@@ -276,7 +276,7 @@ StatusCode CorrectCaloClusters::execute() {
 
 StatusCode CorrectCaloClusters::finalize() {
 
-  return GaudiAlgorithm::finalize();
+  return Gaudi::Algorithm::finalize();
 }
 
 

RecCalorimeter/src/components/CorrectCaloClusters.h

@@ -5,7 +5,7 @@
 #include "k4FWCore/DataHandle.h"
 
 // Gaudi
-#include "GaudiAlg/GaudiAlgorithm.h"
+#include "Gaudi/Algorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/RndmGenerators.h"
@@ -59,14 +59,14 @@ namespace dd4hep {
  *  @author Juraj Smiesko, benchmark calibration added by Michaela Mlynarikova
  */
 
-class CorrectCaloClusters : public GaudiAlgorithm {
+class CorrectCaloClusters : public Gaudi::Algorithm {
 
 public:
   CorrectCaloClusters(const std::string& name, ISvcLocator* svcLoc);
 
   StatusCode initialize();
 
-  StatusCode execute();
+  StatusCode execute(const EventContext&) const;
 
   StatusCode finalize();
 
@@ -163,11 +163,11 @@ class CorrectCaloClusters : public GaudiAlgorithm {
   double getClusterTheta(edm4hep::Cluster cluster);
 
   /// Handle for input calorimeter clusters collection
-  DataHandle<edm4hep::ClusterCollection> m_inClusters {
+  mutable DataHandle<edm4hep::ClusterCollection> m_inClusters {
     "inClusters", Gaudi::DataHandle::Reader, this
   };
   /// Handle for corrected (output) calorimeter clusters collection
-  DataHandle<edm4hep::ClusterCollection> m_outClusters {
+  mutable DataHandle<edm4hep::ClusterCollection> m_outClusters {
     "outClusters", Gaudi::DataHandle::Writer, this
   };
 
@@ -244,4 +244,4 @@ class CorrectCaloClusters : public GaudiAlgorithm {
   Gaudi::Property<bool> m_benchmarkCorr{this, "benchmarkCorr", false};
 };
 
-#endif /* RECCALORIMETER_CORRECTCALOCLUSTERS_H */
+#endif /* RECCALORIMETER_CORRECTCALOCLUSTERS_H */