From 16e56e29fa100298299dc7df46c8c14e07a8548d Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 12 Sep 2023 18:27:41 +0200
Subject: [PATCH] Remove superfluous IGeoSvc.h and its references

---
 .../src/InspectHitsCollectionsTool.cpp        |  4 ++-
 SimG4Components/src/SimG4DD4hepDetector.cpp   |  4 +--
 SimG4Components/src/SimG4SaveTrajectory.cpp   |  4 ++-
 .../include/SimG4Interface/IGeoSvc.h          | 35 -------------------
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 SimG4Interface/include/SimG4Interface/IGeoSvc.h

diff --git a/SimG4Components/src/InspectHitsCollectionsTool.cpp b/SimG4Components/src/InspectHitsCollectionsTool.cpp
index f81a9f9..deda4d8 100644
--- a/SimG4Components/src/InspectHitsCollectionsTool.cpp
+++ b/SimG4Components/src/InspectHitsCollectionsTool.cpp
@@ -1,7 +1,9 @@
 #include "InspectHitsCollectionsTool.h"
 
+// k4FWCore
+#include "k4Interface/IGeoSvc.h"
+
 // FCCSW
-#include "SimG4Interface/IGeoSvc.h"
 #include "SimG4Common/Geant4CaloHit.h"
 #include "SimG4Common/Geant4PreDigiTrackHit.h"
 
diff --git a/SimG4Components/src/SimG4DD4hepDetector.cpp b/SimG4Components/src/SimG4DD4hepDetector.cpp
index 74dd1de..2ef500e 100644
--- a/SimG4Components/src/SimG4DD4hepDetector.cpp
+++ b/SimG4Components/src/SimG4DD4hepDetector.cpp
@@ -1,7 +1,7 @@
 #include "SimG4DD4hepDetector.h"
 
-// FCCSW
-#include "SimG4Interface/IGeoSvc.h"
+// k4FWCore
+#include "k4Interface/IGeoSvc.h"
 
 // Geant4
 #include "G4VUserDetectorConstruction.hh"
diff --git a/SimG4Components/src/SimG4SaveTrajectory.cpp b/SimG4Components/src/SimG4SaveTrajectory.cpp
index 21722a9..12cc083 100644
--- a/SimG4Components/src/SimG4SaveTrajectory.cpp
+++ b/SimG4Components/src/SimG4SaveTrajectory.cpp
@@ -1,7 +1,9 @@
 #include "SimG4SaveTrajectory.h"
 
+// k4FwCore
+#include "k4Interface/IGeoSvc.h"
+
 // FCCSW
-#include "SimG4Interface/IGeoSvc.h"
 #include "SimG4Common/Units.h"
 
 // Geant4
diff --git a/SimG4Interface/include/SimG4Interface/IGeoSvc.h b/SimG4Interface/include/SimG4Interface/IGeoSvc.h
deleted file mode 100644
index 4aa7c04..0000000
--- a/SimG4Interface/include/SimG4Interface/IGeoSvc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  IGeoSvc.h
-//
-//
-//  Created by Julia Hrdinka on 30/03/15.
-//
-//
-
-#ifndef IGEOSVC_H
-#define IGEOSVC_H
-
-#include "GaudiKernel/IService.h"
-
-namespace dd4hep {
-class Detector;
-class DetElement;
-}
-
-class G4VUserDetectorConstruction;
-
-class GAUDI_API IGeoSvc : virtual public IService {
-
-public:
-  /// InterfaceID
-  DeclareInterfaceID(IGeoSvc, 1, 0);
-  // receive DD4hep Geometry
-  virtual dd4hep::DetElement getDD4HepGeo() = 0;
-  virtual dd4hep::Detector* lcdd() = 0;
-  // receive Geant4 Geometry
-  virtual G4VUserDetectorConstruction* getGeant4Geo() = 0;
-
-  virtual ~IGeoSvc() {}
-};
-
-#endif  // IGEOSVC_H