From 79d3dd494a6b9e056799e0484e8301e122ada3df Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Date: Sat, 27 Jan 2024 18:49:51 +0100
Subject: [PATCH] Add the edm4hep includes to allow compilation with clang
 (#166)

---
 .../components/GlobalConvertedObjectsMap.h    | 30 +++++++++----------
 .../src/components/Lcio2EDM4hep.cpp           | 14 ---------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h b/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
index 7bdd3170..fd420ea5 100644
--- a/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
+++ b/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
@@ -21,6 +21,20 @@
 
 #include "k4EDM4hep2LcioConv/MappingUtils.h"
 
+#include "edm4hep/CalorimeterHit.h"
+#include "edm4hep/Cluster.h"
+#include "edm4hep/MCParticle.h"
+#include "edm4hep/ParticleID.h"
+#include "edm4hep/RawCalorimeterHit.h"
+#include "edm4hep/RawTimeSeries.h"
+#include "edm4hep/ReconstructedParticle.h"
+#include "edm4hep/SimCalorimeterHit.h"
+#include "edm4hep/SimTrackerHit.h"
+#include "edm4hep/Track.h"
+#include "edm4hep/TrackerHit.h"
+#include "edm4hep/TrackerHitPlane.h"
+#include "edm4hep/Vertex.h"
+
 #include <string_view>
 
 namespace EVENT {
@@ -39,22 +53,6 @@ namespace EVENT {
   class ParticleID;
 }  // namespace EVENT
 
-namespace edm4hep {
-  class Track;
-  class TrackerHit;
-  class TrackerHitPlane;
-  class SimTrackerHit;
-  class CalorimeterHit;
-  class RawCalorimeterHit;
-  class SimCalorimeterHit;
-  class RawTimeSeries;
-  class Cluster;
-  class Vertex;
-  class ReconstructedParticle;
-  class MCParticle;
-  class ParticleID;
-}  // namespace edm4hep
-
 namespace k4MarlinWrapper {
 
   /**
diff --git a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
index b7ad14c3..11015a54 100644
--- a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
+++ b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
@@ -22,20 +22,6 @@
 #include <EVENT/LCCollection.h>
 #include <Exceptions.h>
 
-#include <edm4hep/ClusterCollection.h>
-#include <edm4hep/Constants.h>
-#include <edm4hep/EventHeaderCollection.h>
-#include <edm4hep/MCParticleCollection.h>
-#include <edm4hep/ParticleIDCollection.h>
-#include <edm4hep/RawCalorimeterHitCollection.h>
-#include <edm4hep/RawTimeSeriesCollection.h>
-#include <edm4hep/ReconstructedParticleCollection.h>
-#include <edm4hep/SimCalorimeterHitCollection.h>
-#include <edm4hep/SimTrackerHitCollection.h>
-#include <edm4hep/TrackCollection.h>
-#include <edm4hep/TrackerHitPlaneCollection.h>
-#include <edm4hep/VertexCollection.h>
-
 #include "k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h"
 
 #include <k4FWCore/DataHandle.h>