From 8d7b50c3388cc4516c2c1e29fc4cd4a8a74ddff0 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 20 Oct 2020 22:12:48 +0800
Subject: [PATCH] WIP: rename GeoSvc to GeomSvc.

---
 .../DetInterface/{IGeoSvc.h => IGeomSvc.h}    |  8 ++---
 Detector/{GeoSvc => GeomSvc}/CMakeLists.txt   | 10 +++---
 .../GeoSvc.cpp => GeomSvc/src/GeomSvc.cpp}    | 36 +++++++++----------
 .../src/GeoSvc.h => GeomSvc/src/GeomSvc.h}    | 16 ++++-----
 Digitisers/DCHDigi/src/DCHDigiAlg.cpp         |  4 +--
 Digitisers/DCHDigi/src/DCHDigiAlg.h           |  4 +--
 Digitisers/G2CDArbor/src/G2CDArborAlg.cpp     |  4 +--
 Digitisers/G2CDArbor/src/G2CDArborAlg.h       |  4 +--
 Examples/options/dumpid.py                    |  4 +--
 Examples/options/tut_detsim.py                |  4 +--
 Examples/options/tut_detsim_SDT.py            |  4 +--
 Examples/options/tut_detsim_pan_matrix.py     |  4 +--
 Examples/options/tut_detsim_pandora.py        |  4 +--
 Examples/src/DumpIDAlg/DumpIDAlg.cpp          |  4 +--
 Examples/src/DumpIDAlg/DumpIDAlg.h            |  4 +--
 Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp  |  4 +--
 Reconstruction/Digi_Calo/src/CaloDigiAlg.h    |  4 +--
 .../MatrixPandora/include/CaloHitCreator.h    |  2 +-
 .../MatrixPandora/include/GeometryCreator.h   |  2 +-
 .../MatrixPandora/src/CaloHitCreator.cpp      |  6 ++--
 .../MatrixPandora/src/GeometryCreator.cpp     |  6 ++--
 Service/TrackSystemSvc/src/MarlinKalTest.cc   |  4 +--
 Service/TrackSystemSvc/src/MarlinKalTest.h    |  8 ++---
 Service/TrackSystemSvc/src/TrackSystemSvc.cpp | 10 +++---
 .../DetSimGeom/src/AnExampleDetElemTool.cpp   |  4 +--
 .../DetSimGeom/src/AnExampleDetElemTool.h     |  4 +--
 .../DetSimSD/src/CalorimeterSensDetTool.cpp   |  4 +--
 .../DetSimSD/src/CalorimeterSensDetTool.h     |  4 +--
 .../DetSimSD/src/DriftChamberSensDetTool.cpp  |  4 +--
 .../DetSimSD/src/DriftChamberSensDetTool.h    |  4 +--
 Utilities/KalDet/kaldet/ILDFTDKalDetector.h   |  4 +--
 Utilities/KalDet/kaldet/ILDSETKalDetector.h   |  6 ++--
 Utilities/KalDet/kaldet/ILDSITKalDetector.h   |  6 ++--
 .../KalDet/kaldet/ILDSupportKalDetector.h     |  4 +--
 Utilities/KalDet/kaldet/ILDTPCKalDetector.h   |  4 +--
 Utilities/KalDet/kaldet/ILDVXDKalDetector.h   |  6 ++--
 Utilities/KalDet/kaldet/MaterialDataBase.h    |  8 ++---
 .../KalDet/src/ild/common/MaterialDataBase.cc | 10 +++---
 .../KalDet/src/ild/common/MaterialDataBase.h  |  8 ++---
 .../KalDet/src/ild/ftd/ILDFTDKalDetector.cc   |  6 ++--
 .../KalDet/src/ild/ftd/ILDFTDKalDetector.h    |  6 ++--
 .../KalDet/src/ild/set/ILDSETKalDetector.cc   |  6 ++--
 .../KalDet/src/ild/sit/ILDSITKalDetector.cc   |  6 ++--
 .../KalDet/src/ild/sit/ILDSITKalDetector.h    |  6 ++--
 .../src/ild/support/ILDSupportKalDetector.cc  |  4 +--
 .../src/ild/support/ILDSupportKalDetector.h   |  4 +--
 .../KalDet/src/ild/tpc/ILDTPCKalDetector.cc   |  4 +--
 .../KalDet/src/ild/tpc/ILDTPCKalDetector.h    |  4 +--
 .../KalDet/src/ild/vxd/ILDVXDKalDetector.cc   |  8 ++---
 .../KalDet/src/ild/vxd/ILDVXDKalDetector.h    |  6 ++--
 Utilities/KiTrack/src/Tools/Fitter.cc         |  2 +-
 docs/simulation-tutorial/index.html           |  4 +--
 52 files changed, 153 insertions(+), 153 deletions(-)
 rename Detector/DetInterface/DetInterface/{IGeoSvc.h => IGeomSvc.h} (92%)
 rename Detector/{GeoSvc => GeomSvc}/CMakeLists.txt (84%)
 rename Detector/{GeoSvc/src/GeoSvc.cpp => GeomSvc/src/GeomSvc.cpp} (96%)
 rename Detector/{GeoSvc/src/GeoSvc.h => GeomSvc/src/GeomSvc.h} (89%)

diff --git a/Detector/DetInterface/DetInterface/IGeoSvc.h b/Detector/DetInterface/DetInterface/IGeomSvc.h
similarity index 92%
rename from Detector/DetInterface/DetInterface/IGeoSvc.h
rename to Detector/DetInterface/DetInterface/IGeomSvc.h
index 75f6f5aa..7fe1255d 100644
--- a/Detector/DetInterface/DetInterface/IGeoSvc.h
+++ b/Detector/DetInterface/DetInterface/IGeomSvc.h
@@ -1,5 +1,5 @@
 //
-//  IGeoSvc.h
+//  IGeomSvc.h
 //
 //  Based on FCCSW with some modification.
 //  In the design, the geometry shoud only depends on DD4hep. 
