From 691f89899efd9fea497ce6c2b752dc796e813ebe Mon Sep 17 00:00:00 2001
From: "lintao@ihep.ac.cn" <lintao@ihep.ac.cn>
Date: Sun, 22 Sep 2024 04:47:21 +0000
Subject: [PATCH] Rename DetIdentifier and DetGeomSvc according to the new
naming convention
---
Detector/CMakeLists.txt | 4 ++--
Detector/DetCRD/CMakeLists.txt | 2 +-
Detector/DetCRD/scripts/CRD-Sim.py | 4 ++--
Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py | 4 ++--
Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py | 4 ++--
Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py | 4 ++--
Detector/DetCRD/scripts/CRD_o1_v05-Sim.py | 4 ++--
.../scripts/Standalone-Sim-RotCrystal.py | 4 ++--
.../DetCRD/scripts/TDR_o1_v01/calodigi.py | 4 ++--
Detector/DetCRD/scripts/TDR_o1_v01/sim.py | 4 ++--
.../scripts/TDR_o1_v01/tracking-oldVersion.py | 4 ++--
.../DetCRD/scripts/TDR_o1_v01/tracking.py | 4 ++--
Detector/DetCRD/scripts/TDR_o1_v02/sim.py | 4 ++--
.../DetCRD/scripts/TDR_o1_v02/tracking.py | 4 ++--
Detector/DetCRD/scripts/TDR_o2_v01/sim.py | 4 ++--
.../DetCRD/scripts/TDR_o2_v01/tracking.py | 4 ++--
Detector/DetCRD/scripts/TDR_o2_v02/sim.py | 4 ++--
.../DetCRD/scripts/TDR_o2_v02/tracking.py | 4 ++--
.../Tracker/SiTrackerComposite_v01_geo.cpp | 2 +-
.../Tracker/SiTrackerStitching_v01_geo.cpp | 2 +-
.../{GeomSvc => DetGeomSvc}/CMakeLists.txt | 8 ++++----
.../src/DetGeomSvc.cpp} | 20 +++++++++----------
.../GeomSvc.h => DetGeomSvc/src/DetGeomSvc.h} | 10 +++++-----
.../CMakeLists.txt | 4 ++--
.../include/DetIdentifier}/CEPCConf.h | 0
.../include/DetIdentifier}/CEPCDetectorData.h | 0
Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp | 2 +-
Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp | 2 +-
.../SimpleDigi/src/SiTrackerDigiAlg.cpp | 2 +-
Digitisers/SimpleDigi/src/SmearDigiTool.cpp | 2 +-
Digitisers/SimpleDigi/src/TPCDigiAlg.cpp | 2 +-
Examples/options/CEPCV4_simu_reco_Arbor.py | 4 ++--
Examples/options/LCIO_read_Arbor.py | 4 ++--
Examples/options/LCIO_read_G2CD.py | 4 ++--
Examples/options/detsim_tracker.py | 2 +-
Examples/options/dump_simhit.py | 4 ++--
Examples/options/dumpid.py | 4 ++--
Examples/options/sim-rec-trackerecal.py | 4 ++--
Examples/options/sim_beambkg.py | 4 ++--
Examples/options/tut_detrec_SDT.py | 4 ++--
Examples/options/tut_detsim.py | 4 ++--
Examples/options/tut_detsim_G2CD.py | 4 ++--
Examples/options/tut_detsim_SDT.py | 4 ++--
Examples/options/tut_detsim_SDT_Heed.py | 4 ++--
Examples/options/tut_detsim_digi_SDT.py | 4 ++--
Examples/options/tut_detsim_digi_fit_DC.py | 4 ++--
.../tut_detsim_digi_truthTracker_SDT.py | 4 ++--
.../tut_detsim_digi_truthTracker_SDT_dedx.py | 4 ++--
Examples/options/tut_detsim_pan_matrix.py | 4 ++--
Examples/options/tut_detsim_pandora.py | 4 ++--
Examples/options/tut_dosesim.py | 4 ++--
Reconstruction/PFA/CyberPFA/script/digi.py | 4 ++--
Reconstruction/PFA/CyberPFA/script/rec.py | 4 ++--
Reconstruction/PFA/CyberPFA/script/sim.py | 4 ++--
.../PFA/CyberPFA/script/tracking.py | 4 ++--
Reconstruction/ParticleID/src/TofRecAlg.cpp | 2 +-
.../src/SiliconTrackingAlg.cpp | 2 +-
.../include/Tracking/TrackingHelper.h | 2 +-
.../Tracking/src/Clupatra/clupatra_new.cpp | 2 +-
Service/GearSvc/CMakeLists.txt | 2 +-
Service/GearSvc/src/GearSvc.cpp | 2 +-
Utilities/DataHelper/CMakeLists.txt | 3 +--
Utilities/DataHelper/src/GeomeryHelper.cpp | 2 +-
Utilities/DataHelper/src/TrackerHitHelper.cpp | 2 +-
Utilities/KalDet/CMakeLists.txt | 1 +
.../KalDet/src/ild/tpc/ILDTPCKalDetector.cc | 2 +-
cmake/CEPCSWConfig.cmake | 2 +-
67 files changed, 122 insertions(+), 122 deletions(-)
rename Detector/{GeomSvc => DetGeomSvc}/CMakeLists.txt (82%)
rename Detector/{GeomSvc/src/GeomSvc.cpp => DetGeomSvc/src/DetGeomSvc.cpp} (88%)
rename Detector/{GeomSvc/src/GeomSvc.h => DetGeomSvc/src/DetGeomSvc.h} (86%)
rename Detector/{Identifier => DetIdentifier}/CMakeLists.txt (82%)
rename Detector/{Identifier/include/Identifier => DetIdentifier/include/DetIdentifier}/CEPCConf.h (100%)
rename Detector/{Identifier/include/Identifier => DetIdentifier/include/DetIdentifier}/CEPCDetectorData.h (100%)
diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index d628d7ab..e36d83ad 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -5,6 +5,6 @@ add_subdirectory(DetDriftChamber)
add_subdirectory(DetEcalMatrix)
add_subdirectory(DetInterface)
add_subdirectory(DetSegmentation)
-add_subdirectory(GeomSvc)
-add_subdirectory(Identifier)
+add_subdirectory(DetGeomSvc)
+add_subdirectory(DetIdentifier)
add_subdirectory(MagneticFieldMap)
diff --git a/Detector/DetCRD/CMakeLists.txt b/Detector/DetCRD/CMakeLists.txt
index 1157f61a..98b1a5c5 100644
--- a/Detector/DetCRD/CMakeLists.txt
+++ b/Detector/DetCRD/CMakeLists.txt
@@ -29,7 +29,7 @@ gaudi_add_module(DetCRD
src/Tracker/SiTracker_otkendcap_v01_geo.cpp
LINK ${DD4hep_COMPONENT_LIBRARIES}
- Identifier
+ DetIdentifier
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
diff --git a/Detector/DetCRD/scripts/CRD-Sim.py b/Detector/DetCRD/scripts/CRD-Sim.py
index e658c127..e7906fe2 100644
--- a/Detector/DetCRD/scripts/CRD-Sim.py
+++ b/Detector/DetCRD/scripts/CRD-Sim.py
@@ -30,8 +30,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py b/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
index cb3ceeb7..dbf72a11 100644
--- a/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
+++ b/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
@@ -30,8 +30,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
index e267c61e..a466cbf5 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
@@ -31,8 +31,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
index 05844c9f..0c0a6e8a 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
@@ -31,8 +31,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py b/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
index 0be7a76f..42c09a09 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
@@ -29,8 +29,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import NTupleSvc
diff --git a/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py b/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
index c2d88fde..2c47a776 100644
--- a/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
+++ b/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
@@ -29,8 +29,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py b/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
index bff27594..2b48aae4 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/sim.py b/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
index acf8c8a0..8e871ed1 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
@@ -28,8 +28,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py b/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
index 884cd89d..ff5ef498 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
@@ -27,8 +27,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
index 5c9b07cd..8f8b262c 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v02/sim.py b/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
index 61f89300..c1e91891 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
@@ -27,8 +27,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py b/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
index 3bcb7d18..4207f87a 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o2_v01/sim.py b/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
index 53241da1..53f9173d 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
@@ -27,8 +27,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py b/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
index 785f49ef..38bb7888 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o2_v02/sim.py b/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
index cbfb47e8..df16f166 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
@@ -27,8 +27,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py b/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
index ea2ca6a1..a87b89f8 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp b/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
index 5bd1172b..971df5d3 100644
--- a/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
+++ b/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
@@ -14,7 +14,7 @@
#include "XML/Utilities.h"
#include <cmath>
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
using namespace std;
diff --git a/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp b/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
index 1ac541b8..af9bd28e 100644
--- a/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
+++ b/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
@@ -13,7 +13,7 @@
#include "XML/Utilities.h"
#include <cmath>
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
using namespace std;
diff --git a/Detector/GeomSvc/CMakeLists.txt b/Detector/DetGeomSvc/CMakeLists.txt
similarity index 82%
rename from Detector/GeomSvc/CMakeLists.txt
rename to Detector/DetGeomSvc/CMakeLists.txt
index 997f9e97..075bee7b 100644
--- a/Detector/GeomSvc/CMakeLists.txt
+++ b/Detector/DetGeomSvc/CMakeLists.txt
@@ -4,8 +4,8 @@
# Desc: implement the IGeomSvc interface.
##############################################################################
-gaudi_add_module(GeomSvc
- SOURCES src/GeomSvc.cpp
+gaudi_add_module(DetGeomSvc
+ SOURCES src/DetGeomSvc.cpp
LINK
DetInterface
${DD4hep_COMPONENT_LIBRARIES}
@@ -14,11 +14,11 @@ gaudi_add_module(GeomSvc
${ROOT_LIBRARIES}
)
-target_include_directories(GeomSvc
+target_include_directories(DetGeomSvc
PUBLIC ${GEAR_INCLUDE_DIRS}
)
-install(TARGETS GeomSvc
+install(TARGETS DetGeomSvc
EXPORT CEPCSWTargets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
diff --git a/Detector/GeomSvc/src/GeomSvc.cpp b/Detector/DetGeomSvc/src/DetGeomSvc.cpp
similarity index 88%
rename from Detector/GeomSvc/src/GeomSvc.cpp
rename to Detector/DetGeomSvc/src/DetGeomSvc.cpp
index a35dc650..72009ab2 100644
--- a/Detector/GeomSvc/src/GeomSvc.cpp
+++ b/Detector/DetGeomSvc/src/DetGeomSvc.cpp
@@ -1,4 +1,4 @@
-#include "GeomSvc.h"
+#include "DetGeomSvc.h"
#include "gearimpl/GearParametersImpl.h"
#include "TMath.h"
#include "TMaterial.h"
@@ -19,19 +19,19 @@
#include <iomanip>
#include <iostream>
-DECLARE_COMPONENT(GeomSvc)
+DECLARE_COMPONENT(DetGeomSvc)
-GeomSvc::GeomSvc(const std::string& name, ISvcLocator* svc)
+DetGeomSvc::DetGeomSvc(const std::string& name, ISvcLocator* svc)
: base_class(name, svc), m_dd4hep_geo(nullptr){
}
-GeomSvc::~GeomSvc() {
+DetGeomSvc::~DetGeomSvc() {
}
StatusCode
-GeomSvc::initialize() {
+DetGeomSvc::initialize() {
StatusCode sc = Service::initialize();
m_dd4hep_geo = &(dd4hep::Detector::getInstance());
@@ -46,7 +46,7 @@ GeomSvc::initialize() {
}
StatusCode
-GeomSvc::finalize() {
+DetGeomSvc::finalize() {
StatusCode sc;
// m_surface_manager has added as extension of Detector, so not delete?
@@ -57,7 +57,7 @@ GeomSvc::finalize() {
}
dd4hep::DetElement
-GeomSvc::getDD4HepGeo() {
+DetGeomSvc::getDD4HepGeo() {
if (lcdd()) {
return lcdd()->world();
}
@@ -65,13 +65,13 @@ GeomSvc::getDD4HepGeo() {
}
dd4hep::Detector*
-GeomSvc::lcdd() {
+DetGeomSvc::lcdd() {
return m_dd4hep_geo;
}
IGeomSvc::Decoder*
-GeomSvc::getDecoder(const std::string& readout_name) {
+DetGeomSvc::getDecoder(const std::string& readout_name) {
IGeomSvc::Decoder* decoder = nullptr;
@@ -103,7 +103,7 @@ GeomSvc::getDecoder(const std::string& readout_name) {
}
const dd4hep::rec::SurfaceMap*
-GeomSvc::getSurfaceMap(const std::string& det_name) {
+DetGeomSvc::getSurfaceMap(const std::string& det_name) {
if (m_surface_manager == nullptr) {
dd4hep::rec::SurfaceManager* surfaceMgr = nullptr;
// first check whether exist
diff --git a/Detector/GeomSvc/src/GeomSvc.h b/Detector/DetGeomSvc/src/DetGeomSvc.h
similarity index 86%
rename from Detector/GeomSvc/src/GeomSvc.h
rename to Detector/DetGeomSvc/src/DetGeomSvc.h
index fb253bb1..85c2401a 100644
--- a/Detector/GeomSvc/src/GeomSvc.h
+++ b/Detector/DetGeomSvc/src/DetGeomSvc.h
@@ -1,5 +1,5 @@
-#ifndef GeomSvc_h
-#define GeomSvc_h
+#ifndef DetGeomSvc_h
+#define DetGeomSvc_h
// Interface
#include "DetInterface/IGeomSvc.h"
@@ -21,10 +21,10 @@
class TGeoNode;
-class GeomSvc: public extends<Service, IGeomSvc> {
+class DetGeomSvc: public extends<Service, IGeomSvc> {
public:
- GeomSvc(const std::string& name, ISvcLocator* svc);
- ~GeomSvc();
+ DetGeomSvc(const std::string& name, ISvcLocator* svc);
+ ~DetGeomSvc();
// Service
StatusCode initialize() override;
diff --git a/Detector/Identifier/CMakeLists.txt b/Detector/DetIdentifier/CMakeLists.txt
similarity index 82%
rename from Detector/Identifier/CMakeLists.txt
rename to Detector/DetIdentifier/CMakeLists.txt
index b2ededab..0e50013a 100644
--- a/Detector/Identifier/CMakeLists.txt
+++ b/Detector/DetIdentifier/CMakeLists.txt
@@ -2,9 +2,9 @@
# Package: Identifier
################################################################################
-gaudi_add_header_only_library(Identifier)
+gaudi_add_header_only_library(DetIdentifier)
-install(TARGETS Identifier
+install(TARGETS DetIdentifier
EXPORT CEPCSWTargets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
diff --git a/Detector/Identifier/include/Identifier/CEPCConf.h b/Detector/DetIdentifier/include/DetIdentifier/CEPCConf.h
similarity index 100%
rename from Detector/Identifier/include/Identifier/CEPCConf.h
rename to Detector/DetIdentifier/include/DetIdentifier/CEPCConf.h
diff --git a/Detector/Identifier/include/Identifier/CEPCDetectorData.h b/Detector/DetIdentifier/include/DetIdentifier/CEPCDetectorData.h
similarity index 100%
rename from Detector/Identifier/include/Identifier/CEPCDetectorData.h
rename to Detector/DetIdentifier/include/DetIdentifier/CEPCDetectorData.h
diff --git a/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp b/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
index 7cf25496..12dac308 100644
--- a/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
@@ -1,6 +1,6 @@
#include "CylinderDigiAlg.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "edm4hep/Vector3f.h"
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
index 913009e1..29083e3f 100644
--- a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
@@ -17,7 +17,7 @@
#include "UTIL/CellIDEncoder.h"
#include <UTIL/Operators.h>
*/
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "UTIL/ILDConf.h"
// STUFF needed for GEAR
diff --git a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp b/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
index e24a6529..4a2d537f 100644
--- a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
@@ -1,6 +1,6 @@
#include "SiTrackerDigiAlg.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "edm4hep/Vector3f.h"
diff --git a/Digitisers/SimpleDigi/src/SmearDigiTool.cpp b/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
index ea909180..e3fa7c00 100644
--- a/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
+++ b/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
@@ -1,7 +1,7 @@
#include "SmearDigiTool.h"
#include "DataHelper/TrackerHitHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "DetInterface/IGeomSvc.h"
#include "edm4hep/Vector3f.h"
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
index 6b0d042a..50a3ec96 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
@@ -33,7 +33,7 @@
#include <gear/BField.h>
//
#include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#define TRKHITNCOVMATRIX 6
diff --git a/Examples/options/CEPCV4_simu_reco_Arbor.py b/Examples/options/CEPCV4_simu_reco_Arbor.py
index dbd5e721..4dadbbd0 100644
--- a/Examples/options/CEPCV4_simu_reco_Arbor.py
+++ b/Examples/options/CEPCV4_simu_reco_Arbor.py
@@ -28,8 +28,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import GearSvc
diff --git a/Examples/options/LCIO_read_Arbor.py b/Examples/options/LCIO_read_Arbor.py
index df01a342..0e5108dc 100644
--- a/Examples/options/LCIO_read_Arbor.py
+++ b/Examples/options/LCIO_read_Arbor.py
@@ -63,8 +63,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
########################################################################
from Configurables import GearSvc
diff --git a/Examples/options/LCIO_read_G2CD.py b/Examples/options/LCIO_read_G2CD.py
index f4ea25ac..66e61812 100644
--- a/Examples/options/LCIO_read_G2CD.py
+++ b/Examples/options/LCIO_read_G2CD.py
@@ -54,8 +54,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
########################################################################
from Configurables import GearSvc
diff --git a/Examples/options/detsim_tracker.py b/Examples/options/detsim_tracker.py
index 9c19536a..4dbf71c8 100644
--- a/Examples/options/detsim_tracker.py
+++ b/Examples/options/detsim_tracker.py
@@ -37,7 +37,7 @@ geometry_option = "CepC_v4_onlyTracker.xml"
# geometry_option = "CepC_v4.xml"
geometry_path = os.path.join(os.getenv("DETCEPCV4ROOT"), "compact", geometry_option)
-geosvc = GeomSvc("GeomSvc")
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
#Previously I do not have these 2 lines
diff --git a/Examples/options/dump_simhit.py b/Examples/options/dump_simhit.py
index 1c699b7a..46a4a504 100644
--- a/Examples/options/dump_simhit.py
+++ b/Examples/options/dump_simhit.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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/dumpid.py b/Examples/options/dumpid.py
index f4111bc1..705f1f15 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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/sim-rec-trackerecal.py b/Examples/options/sim-rec-trackerecal.py
index 49e79a93..8eb4691a 100644
--- a/Examples/options/sim-rec-trackerecal.py
+++ b/Examples/options/sim-rec-trackerecal.py
@@ -28,8 +28,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import GenAlgo
diff --git a/Examples/options/sim_beambkg.py b/Examples/options/sim_beambkg.py
index e53127f8..cea73c11 100755
--- a/Examples/options/sim_beambkg.py
+++ b/Examples/options/sim_beambkg.py
@@ -31,8 +31,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import NTupleSvc
diff --git a/Examples/options/tut_detrec_SDT.py b/Examples/options/tut_detrec_SDT.py
index ab6cd199..fe55a3c1 100644
--- a/Examples/options/tut_detrec_SDT.py
+++ b/Examples/options/tut_detrec_SDT.py
@@ -34,8 +34,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim.py b/Examples/options/tut_detsim.py
index ededb996..6b82a5f3 100644
--- a/Examples/options/tut_detsim.py
+++ b/Examples/options/tut_detsim.py
@@ -45,8 +45,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim_G2CD.py b/Examples/options/tut_detsim_G2CD.py
index b78da615..c4a10c6f 100644
--- a/Examples/options/tut_detsim_G2CD.py
+++ b/Examples/options/tut_detsim_G2CD.py
@@ -17,8 +17,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
########################################################################
diff --git a/Examples/options/tut_detsim_SDT.py b/Examples/options/tut_detsim_SDT.py
index 268e317b..a5dc22a2 100644
--- a/Examples/options/tut_detsim_SDT.py
+++ b/Examples/options/tut_detsim_SDT.py
@@ -45,8 +45,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim_SDT_Heed.py b/Examples/options/tut_detsim_SDT_Heed.py
index d994ae61..179ac68c 100644
--- a/Examples/options/tut_detsim_SDT_Heed.py
+++ b/Examples/options/tut_detsim_SDT_Heed.py
@@ -47,8 +47,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
print('geometry_path=',geometry_path)
geosvc.compact = geometry_path
diff --git a/Examples/options/tut_detsim_digi_SDT.py b/Examples/options/tut_detsim_digi_SDT.py
index 1dfd75ec..5431461d 100644
--- a/Examples/options/tut_detsim_digi_SDT.py
+++ b/Examples/options/tut_detsim_digi_SDT.py
@@ -46,8 +46,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim_digi_fit_DC.py b/Examples/options/tut_detsim_digi_fit_DC.py
index aec8695f..efdfe66c 100644
--- a/Examples/options/tut_detsim_digi_fit_DC.py
+++ b/Examples/options/tut_detsim_digi_fit_DC.py
@@ -46,8 +46,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim_digi_truthTracker_SDT.py b/Examples/options/tut_detsim_digi_truthTracker_SDT.py
index cbef3165..4ea9485f 100644
--- a/Examples/options/tut_detsim_digi_truthTracker_SDT.py
+++ b/Examples/options/tut_detsim_digi_truthTracker_SDT.py
@@ -46,8 +46,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py b/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
index 84bf326d..2743861e 100644
--- a/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
+++ b/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
@@ -46,8 +46,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
#geosvc.compact = "/workfs/higgs/fangwx/fork_DedxAlg_20201217/CEPCSW/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml"
#geosvc.compact = "/workfs/higgs/fangwx/fork_DedxAlg_20201217/CEPCSW/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01_DCH.xml"
diff --git a/Examples/options/tut_detsim_pan_matrix.py b/Examples/options/tut_detsim_pan_matrix.py
index 7340454f..1d22d1f9 100644
--- a/Examples/options/tut_detsim_pan_matrix.py
+++ b/Examples/options/tut_detsim_pan_matrix.py
@@ -42,8 +42,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("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 d6be9779..a6bd147d 100644
--- a/Examples/options/tut_detsim_pandora.py
+++ b/Examples/options/tut_detsim_pandora.py
@@ -43,8 +43,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Examples/options/tut_dosesim.py b/Examples/options/tut_dosesim.py
index 90d0e218..51f3833a 100644
--- a/Examples/options/tut_dosesim.py
+++ b/Examples/options/tut_dosesim.py
@@ -46,8 +46,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Reconstruction/PFA/CyberPFA/script/digi.py b/Reconstruction/PFA/CyberPFA/script/digi.py
index 6605e216..8402b2ce 100644
--- a/Reconstruction/PFA/CyberPFA/script/digi.py
+++ b/Reconstruction/PFA/CyberPFA/script/digi.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Reconstruction/PFA/CyberPFA/script/rec.py b/Reconstruction/PFA/CyberPFA/script/rec.py
index 28501401..fd1de01d 100644
--- a/Reconstruction/PFA/CyberPFA/script/rec.py
+++ b/Reconstruction/PFA/CyberPFA/script/rec.py
@@ -13,8 +13,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 GeomSvc
-geomsvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geomsvc = DetGeomSvc("GeomSvc")
geomsvc.compact = geometry_path
#######################################
diff --git a/Reconstruction/PFA/CyberPFA/script/sim.py b/Reconstruction/PFA/CyberPFA/script/sim.py
index ae9cbd31..05764246 100644
--- a/Reconstruction/PFA/CyberPFA/script/sim.py
+++ b/Reconstruction/PFA/CyberPFA/script/sim.py
@@ -27,8 +27,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
##############################################################################
diff --git a/Reconstruction/PFA/CyberPFA/script/tracking.py b/Reconstruction/PFA/CyberPFA/script/tracking.py
index dea774ca..69af563e 100644
--- a/Reconstruction/PFA/CyberPFA/script/tracking.py
+++ b/Reconstruction/PFA/CyberPFA/script/tracking.py
@@ -26,8 +26,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 GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
geosvc.compact = geometry_path
from Configurables import MarlinEvtSeeder
diff --git a/Reconstruction/ParticleID/src/TofRecAlg.cpp b/Reconstruction/ParticleID/src/TofRecAlg.cpp
index db36ee1e..3dce6848 100644
--- a/Reconstruction/ParticleID/src/TofRecAlg.cpp
+++ b/Reconstruction/ParticleID/src/TofRecAlg.cpp
@@ -13,7 +13,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
#include <math.h>
#include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "UTIL/CellIDEncoder.h"
DECLARE_COMPONENT( TofRecAlg )
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
index 7921fd3e..d2b5e8b7 100644
--- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
+++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
@@ -1,6 +1,6 @@
#include "SiliconTrackingAlg.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "GearSvc/IGearSvc.h"
#include "EventSeeder/IEventSeeder.h"
#include "TrackSystemSvc/ITrackSystemSvc.h"
diff --git a/Reconstruction/Tracking/include/Tracking/TrackingHelper.h b/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
index 7dd90d78..b0319e61 100644
--- a/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
+++ b/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
@@ -6,7 +6,7 @@
#include "UTIL/BitField64.h"
#include "UTIL/CellIDDecoder.h"
#include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "lcio.h"
#include <array>
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
index 66282d7c..8e732aed 100644
--- a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
+++ b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
@@ -4,7 +4,7 @@
#include <UTIL/BitField64.h>
#include <UTIL/ILDConf.h>
-#include <Identifier/CEPCConf.h>
+#include <DetIdentifier/CEPCConf.h>
#include <UTIL/BitSet32.h>
///---- GEAR ----
diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt
index 13b502dd..5ce9f337 100644
--- a/Service/GearSvc/CMakeLists.txt
+++ b/Service/GearSvc/CMakeLists.txt
@@ -9,7 +9,7 @@ gaudi_add_module(GearSvcPlugins
${DD4hep_COMPONENT_LIBRARIES}
DetInterface
DetSegmentation
- Identifier
+ DetIdentifier
)
target_include_directories(GearSvcPlugins
diff --git a/Service/GearSvc/src/GearSvc.cpp b/Service/GearSvc/src/GearSvc.cpp
index 871725ff..c8ddfc05 100644
--- a/Service/GearSvc/src/GearSvc.cpp
+++ b/Service/GearSvc/src/GearSvc.cpp
@@ -1,7 +1,7 @@
#include "GearSvc.h"
#include "DetInterface/IGeomSvc.h"
#include "DetSegmentation/GridDriftChamber.h"
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
#include "gearxml/GearXML.h"
#include "gearimpl/GearMgrImpl.h"
diff --git a/Utilities/DataHelper/CMakeLists.txt b/Utilities/DataHelper/CMakeLists.txt
index 2cc021c0..e5ed8e53 100644
--- a/Utilities/DataHelper/CMakeLists.txt
+++ b/Utilities/DataHelper/CMakeLists.txt
@@ -25,10 +25,9 @@ gaudi_add_library(DataHelperLib
Gaudi::GaudiKernel
${GSL_LIBRARIES}
${CLHEP_LIBRARIES}
- Identifier
+ DetIdentifier
DetSegmentation
DetInterface
- Identifier
)
install(TARGETS DataHelperLib
diff --git a/Utilities/DataHelper/src/GeomeryHelper.cpp b/Utilities/DataHelper/src/GeomeryHelper.cpp
index 8dbefbb8..7b7c1c59 100644
--- a/Utilities/DataHelper/src/GeomeryHelper.cpp
+++ b/Utilities/DataHelper/src/GeomeryHelper.cpp
@@ -1,5 +1,5 @@
#include "DataHelper/GeomeryHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
//Externals
diff --git a/Utilities/DataHelper/src/TrackerHitHelper.cpp b/Utilities/DataHelper/src/TrackerHitHelper.cpp
index c3e8a64f..fa8cd72f 100644
--- a/Utilities/DataHelper/src/TrackerHitHelper.cpp
+++ b/Utilities/DataHelper/src/TrackerHitHelper.cpp
@@ -1,5 +1,5 @@
#include "DataHelper/TrackerHitHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
#include "TMatrixF.h"
#include "CLHEP/Matrix/SymMatrix.h"
diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index b5848682..8511f237 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -64,6 +64,7 @@ set( KalDetLib_srcs ${LIB_SOURCES} ${COMMON_SOURCES} )
gaudi_add_library(KalDetLib
SOURCES ${KalDetLib_srcs}
LINK DetInterface
+ DetIdentifier
KalTestLib
Gaudi::GaudiKernel
${ROOT_LIBRARIES}
diff --git a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
index ba1f21f8..3344de26 100644
--- a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
+++ b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
@@ -25,7 +25,7 @@
#include <UTIL/BitField64.h>
#include <UTIL/ILDConf.h>
-#include "../../../../../Detector/Identifier/include/Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
// #include "streamlog/streamlog.h"
diff --git a/cmake/CEPCSWConfig.cmake b/cmake/CEPCSWConfig.cmake
index 4f9445ac..771a2389 100644
--- a/cmake/CEPCSWConfig.cmake
+++ b/cmake/CEPCSWConfig.cmake
@@ -9,5 +9,5 @@ find_dependency(ROOT REQUIRED)
# link to (libraries) or execute (programs)
include("${CMAKE_CURRENT_LIST_DIR}/CEPCSWTargets.cmake")
-get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::GeomSvc PROPERTY LOCATION)
+get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::DetGeomSvc PROPERTY LOCATION)
find_package_handle_standard_args(CEPCSW DEFAULT_MSG CMAKE_CURRENT_LIST_FILE TEST_CEPCSW_LIBRARY)
--
GitLab