From 486cf0180c88623a8a97c1cde698f5b541d96f56 Mon Sep 17 00:00:00 2001
From: Chengdong Fu <fucd@ihep.ac.cn>
Date: Wed, 22 Jun 2022 10:03:47 +0800
Subject: [PATCH] change job TypeOption to DetElement combineHits
---
Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp | 5 +++--
Simulation/DetSimSD/src/DriftChamberSensDetTool.h | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp b/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
index f5ed24ed..c911d470 100644
--- a/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
+++ b/Simulation/DetSimSD/src/DriftChamberSensDetTool.cpp
@@ -39,12 +39,13 @@ DriftChamberSensDetTool::createSD(const std::string& name) {
G4VSensitiveDetector* sd = nullptr;
if (name == "DriftChamber") {
- if(m_sdTypeOption==0){
+ auto sens = dd4hep_geo->sensitiveDetector(name);
+ if(!sens.combineHits()){
DriftChamberSensitiveDetector* dcsd = new DriftChamberSensitiveDetector(name, *dd4hep_geo);
dcsd->setDedxSimTool(m_dedx_simtool);
sd = dcsd;
}
- else if(m_sdTypeOption==1){
+ else{
sd = new TrackerCombineSensitiveDetector(name, *dd4hep_geo);
}
}
diff --git a/Simulation/DetSimSD/src/DriftChamberSensDetTool.h b/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
index 537ff103..e01445d5 100644
--- a/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
+++ b/Simulation/DetSimSD/src/DriftChamberSensDetTool.h
@@ -35,7 +35,6 @@ private:
SmartIF<IGeomSvc> m_geosvc;
ToolHandle<IDedxSimTool> m_dedx_simtool;
Gaudi::Property<std::string> m_dedx_sim_option{this, "DedxSimTool"};
- Gaudi::Property<int> m_sdTypeOption{this, "TypeOption", 0};
};
--
GitLab