@@ -34,12 +34,12 @@ namespace gear{
 class TMaterial;
 // class G4VUserDetectorConstruction;
 
-class GAUDI_API IGeoSvc : virtual public IService {
+class GAUDI_API IGeomSvc : virtual public IService {
 public:
   typedef dd4hep::DDSegmentation::BitFieldCoder Decoder;
 public:
   /// InterfaceID
-  DeclareInterfaceID(IGeoSvc, 1, 0);
+  DeclareInterfaceID(IGeomSvc, 1, 0);
   // receive DD4hep Geometry
   virtual dd4hep::DetElement getDD4HepGeo() = 0;
   virtual dd4hep::Detector* lcdd() = 0;
@@ -59,7 +59,7 @@ public:
   virtual const double getDetParameter(std::string set_name, std::string par_name) = 0;
   virtual TMaterial* getMaterial(std::string s) = 0;
 
-  virtual ~IGeoSvc() {}
+  virtual ~IGeomSvc() {}
 };
 
 #endif  // IGEOSVC_H
diff --git a/Detector/GeoSvc/CMakeLists.txt b/Detector/GeomSvc/CMakeLists.txt
similarity index 84%
rename from Detector/GeoSvc/CMakeLists.txt
rename to Detector/GeomSvc/CMakeLists.txt
index b0e86b46..e9aefede 100644
--- a/Detector/GeoSvc/CMakeLists.txt
+++ b/Detector/GeomSvc/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 ##############################################################################
-# Package: GeoSvc
-#    Desc: implement the IGeoSvc interface.
+# Package: GeomSvc
+#    Desc: implement the IGeomSvc interface.
 ##############################################################################
 
-gaudi_subdir(GeoSvc v0r0)
+gaudi_subdir(GeomSvc v0r0)
 
 gaudi_depends_on_subdirs(
     FWCore
@@ -17,8 +17,8 @@ find_package(GEAR REQUIRED)
 
 message("GEAR_LIBRARIES: ${GEAR_LIBRARIES}")
 
-gaudi_add_module(GeoSvc
-                 src/GeoSvc.cpp
+gaudi_add_module(GeomSvc
+                 src/GeomSvc.cpp
                  INCLUDE_DIRS
                    # DetInterface
                    # DD4hep
diff --git a/Detector/GeoSvc/src/GeoSvc.cpp b/Detector/GeomSvc/src/GeomSvc.cpp
similarity index 96%
rename from Detector/GeoSvc/src/GeoSvc.cpp
rename to Detector/GeomSvc/src/GeomSvc.cpp
index 61671acf..050431b8 100644
--- a/Detector/GeoSvc/src/GeoSvc.cpp
+++ b/Detector/GeomSvc/src/GeomSvc.cpp
@@ -1,4 +1,4 @@
-#include "GeoSvc.h"
+#include "GeomSvc.h"
 #include "gearimpl/GearParametersImpl.h"
 #include "TMath.h"
 #include "TMaterial.h"
@@ -19,19 +19,19 @@
 #include <iomanip>
 #include <iostream>
 
-DECLARE_COMPONENT(GeoSvc)
+DECLARE_COMPONENT(GeomSvc)
 
-GeoSvc::GeoSvc(const std::string& name, ISvcLocator* svc)
+GeomSvc::GeomSvc(const std::string& name, ISvcLocator* svc)
 : base_class(name, svc), m_dd4hep_geo(nullptr), m_vxdData(nullptr), m_beamPipeData(nullptr){
 
 }
 
-GeoSvc::~GeoSvc() {
+GeomSvc::~GeomSvc() {
 
 }
 
 StatusCode
-GeoSvc::initialize() {
+GeomSvc::initialize() {
   StatusCode sc = Service::initialize();
 
   m_dd4hep_geo = &(dd4hep::Detector::getInstance());
@@ -68,14 +68,14 @@ GeoSvc::initialize() {
 }
 
 StatusCode
-GeoSvc::finalize() {
+GeomSvc::finalize() {
   StatusCode sc;
   if(m_vxdParameters) delete m_vxdParameters;
   return sc;
 }
 
 dd4hep::DetElement
-GeoSvc::getDD4HepGeo() {
+GeomSvc::getDD4HepGeo() {
     if (lcdd()) {
         return lcdd()->world();
     }
@@ -83,15 +83,15 @@ GeoSvc::getDD4HepGeo() {
 }
 
 dd4hep::Detector*
-GeoSvc::lcdd() {
+GeomSvc::lcdd() {
     return m_dd4hep_geo;
 }
 
 
-IGeoSvc::Decoder*
-GeoSvc::getDecoder(const std::string& readout_name) {
+IGeomSvc::Decoder*
+GeomSvc::getDecoder(const std::string& readout_name) {
 
-    IGeoSvc::Decoder* decoder = nullptr;
+    IGeomSvc::Decoder* decoder = nullptr;
 
     if (!lcdd()) {
         error() << "Failed to get lcdd()" << endmsg;
@@ -121,26 +121,26 @@ GeoSvc::getDecoder(const std::string& readout_name) {
 }
 
 
-const std::map<std::string,double>& GeoSvc::getDetParameters(std::string name){
+const std::map<std::string,double>& GeomSvc::getDetParameters(std::string name){
   if(m_detParameters.find(name)!=m_detParameters.end()) return m_detParameters[name];
   else{
     char message[200];
-    sprintf(message,"GeoSvc has not the parameter set named %s", name); 
+    sprintf(message,"GeomSvc has not the parameter set named %s", name); 
     throw std::runtime_error(message);
   }
 }
 
-const double GeoSvc::getDetParameter(std::string set_name, std::string par_name){
+const double GeomSvc::getDetParameter(std::string set_name, std::string par_name){
   std::map<std::string, std::map<std::string,double> >::iterator it=m_detParameters.find(set_name);
   if(it!=m_detParameters.end()){
     if(it->second.find(par_name)!=it->second.end()) return it->second[par_name];  
   }
   char message[200];
-  sprintf(message,"GeoSvc has not the parameter named %s in set %s", par_name, set_name);
+  sprintf(message,"GeomSvc has not the parameter named %s in set %s", par_name, set_name);
   throw std::runtime_error(message);
 }
 
-StatusCode GeoSvc::convertVXD(dd4hep::DetElement& vxd){
+StatusCode GeomSvc::convertVXD(dd4hep::DetElement& vxd){
   StatusCode sc;
   //fucd: another method to obtain parameters, but not fully for KalDet  
   bool extensionDataValid = true;
@@ -575,7 +575,7 @@ StatusCode GeoSvc::convertVXD(dd4hep::DetElement& vxd){
   return sc;
 }
 
-TGeoNode* GeoSvc::FindNode(TGeoNode* mother, char* name){
+TGeoNode* GeomSvc::FindNode(TGeoNode* mother, char* name){
   TGeoNode* next = 0;
   if(mother->GetNdaughters()!=0){ 
     for(int i=0;i<mother->GetNdaughters();i++){
@@ -594,7 +594,7 @@ TGeoNode* GeoSvc::FindNode(TGeoNode* mother, char* name){
   return next;
 }
 
-TMaterial* GeoSvc::getMaterial(std::string name){
+TMaterial* GeomSvc::getMaterial(std::string name){
   std::map<std::string, TMaterial*>::const_iterator it = m_materials.find(name);
   if(it!=m_materials.end()) return it->second;
   else return 0;     
diff --git a/Detector/GeoSvc/src/GeoSvc.h b/Detector/GeomSvc/src/GeomSvc.h
similarity index 89%
rename from Detector/GeoSvc/src/GeoSvc.h
rename to Detector/GeomSvc/src/GeomSvc.h
index b90060cf..7c4207af 100644
--- a/Detector/GeoSvc/src/GeoSvc.h
+++ b/Detector/GeomSvc/src/GeomSvc.h
@@ -1,8 +1,8 @@
-#ifndef GeoSvc_h
-#define GeoSvc_h
+#ifndef GeomSvc_h
+#define GeomSvc_h
 
 // Interface
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 // Gaudi
 #include "GaudiKernel/IIncidentListener.h"
@@ -22,16 +22,16 @@
 class dd4hep::DetElement;
 class TGeoNode;
 
-class GeoSvc: public extends<Service, IGeoSvc> {
+class GeomSvc: public extends<Service, IGeomSvc> {
  public:
-  GeoSvc(const std::string& name, ISvcLocator* svc);
-  ~GeoSvc();
+  GeomSvc(const std::string& name, ISvcLocator* svc);
+  ~GeomSvc();
   
   // Service
   StatusCode initialize() override;
   StatusCode finalize() override;
   
-  // IGeoSvc
+  // IGeomSvc
   dd4hep::DetElement getDD4HepGeo() override;
   dd4hep::Detector* lcdd() override;
   
@@ -76,4 +76,4 @@ private:
   };
 };
 
-#endif // GeoSvc_h
+#endif // GeomSvc_h
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
index d4089bbf..4f782b71 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
@@ -36,8 +36,8 @@ DCHDigiAlg::DCHDigiAlg(const std::string& name, ISvcLocator* svcLoc)
 StatusCode DCHDigiAlg::initialize()
 {
   /*
-  m_geosvc = service<IGeoSvc>("GeoSvc");
-  if ( !m_geosvc )  throw "DCHDigiAlg :Failed to find GeoSvc ...";
+  m_geosvc = service<IGeomSvc>("GeomSvc");
+  if ( !m_geosvc )  throw "DCHDigiAlg :Failed to find GeomSvc ...";
   dd4hep::Detector* m_dd4hep = m_geosvc->lcdd();
   if ( !m_dd4hep )  throw "DCHDigiAlg :Failed to get dd4hep::Detector ...";
   m_cellIDConverter = new dd4hep::rec::CellIDPositionConverter(*m_dd4hep);
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.h b/Digitisers/DCHDigi/src/DCHDigiAlg.h
index bdd80cfd..6a6bb320 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.h
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.h
@@ -9,7 +9,7 @@
 
 #include <DDRec/DetectorData.h>
 #include <DDRec/CellIDPositionConverter.h>
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 
 
@@ -36,7 +36,7 @@ public:
  
 protected:
 
-  SmartIF<IGeoSvc> m_geosvc;
+  SmartIF<IGeomSvc> m_geosvc;
   typedef std::vector<float> FloatVec;
   int _nEvt ;
 
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp b/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp
index 6e36e5ac..2c5526aa 100644
--- a/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp
+++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp
@@ -215,9 +215,9 @@ G2CDArborAlg::G2CDArborAlg(const std::string& name, ISvcLocator* svcLoc)
 }
 
 StatusCode G2CDArborAlg::initialize() {
-     m_geosvc = service<IGeoSvc>("GeoSvc");
+     m_geosvc = service<IGeomSvc>("GeomSvc");
      if (!m_geosvc) {
-       error() << "Failed to find GeoSvc." << endmsg;
+       error() << "Failed to find GeomSvc." << endmsg;
        return StatusCode::FAILURE;
      }
      m_dd4hep_geo = m_geosvc->lcdd();
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.h b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
index 9608419d..35658c8b 100644
--- a/Digitisers/G2CDArbor/src/G2CDArborAlg.h
+++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
@@ -16,7 +16,7 @@
 
 #include <DDRec/DetectorData.h>
 #include <DDRec/CellIDPositionConverter.h>
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 #include <string>
 #include <iostream>
@@ -148,7 +148,7 @@ protected:
      std::ostream *_output;
      std::string m_encoder_str;
 
-     SmartIF<IGeoSvc> m_geosvc;
+     SmartIF<IGeomSvc> m_geosvc;
      dd4hep::Detector* m_dd4hep_geo;
      dd4hep::DDSegmentation::BitFieldCoder* m_decoder;
 };
diff --git a/Examples/options/dumpid.py b/Examples/options/dumpid.py
index 1b7ddde3..91f63ce4 100644
--- a/Examples/options/dumpid.py
+++ b/Examples/options/dumpid.py
@@ -19,8 +19,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc("GeoSvc")
+from Configurables import GeomSvc
+geosvc = GeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim.py b/Examples/options/tut_detsim.py
index 3c9071ed..a7062c48 100644
--- a/Examples/options/tut_detsim.py
+++ b/Examples/options/tut_detsim.py
@@ -44,8 +44,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc("GeoSvc")
+from Configurables import GeomSvc
+geosvc = GeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_SDT.py b/Examples/options/tut_detsim_SDT.py
index 5510a6d9..478f3acc 100644
--- a/Examples/options/tut_detsim_SDT.py
+++ b/Examples/options/tut_detsim_SDT.py
@@ -44,8 +44,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc("GeoSvc")
+from Configurables import GeomSvc
+geosvc = GeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_pan_matrix.py b/Examples/options/tut_detsim_pan_matrix.py
index ab3b6cbb..05bc4fde 100644
--- a/Examples/options/tut_detsim_pan_matrix.py
+++ b/Examples/options/tut_detsim_pan_matrix.py
@@ -37,8 +37,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc("GeoSvc")
+from Configurables import GeomSvc
+geosvc = GeomSvc("GeomSvc")
 #geosvc.compact = geometry_path
 geosvc.compact = "./Detector/DetEcalMatrix/compact/det.xml"
 
diff --git a/Examples/options/tut_detsim_pandora.py b/Examples/options/tut_detsim_pandora.py
index be552eaa..af80c1e6 100644
--- a/Examples/options/tut_detsim_pandora.py
+++ b/Examples/options/tut_detsim_pandora.py
@@ -38,8 +38,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc("GeoSvc")
+from Configurables import GeomSvc
+geosvc = GeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/src/DumpIDAlg/DumpIDAlg.cpp b/Examples/src/DumpIDAlg/DumpIDAlg.cpp
index 1ae59e33..c82b7647 100644
--- a/Examples/src/DumpIDAlg/DumpIDAlg.cpp
+++ b/Examples/src/DumpIDAlg/DumpIDAlg.cpp
@@ -18,9 +18,9 @@ DumpIDAlg::DumpIDAlg(const std::string& name, ISvcLocator* svcLoc)
 
 StatusCode DumpIDAlg::initialize()
 {
-    m_geosvc = service<IGeoSvc>("GeoSvc");
+    m_geosvc = service<IGeomSvc>("GeomSvc");
     if (!m_geosvc) {
-        error() << "Failed to find GeoSvc." << endmsg;
+        error() << "Failed to find GeomSvc." << endmsg;
         return StatusCode::FAILURE;
     }
     m_dd4hep_geo = m_geosvc->lcdd();
diff --git a/Examples/src/DumpIDAlg/DumpIDAlg.h b/Examples/src/DumpIDAlg/DumpIDAlg.h
index 20bb9469..9680d2b2 100644
--- a/Examples/src/DumpIDAlg/DumpIDAlg.h
+++ b/Examples/src/DumpIDAlg/DumpIDAlg.h
@@ -5,7 +5,7 @@
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiKernel/NTuple.h"
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 #include "DD4hep/Detector.h"
 
@@ -27,7 +27,7 @@ public:
     virtual StatusCode finalize();
 
 private:
-    SmartIF<IGeoSvc> m_geosvc;
+    SmartIF<IGeomSvc> m_geosvc;
     dd4hep::Detector* m_dd4hep_geo;
     dd4hep::DDSegmentation::BitFieldCoder* m_decoder;
 
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp b/Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp
index 93e2fb35..acc8533f 100644
--- a/Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp
+++ b/Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp
@@ -35,8 +35,8 @@ StatusCode CaloDigiAlg::initialize()
 {
 
   std::cout<<"CaloDigiAlg::m_scale="<<m_scale<<std::endl;
-  m_geosvc = service<IGeoSvc>("GeoSvc");
-  if ( !m_geosvc )  throw "CaloDigiAlg :Failed to find GeoSvc ...";
+  m_geosvc = service<IGeomSvc>("GeomSvc");
+  if ( !m_geosvc )  throw "CaloDigiAlg :Failed to find GeomSvc ...";
   dd4hep::Detector* m_dd4hep = m_geosvc->lcdd();
   if ( !m_dd4hep )  throw "CaloDigiAlg :Failed to get dd4hep::Detector ...";
   m_cellIDConverter = new dd4hep::rec::CellIDPositionConverter(*m_dd4hep);
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
index c1a82c88..2142018c 100644
--- a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
+++ b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
@@ -12,7 +12,7 @@
 
 #include <DDRec/DetectorData.h>
 #include <DDRec/CellIDPositionConverter.h>
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 
 
@@ -39,7 +39,7 @@ public:
  
 protected:
 
-  SmartIF<IGeoSvc> m_geosvc;
+  SmartIF<IGeomSvc> m_geosvc;
   typedef std::vector<float> FloatVec;
 
   int _nEvt ;
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h
index 7dfb684f..fb601edb 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h
@@ -15,7 +15,7 @@
 
 #include "Api/PandoraApi.h"
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/DD4hepUnits.h"
 #include "DD4hep/Detector.h"
 #include <DDRec/DetectorData.h>
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h
index 6bd9c4ba..318b52d5 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h
@@ -12,7 +12,7 @@
 
 #include "GaudiKernel/ISvcLocator.h"
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/DD4hepUnits.h"
 #include "DD4hep/Detector.h"
 
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp b/Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp
index a6e81280..5bda03ba 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp
@@ -57,11 +57,11 @@ CaloHitCreator::CaloHitCreator(const Settings &settings, const pandora::Pandora
     _GEAR = iSvc->getGearMgr();
 
 
-    IGeoSvc*  Svc = 0;
-    StatusCode sc1 = svcloc->service("GeoSvc", Svc, false);
+    IGeomSvc*  Svc = 0;
+    StatusCode sc1 = svcloc->service("GeomSvc", Svc, false);
     if ( !sc1 )
     {
-        throw "Failed to find GeoSvc ...";
+        throw "Failed to find GeomSvc ...";
     }
     m_dd4hep = Svc->lcdd();
     const dd4hep::DetElement &detElement = m_dd4hep->detector("CaloDetector");
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp b/Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp
index 343b6045..2ccaa099 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp
@@ -47,11 +47,11 @@ pandora::StatusCode GeometryCreator::CreateGeometry(ISvcLocator* svcloc)
     _GEAR = iSvc->getGearMgr();
 
 
-    IGeoSvc*  Svc = 0;
-    StatusCode sc1 = svcloc->service("GeoSvc", Svc, false);
+    IGeomSvc*  Svc = 0;
+    StatusCode sc1 = svcloc->service("GeomSvc", Svc, false);
     if ( !sc1 )
     {
-        throw "Failed to find GeoSvc ...";
+        throw "Failed to find GeomSvc ...";
     }
     m_dd4hep = Svc->lcdd();
     
diff --git a/Service/TrackSystemSvc/src/MarlinKalTest.cc b/Service/TrackSystemSvc/src/MarlinKalTest.cc
index 0c0dde8c..90dcd47c 100644
--- a/Service/TrackSystemSvc/src/MarlinKalTest.cc
+++ b/Service/TrackSystemSvc/src/MarlinKalTest.cc
@@ -26,7 +26,7 @@
 #include "gear/BField.h"
 #include "gear/TPCParameters.h"
 #include "gear/PadRowLayout2D.h"
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 #include <math.h>
 #include <cmath>
@@ -39,7 +39,7 @@
 
 namespace MarlinTrk{
   
-  MarlinKalTest::MarlinKalTest( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc) : 
+  MarlinKalTest::MarlinKalTest( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) : 
   _ipLayer(NULL) ,
   _gearMgr( &gearMgr ),
   _geoSvc(geoSvc){
diff --git a/Service/TrackSystemSvc/src/MarlinKalTest.h b/Service/TrackSystemSvc/src/MarlinKalTest.h
index 2e62bd09..df37d747 100644
--- a/Service/TrackSystemSvc/src/MarlinKalTest.h
+++ b/Service/TrackSystemSvc/src/MarlinKalTest.h
@@ -19,13 +19,13 @@
 
 #include <cmath>
 #include <vector>
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 class TKalDetCradle ;
 class TVKalDetector ;
 class ILDVMeasLayer ;
 class THelicalTrack ;
-//class IGeoSvc;
+//class IGeomSvc;
 class ILDCylinderMeasLayer;
 
 namespace edm4hep{
@@ -48,7 +48,7 @@ namespace MarlinTrk{
     
     
     /** Default c'tor, initializes the geometry from GEAR. */
-    MarlinKalTest( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc) ;
+    MarlinKalTest( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) ;
     
     /** d'tor */
     ~MarlinKalTest() ;
@@ -92,7 +92,7 @@ namespace MarlinTrk{
     const ILDCylinderMeasLayer* _ipLayer ;
     
     const gear::GearMgr* _gearMgr ;
-    IGeoSvc* _geoSvc;
+    IGeomSvc* _geoSvc;
     
     TKalDetCradle* _det ;            // the detector cradle
     
diff --git a/Service/TrackSystemSvc/src/TrackSystemSvc.cpp b/Service/TrackSystemSvc/src/TrackSystemSvc.cpp
index 3f1abc0d..bdcef20f 100644
--- a/Service/TrackSystemSvc/src/TrackSystemSvc.cpp
+++ b/Service/TrackSystemSvc/src/TrackSystemSvc.cpp
@@ -26,12 +26,12 @@ MarlinTrk::IMarlinTrkSystem* TrackSystemSvc::getTrackSystem(){
       mgr = _gear->getGearMgr();
     }
 
-    auto _geoSvc = service<IGeoSvc>("GeoSvc");
+    auto _geoSvc = service<IGeomSvc>("GeomSvc");
     if ( !_geoSvc ) {
-      info() << "Failed to find GeoSvc ..." << endmsg;
+      info() << "Failed to find GeomSvc ..." << endmsg;
     }
     if(mgr==0&&_geoSvc==0){
-      fatal() << "Both GearSvc and GeoSvc invalid!" << endmsg;
+      fatal() << "Both GearSvc and GeomSvc invalid!" << endmsg;
       return 0;
     }
 
@@ -49,9 +49,9 @@ StatusCode TrackSystemSvc::initialize(){
   }
   gear::GearMgr* mgr = _gear->getGearMgr();
 
-  auto _geoSvc = service<IGeoSvc>("GeoSvc");
+  auto _geoSvc = service<IGeomSvc>("GeomSvc");
   if ( !_geoSvc ) {
-    error() << "Failed to find GeoSvc ..." << endmsg;
+    error() << "Failed to find GeomSvc ..." << endmsg;
     return StatusCode::FAILURE;
   }
   m_trackSystem = new MarlinTrk::MarlinKalTest( *mgr, _geoSvc ) ;
diff --git a/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp b/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
index e78170bc..fffebf79 100644
--- a/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
+++ b/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
@@ -191,9 +191,9 @@ StatusCode
 AnExampleDetElemTool::initialize() {
     StatusCode sc;
 
-    m_geosvc = service<IGeoSvc>("GeoSvc");
+    m_geosvc = service<IGeomSvc>("GeomSvc");
     if (!m_geosvc) {
-        error() << "Failed to find GeoSvc." << endmsg;
+        error() << "Failed to find GeomSvc." << endmsg;
         return StatusCode::FAILURE;
     }
 
diff --git a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
index ba199071..31fcfc0e 100644
--- a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
+++ b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
@@ -8,7 +8,7 @@
 #include "G4SystemOfUnits.hh"
 #include "G4PhysicalConstants.hh"
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DetSimInterface/IDetElemTool.h"
 #include "DetSimInterface/ISensDetTool.h"
 
@@ -31,7 +31,7 @@ private:
     // DD4hep XML compact file path
     Gaudi::Property<std::string> m_dd4hep_xmls{this, "detxml"};
 
-    SmartIF<IGeoSvc> m_geosvc;
+    SmartIF<IGeomSvc> m_geosvc;
     ToolHandle<ISensDetTool> m_calo_sdtool;
     ToolHandle<ISensDetTool> m_driftchamber_sdtool;
 };
diff --git a/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp b/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
index d8c30b10..844104e2 100644
--- a/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
+++ b/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
@@ -13,9 +13,9 @@ CalorimeterSensDetTool::initialize() {
     StatusCode sc;
 
 
-    m_geosvc = service<IGeoSvc>("GeoSvc");
+    m_geosvc = service<IGeomSvc>("GeomSvc");
     if (!m_geosvc) {
-        error() << "Failed to find GeoSvc." << endmsg;
+        error() << "Failed to find GeomSvc." << endmsg;
         return StatusCode::FAILURE;
     }
 
diff --git a/Simulation/DetSimSD/src/CalorimeterSensDetTool.h b/Simulation/DetSimSD/src/CalorimeterSensDetTool.h
index 775d2451..f3e0796b 100644
--- a/Simulation/DetSimSD/src/CalorimeterSensDetTool.h
+++ b/Simulation/DetSimSD/src/CalorimeterSensDetTool.h
@@ -9,7 +9,7 @@
 
 #include "GaudiKernel/AlgTool.h"
 #include "DetSimInterface/ISensDetTool.h"
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 class CalorimeterSensDetTool: public extends<AlgTool, ISensDetTool> {
 
@@ -27,7 +27,7 @@ public:
 private:
 
     // in order to initialize SD, we need to get the lcdd()
-    SmartIF<IGeoSvc> m_geosvc;
+    SmartIF<IGeomSvc> m_geosvc;
 
 };
 
diff --git a/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp b/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
index 33df9588..07c7b88f 100644
--- a/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
+++ b/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
@@ -11,9 +11,9 @@ DECLARE_COMPONENT(DriftChamberSensDetTool);
 StatusCode DriftChamberSensDetTool::initialize() {
     StatusCode sc;
 
-    m_geosvc = service<IGeoSvc>("GeoSvc");
+    m_geosvc = service<IGeomSvc>("GeomSvc");
     if (!m_geosvc) {
-        error() << "Failed to find GeoSvc." << endmsg;
+        error() << "Failed to find GeomSvc." << endmsg;
         return StatusCode::FAILURE;
     }
 
diff --git a/Simulation/DetSimSD/src/DriftChamberSensDetTool.h b/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
index ae727ed0..e01445d5 100644
--- a/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
+++ b/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
@@ -13,7 +13,7 @@
 #include "GaudiKernel/ToolHandle.h"
 #include "DetSimInterface/ISensDetTool.h"
 #include "DetSimInterface/IDedxSimTool.h"
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 
 class DriftChamberSensDetTool: public extends<AlgTool, ISensDetTool> {
@@ -32,7 +32,7 @@ public:
 private:
 
     // in order to initialize SD, we need to get the lcdd()
-    SmartIF<IGeoSvc> m_geosvc;
+    SmartIF<IGeomSvc> m_geosvc;
     ToolHandle<IDedxSimTool> m_dedx_simtool;
     Gaudi::Property<std::string> m_dedx_sim_option{this, "DedxSimTool"};
 
diff --git a/Utilities/KalDet/kaldet/ILDFTDKalDetector.h b/Utilities/KalDet/kaldet/ILDFTDKalDetector.h
index 80d348a8..c6ff6fa0 100644
--- a/Utilities/KalDet/kaldet/ILDFTDKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDFTDKalDetector.h
@@ -11,7 +11,7 @@
 
 class TNode;
 class TVector3;
-class IGeoSvc;
+class IGeomSvc;
 
 namespace gear{
   class GearMgr ;
@@ -22,7 +22,7 @@ class ILDFTDKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the FTD from GEAR */
-  ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc );
+  ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc );
   
   
 private:
diff --git a/Utilities/KalDet/kaldet/ILDSETKalDetector.h b/Utilities/KalDet/kaldet/ILDSETKalDetector.h
index 6c434cba..cdc83120 100644
--- a/Utilities/KalDet/kaldet/ILDSETKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDSETKalDetector.h
@@ -16,20 +16,20 @@ namespace gear{
   class GearMgr ;
 }
 
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDSETKalDetector : public TVKalDetector {
   
 public:
   
   /** Initialize the SET from GEAR */
-  ILDSETKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc=0 );
+  ILDSETKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc=0 );
   
   
 private:
   
   void setupGearGeom( const gear::GearMgr& gearMgr ) ;
-  void setupGearGeom( IGeoSvc* geoSvc );
+  void setupGearGeom( IGeomSvc* geoSvc );
   
   int _nLayers ;
   double _bZ ;
diff --git a/Utilities/KalDet/kaldet/ILDSITKalDetector.h b/Utilities/KalDet/kaldet/ILDSITKalDetector.h
index d9eb3059..3f5a8636 100644
--- a/Utilities/KalDet/kaldet/ILDSITKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDSITKalDetector.h
@@ -16,20 +16,20 @@ namespace gear{
   class GearMgr ;
 }
 
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDSITKalDetector : public TVKalDetector {
   
 public:
   
   /** Initialize the SIT from GEAR */
-  ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc );
+  ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc );
   
   
 private:
   
   void setupGearGeom( const gear::GearMgr& gearMgr ) ;
-  void setupGearGeom( IGeoSvc* geoSvc );
+  void setupGearGeom( IGeomSvc* geoSvc );
   
   int _nLayers ;
   double _bZ ;
diff --git a/Utilities/KalDet/kaldet/ILDSupportKalDetector.h b/Utilities/KalDet/kaldet/ILDSupportKalDetector.h
index b7e28fa9..373fe51b 100644
--- a/Utilities/KalDet/kaldet/ILDSupportKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDSupportKalDetector.h
@@ -13,7 +13,7 @@ class TNode;
 namespace gear{
   class GearMgr ;
 }
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDCylinderMeasLayer;
 
@@ -21,7 +21,7 @@ class ILDSupportKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the support structures from GEAR */
-  ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc );
+  ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc );
   
   /** Returns the special layer inside the Beam Pipe used for propagation to the IP */
   ILDCylinderMeasLayer* getIPLayer() { return _ipLayer; }
diff --git a/Utilities/KalDet/kaldet/ILDTPCKalDetector.h b/Utilities/KalDet/kaldet/ILDTPCKalDetector.h
index a249f22c..48012991 100644
--- a/Utilities/KalDet/kaldet/ILDTPCKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDTPCKalDetector.h
@@ -14,13 +14,13 @@ namespace gear{
   class GearMgr ;
 }
 
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDTPCKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the TPC from GEAR */
-  ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc=0 );
+  ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc=0 );
   
   
 private:
diff --git a/Utilities/KalDet/kaldet/ILDVXDKalDetector.h b/Utilities/KalDet/kaldet/ILDVXDKalDetector.h
index c0205e14..4feebacd 100644
--- a/Utilities/KalDet/kaldet/ILDVXDKalDetector.h
+++ b/Utilities/KalDet/kaldet/ILDVXDKalDetector.h
@@ -11,7 +11,7 @@
 #include "TMath.h"
 
 class TNode;
-class IGeoSvc;
+class IGeomSvc;
 
 namespace gear{
   class GearMgr ;
@@ -22,12 +22,12 @@ class ILDVXDKalDetector : public TVKalDetector {
   
 public:
   
-  ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc);
+  ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc);
   
   
 private:
   
-  void setupGearGeom( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc) ;
+  void setupGearGeom( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) ;
   
   int _nLayers ;
   double _bZ ;
diff --git a/Utilities/KalDet/kaldet/MaterialDataBase.h b/Utilities/KalDet/kaldet/MaterialDataBase.h
index d1ed28bf..398c0252 100644
--- a/Utilities/KalDet/kaldet/MaterialDataBase.h
+++ b/Utilities/KalDet/kaldet/MaterialDataBase.h
@@ -18,7 +18,7 @@ class TMaterial;
 namespace gear{
   class GearMgr ;
 }
-class IGeoSvc;
+class IGeomSvc;
 // fg: define the MaterialDataBaseException as an lcio Exception to allow for 
 //     messages to be printed in what() 
 typedef lcio::Exception MaterialDataBaseException ;
@@ -46,12 +46,12 @@ public:
   /** Get Material via name */
   TMaterial* getMaterial(std::string mat_name) ;  
   
-  void registerForService(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc=0) ;
+  void registerForService(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc=0) ;
   
   
 private:
  
-  void initialise(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc) ;
+  void initialise(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) ;
   
   MaterialDataBase() { _material_map.clear(); _isInitialised = false ; _gearMgr = 0; }                               // Private constructor
   
@@ -60,7 +60,7 @@ private:
   MaterialDataBase& operator=(const MaterialDataBase&) ;      // Prevent assignment
   
   void addMaterial(TMaterial* mat, std::string name); 
-  void createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc);
+  void createMaterials(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc);
   
   // private member variables
   std::map<std::string,TMaterial* > _material_map;
diff --git a/Utilities/KalDet/src/ild/common/MaterialDataBase.cc b/Utilities/KalDet/src/ild/common/MaterialDataBase.cc
index 2911317f..5d10f39b 100644
--- a/Utilities/KalDet/src/ild/common/MaterialDataBase.cc
+++ b/Utilities/KalDet/src/ild/common/MaterialDataBase.cc
@@ -9,7 +9,7 @@
 #include "gearimpl/Util.h"
 #include <gear/SimpleMaterial.h>
 #include <gearimpl/GearParametersImpl.h>
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 #include "TMaterial.h"
 
@@ -47,7 +47,7 @@ TMaterial* MaterialDataBase::getMaterial(std::string mat_name){
   
 }
 
-void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ){
+void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ){
   
   if( !_isInitialised ){
     this->createMaterials(gearMgr, geoSvc); 
@@ -57,7 +57,7 @@ void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc
   
 }
 
-void MaterialDataBase::registerForService(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ) {
+void MaterialDataBase::registerForService(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ) {
   
   if( !_isInitialised ){
     //std::cout << "debug fucd: " << "--------------------" << std::endl;
@@ -91,7 +91,7 @@ void MaterialDataBase::addMaterial(TMaterial* mat, std::string name) {
 }
 
 
-void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ){
+void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ){
   
   Double_t A, Z, density, radlen ;
   std::string name;
@@ -231,7 +231,7 @@ void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* ge
     else std::cout << "Material VXDSupportMaterial not found" << std::endl; 
   }
   catch( gear::UnknownParameterException& e){   
-    std::cout << "Error while read material from GeoSvc!" << std::endl;
+    std::cout << "Error while read material from GeomSvc!" << std::endl;
   }
   
   
diff --git a/Utilities/KalDet/src/ild/common/MaterialDataBase.h b/Utilities/KalDet/src/ild/common/MaterialDataBase.h
index d1ed28bf..398c0252 100644
--- a/Utilities/KalDet/src/ild/common/MaterialDataBase.h
+++ b/Utilities/KalDet/src/ild/common/MaterialDataBase.h
@@ -18,7 +18,7 @@ class TMaterial;
 namespace gear{
   class GearMgr ;
 }
-class IGeoSvc;
+class IGeomSvc;
 // fg: define the MaterialDataBaseException as an lcio Exception to allow for 
 //     messages to be printed in what() 
 typedef lcio::Exception MaterialDataBaseException ;
@@ -46,12 +46,12 @@ public:
   /** Get Material via name */
   TMaterial* getMaterial(std::string mat_name) ;  
   
-  void registerForService(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc=0) ;
+  void registerForService(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc=0) ;
   
   
 private:
  
-  void initialise(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc) ;
+  void initialise(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) ;
   
   MaterialDataBase() { _material_map.clear(); _isInitialised = false ; _gearMgr = 0; }                               // Private constructor
   
@@ -60,7 +60,7 @@ private:
   MaterialDataBase& operator=(const MaterialDataBase&) ;      // Prevent assignment
   
   void addMaterial(TMaterial* mat, std::string name); 
-  void createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc);
+  void createMaterials(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc);
   
   // private member variables
   std::map<std::string,TMaterial* > _material_map;
diff --git a/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.cc b/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.cc
index 799bddf9..18fed5e0 100644
--- a/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.cc
+++ b/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.cc
@@ -5,7 +5,7 @@
 
 #include <sstream>
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/Detector.h"
 #include "DDRec/DetectorData.h"
 
@@ -26,7 +26,7 @@
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "TVector3.h"
 
-ILDFTDKalDetector::ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ) : 
+ILDFTDKalDetector::ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ) : 
 TVKalDetector(300), _nDisks(0) // SJA:FIXME initial size, 300 looks reasonable for ILD, though this would be better stored as a const somewhere
 {
   
@@ -514,7 +514,7 @@ void ILDFTDKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
   
 }
 
-void ILDFTDKalDetector::setupGearGeom( IGeoSvc* geoSvc ){
+void ILDFTDKalDetector::setupGearGeom( IGeomSvc* geoSvc ){
   dd4hep::DetElement world = geoSvc->getDD4HepGeo();
   dd4hep::DetElement ftd;
   const std::map<std::string, dd4hep::DetElement>& subs = world.children();
diff --git a/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.h b/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.h
index deee9061..b3f66522 100644
--- a/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.h
+++ b/Utilities/KalDet/src/ild/ftd/ILDFTDKalDetector.h
@@ -11,7 +11,7 @@
 
 class TNode;
 class TVector3;
-class IGeoSvc;
+class IGeomSvc;
 
 namespace gear{
   class GearMgr ;
@@ -21,7 +21,7 @@ class ILDFTDKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the FTD from GEAR */
-  ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc  );
+  ILDFTDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc  );
   
   
 private:
@@ -80,7 +80,7 @@ private:
   
   
   void setupGearGeom( const gear::GearMgr& gearMgr ) ;
-  void setupGearGeom( IGeoSvc* geoSvc );
+  void setupGearGeom( IGeomSvc* geoSvc );
   
   int _nDisks ;
   double _bZ ;
diff --git a/Utilities/KalDet/src/ild/set/ILDSETKalDetector.cc b/Utilities/KalDet/src/ild/set/ILDSETKalDetector.cc
index f1f7c675..e14aa74e 100644
--- a/Utilities/KalDet/src/ild/set/ILDSETKalDetector.cc
+++ b/Utilities/KalDet/src/ild/set/ILDSETKalDetector.cc
@@ -9,7 +9,7 @@
 #include <UTIL/BitField64.h>
 #include <UTIL/ILDConf.h>
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/Detector.h"
 #include "DDRec/DetectorData.h"
 
@@ -27,7 +27,7 @@
 
 // #include "streamlog/streamlog.h"
 
-ILDSETKalDetector::ILDSETKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc )
+ILDSETKalDetector::ILDSETKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc )
 : TVKalDetector(300) // SJA:FIXME initial size, 300 looks reasonable for ILD, though this would be better stored as a const somewhere
 {
   
@@ -293,7 +293,7 @@ void ILDSETKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
   }
 }
 
-void ILDSETKalDetector::setupGearGeom( IGeoSvc* geoSvc ){
+void ILDSETKalDetector::setupGearGeom( IGeomSvc* geoSvc ){
   dd4hep::DetElement world = geoSvc->getDD4HepGeo();
   dd4hep::DetElement set;
   const std::map<std::string, dd4hep::DetElement>& subs = world.children();
diff --git a/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.cc b/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.cc
index 1c409d64..ded33d84 100644
--- a/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.cc
+++ b/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.cc
@@ -9,7 +9,7 @@
 #include <UTIL/BitField64.h>
 #include <UTIL/ILDConf.h>
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/Detector.h"
 #include "DDRec/DetectorData.h"
 #include "CLHEP/Units/SystemOfUnits.h"
@@ -27,7 +27,7 @@
 
 // #include "streamlog/streamlog.h"
 
-ILDSITKalDetector::ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc )
+ILDSITKalDetector::ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc )
 : TVKalDetector(300) // SJA:FIXME initial size, 300 looks reasonable for ILD, though this would be better stored as a const somewhere
 {
   
@@ -293,7 +293,7 @@ void ILDSITKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
   
 }
 
-void ILDSITKalDetector::setupGearGeom( IGeoSvc* geoSvc ){
+void ILDSITKalDetector::setupGearGeom( IGeomSvc* geoSvc ){
 
   dd4hep::DetElement world = geoSvc->getDD4HepGeo();
   dd4hep::DetElement sit;
diff --git a/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.h b/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.h
index d9eb3059..3f5a8636 100644
--- a/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.h
+++ b/Utilities/KalDet/src/ild/sit/ILDSITKalDetector.h
@@ -16,20 +16,20 @@ namespace gear{
   class GearMgr ;
 }
 
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDSITKalDetector : public TVKalDetector {
   
 public:
   
   /** Initialize the SIT from GEAR */
-  ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc );
+  ILDSITKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc );
   
   
 private:
   
   void setupGearGeom( const gear::GearMgr& gearMgr ) ;
-  void setupGearGeom( IGeoSvc* geoSvc );
+  void setupGearGeom( IGeomSvc* geoSvc );
   
   int _nLayers ;
   double _bZ ;
diff --git a/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.cc b/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.cc
index 98a6f247..8bf0126b 100644
--- a/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.cc
+++ b/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.cc
@@ -25,9 +25,9 @@
 #include "gearimpl/Util.h"
 #include "gear/CalorimeterParameters.h"
 // #include "streamlog/streamlog.h"
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
-ILDSupportKalDetector::ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ) : 
+ILDSupportKalDetector::ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ) : 
 TVKalDetector(10) 
 {
   Double_t bz;
diff --git a/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.h b/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.h
index b7e28fa9..373fe51b 100644
--- a/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.h
+++ b/Utilities/KalDet/src/ild/support/ILDSupportKalDetector.h
@@ -13,7 +13,7 @@ class TNode;
 namespace gear{
   class GearMgr ;
 }
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDCylinderMeasLayer;
 
@@ -21,7 +21,7 @@ class ILDSupportKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the support structures from GEAR */
-  ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc );
+  ILDSupportKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc );
   
   /** Returns the special layer inside the Beam Pipe used for propagation to the IP */
   ILDCylinderMeasLayer* getIPLayer() { return _ipLayer; }
diff --git a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
index fbb5f380..5f15894c 100644
--- a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
+++ b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
@@ -10,7 +10,7 @@
 
 #include <sstream>
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/Detector.h"
 #include "DDRec/DetectorData.h"
 #include "CLHEP/Units/SystemOfUnits.h"
@@ -27,7 +27,7 @@
 // #include "streamlog/streamlog.h"
 
 
-ILDTPCKalDetector::ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ) : 
+ILDTPCKalDetector::ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ) : 
 TVKalDetector(250) // SJA:FIXME initial size, 250 looks reasonable for ILD, though this would be better stored as a const somewhere
 {
   Double_t bz;
diff --git a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.h b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.h
index a249f22c..48012991 100644
--- a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.h
+++ b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.h
@@ -14,13 +14,13 @@ namespace gear{
   class GearMgr ;
 }
 
-class IGeoSvc;
+class IGeomSvc;
 
 class ILDTPCKalDetector : public TVKalDetector {
 public:
   
   /** Initialize the TPC from GEAR */
-  ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc=0 );
+  ILDTPCKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc=0 );
   
   
 private:
diff --git a/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.cc b/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.cc
index edf608f8..89bc88d7 100644
--- a/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.cc
+++ b/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.cc
@@ -10,7 +10,7 @@
 #include <UTIL/BitField64.h>
 #include <UTIL/ILDConf.h>
 
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 #include "DD4hep/Detector.h"
 #include "DDRec/DetectorData.h"
 #include "CLHEP/Units/SystemOfUnits.h"
@@ -21,7 +21,7 @@
 #include <gear/VXDParameters.h>
 #include <gear/VXDLayerLayout.h>
 #include "gearimpl/Util.h"
-#include "DetInterface/IGeoSvc.h"
+#include "DetInterface/IGeomSvc.h"
 
 #include "TMath.h"
 
@@ -30,7 +30,7 @@
 
 // #include "streamlog/streamlog.h"
 
-ILDVXDKalDetector::ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc )
+ILDVXDKalDetector::ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc )
 : TVKalDetector(300) // SJA:FIXME initial size, 300 looks reasonable for ILD, though this would be better stored as a const somewhere
 {
   
@@ -379,7 +379,7 @@ void ILDVXDKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
 }
 
 
-void ILDVXDKalDetector::setupGearGeom( IGeoSvc* geoSvc){
+void ILDVXDKalDetector::setupGearGeom( IGeomSvc* geoSvc){
   /*
   dd4hep::DetElement world = geoSvc->getDD4HepGeo();
   dd4hep::DetElement vxd;
diff --git a/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.h b/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.h
index 05840c8c..d1bbaaa2 100644
--- a/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.h
+++ b/Utilities/KalDet/src/ild/vxd/ILDVXDKalDetector.h
@@ -11,7 +11,7 @@
 #include "TMath.h"
 
 class TNode;
-class IGeoSvc;
+class IGeomSvc;
 
 namespace gear{
   class GearMgr ;
@@ -22,13 +22,13 @@ class ILDVXDKalDetector : public TVKalDetector {
   
 public:
   
-  ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc);
+  ILDVXDKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc);
   
   
 private:
   
   void setupGearGeom( const gear::GearMgr& gearMgr );
-  void setupGearGeom( IGeoSvc* geoSvc) ;
+  void setupGearGeom( IGeomSvc* geoSvc) ;
   
   int _nLayers ;
   double _bZ ;
diff --git a/Utilities/KiTrack/src/Tools/Fitter.cc b/Utilities/KiTrack/src/Tools/Fitter.cc
index 512c4a22..89576340 100644
--- a/Utilities/KiTrack/src/Tools/Fitter.cc
+++ b/Utilities/KiTrack/src/Tools/Fitter.cc
@@ -16,7 +16,7 @@
 typedef std::vector<edm4hep::ConstTrackerHit> TrackerHitVec;
 using namespace MarlinTrk;
 
-// by fucd: 3.5->3.0 default, will be read from GeoSvc
+// by fucd: 3.5->3.0 default, will be read from GeomSvc
 // if compare to Marlin, should change to 3.5
 float Fitter::_bField = 3.5;//later on overwritten with the value read by geo file
 
diff --git a/docs/simulation-tutorial/index.html b/docs/simulation-tutorial/index.html
index 6a59e836..ca9e44c8 100644
--- a/docs/simulation-tutorial/index.html
+++ b/docs/simulation-tutorial/index.html
@@ -178,8 +178,8 @@ geometry_option = &#34;CepC_v4-onlyVXD.xml&#34;
 geometry_path = os.path.join(os.getenv(&#34;DETCEPCV4ROOT&#34;), 
                              &#34;compact&#34;, geometry_option)
 
-from Configurables import GeoSvc
-geosvc = GeoSvc(&#34;GeoSvc&#34;)
+from Configurables import GeomSvc
+geosvc = GeomSvc(&#34;GeomSvc&#34;)
 geosvc.compact = geometry_path
 ```
 * The compact file is in XML format, which describes the detector. 
-- 
GitLab