From ae133d0482cfaad54fe0c0bda88fa3fe39632ba4 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 27 Jul 2024 12:09:30 +0000
Subject: [PATCH] fix: {edm4eic -> edm4hep}::RawCalorimeterHit

---
 JugDigi/src/components/CalorimeterBirksCorr.cpp | 2 --
 JugDigi/src/components/CalorimeterHitDigi.cpp   | 5 ++---
 JugFast/src/components/TruthClustering.cpp      | 1 -
 JugReco/src/components/CalorimeterHitReco.cpp   | 4 ++--
 JugReco/src/components/ImagingPixelReco.cpp     | 4 ++--
 JugReco/src/components/SimpleClustering.cpp     | 1 -
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/JugDigi/src/components/CalorimeterBirksCorr.cpp b/JugDigi/src/components/CalorimeterBirksCorr.cpp
index f70fd68..b29f564 100644
--- a/JugDigi/src/components/CalorimeterBirksCorr.cpp
+++ b/JugDigi/src/components/CalorimeterBirksCorr.cpp
@@ -22,8 +22,6 @@
 
 // Event Model related classes
 #include "edm4hep/SimCalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitData.h"
 
 
 using namespace Gaudi::Units;
diff --git a/JugDigi/src/components/CalorimeterHitDigi.cpp b/JugDigi/src/components/CalorimeterHitDigi.cpp
index 7918845..e71d03b 100644
--- a/JugDigi/src/components/CalorimeterHitDigi.cpp
+++ b/JugDigi/src/components/CalorimeterHitDigi.cpp
@@ -32,8 +32,7 @@
 
 // Event Model related classes
 #include "edm4hep/SimCalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitData.h"
+#include "edm4hep/RawCalorimeterHitCollection.h"
 
 
 using namespace Gaudi::Units;
@@ -83,7 +82,7 @@ namespace Jug::Digi {
 
     DataHandle<edm4hep::SimCalorimeterHitCollection> m_inputHitCollection{
       "inputHitCollection", Gaudi::DataHandle::Reader, this};
-    DataHandle<edm4eic::RawCalorimeterHitCollection> m_outputHitCollection{
+    DataHandle<edm4hep::RawCalorimeterHitCollection> m_outputHitCollection{
       "outputHitCollection", Gaudi::DataHandle::Writer, this};
 
     //  ill-formed: using GaudiAlgorithm::GaudiAlgorithm;
diff --git a/JugFast/src/components/TruthClustering.cpp b/JugFast/src/components/TruthClustering.cpp
index d4ec139..1f2f3b1 100644
--- a/JugFast/src/components/TruthClustering.cpp
+++ b/JugFast/src/components/TruthClustering.cpp
@@ -24,7 +24,6 @@
 #include "edm4eic/CalorimeterHitCollection.h"
 #include "edm4eic/ClusterCollection.h"
 #include "edm4eic/ProtoClusterCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
 
 using namespace Gaudi::Units;
 
diff --git a/JugReco/src/components/CalorimeterHitReco.cpp b/JugReco/src/components/CalorimeterHitReco.cpp
index bac603a..8f73332 100644
--- a/JugReco/src/components/CalorimeterHitReco.cpp
+++ b/JugReco/src/components/CalorimeterHitReco.cpp
@@ -27,7 +27,7 @@
 
 // Event Model related classes
 #include "edm4eic/CalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
+#include "edm4hep/RawCalorimeterHitCollection.h"
 
 using namespace Gaudi::Units;
 
@@ -62,7 +62,7 @@ class CalorimeterHitReco : public GaudiAlgorithm {
   double thresholdADC{0};
   double stepTDC{0};
 
-  DataHandle<edm4eic::RawCalorimeterHitCollection> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader,
+  DataHandle<edm4hep::RawCalorimeterHitCollection> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader,
                                                                     this};
   DataHandle<edm4eic::CalorimeterHitCollection> m_outputHitCollection{"outputHitCollection", Gaudi::DataHandle::Writer,
                                                                   this};
diff --git a/JugReco/src/components/ImagingPixelReco.cpp b/JugReco/src/components/ImagingPixelReco.cpp
index 4c6a3e0..8610066 100644
--- a/JugReco/src/components/ImagingPixelReco.cpp
+++ b/JugReco/src/components/ImagingPixelReco.cpp
@@ -25,7 +25,7 @@
 
 // Event Model related classes
 #include "edm4eic/CalorimeterHitCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
+#include "edm4hep/RawCalorimeterHitCollection.h"
 
 using namespace Gaudi::Units;
 
@@ -60,7 +60,7 @@ class ImagingPixelReco : public GaudiAlgorithm {
   double dyRangeADC{0};
 
   // hits containers
-  DataHandle<edm4eic::RawCalorimeterHitCollection> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader,
+  DataHandle<edm4hep::RawCalorimeterHitCollection> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader,
                                                                     this};
   DataHandle<edm4eic::CalorimeterHitCollection> m_outputHitCollection{"outputHitCollection", Gaudi::DataHandle::Writer,
                                                                   this};
diff --git a/JugReco/src/components/SimpleClustering.cpp b/JugReco/src/components/SimpleClustering.cpp
index 67ae2a9..e92e67e 100644
--- a/JugReco/src/components/SimpleClustering.cpp
+++ b/JugReco/src/components/SimpleClustering.cpp
@@ -23,7 +23,6 @@
 #include "edm4eic/CalorimeterHitCollection.h"
 #include "edm4eic/ClusterCollection.h"
 #include "edm4eic/ProtoClusterCollection.h"
-#include "edm4eic/RawCalorimeterHitCollection.h"
 #include "edm4hep/utils/vector_utils.h"
 
 using namespace Gaudi::Units;