From cc2e1dc73fb230956fa8e2beacad7c714ffbd933 Mon Sep 17 00:00:00 2001
From: Chengdong Fu <fucd@ihep.ac.cn>
Date: Tue, 18 Oct 2022 15:03:41 +0800
Subject: [PATCH] add combineHits option
---
Detector/DetCEPCv4/src/tracker/FTD_Simple_Staggered_geo.cpp | 4 +++-
Detector/DetCEPCv4/src/tracker/FTD_cepc_geo.cpp | 4 +++-
Detector/DetCEPCv4/src/tracker/SET_Simple_Planar_geo.cpp | 4 ++++
Detector/DetCEPCv4/src/tracker/SIT_Simple_Planar_geo.cpp | 4 ++++
Detector/DetCEPCv4/src/tracker/VXD04_geo.cpp | 6 ++++--
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Detector/DetCEPCv4/src/tracker/FTD_Simple_Staggered_geo.cpp b/Detector/DetCEPCv4/src/tracker/FTD_Simple_Staggered_geo.cpp
index 52049c85..648cc222 100644
--- a/Detector/DetCEPCv4/src/tracker/FTD_Simple_Staggered_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/FTD_Simple_Staggered_geo.cpp
@@ -1274,7 +1274,9 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
ftd.addExtension< ZDiskPetalsData >( zDiskPetalsData ) ;
//--------------------------------------
-
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ ftd.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
return ftd;
}
diff --git a/Detector/DetCEPCv4/src/tracker/FTD_cepc_geo.cpp b/Detector/DetCEPCv4/src/tracker/FTD_cepc_geo.cpp
index 0b5aef7d..3bb1ae75 100644
--- a/Detector/DetCEPCv4/src/tracker/FTD_cepc_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/FTD_cepc_geo.cpp
@@ -1273,7 +1273,9 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
ftd.addExtension< ZDiskPetalsData >( zDiskPetalsData ) ;
//--------------------------------------
-
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ ftd.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
return ftd;
}
diff --git a/Detector/DetCEPCv4/src/tracker/SET_Simple_Planar_geo.cpp b/Detector/DetCEPCv4/src/tracker/SET_Simple_Planar_geo.cpp
index 91e906c8..e311fcc9 100644
--- a/Detector/DetCEPCv4/src/tracker/SET_Simple_Planar_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/SET_Simple_Planar_geo.cpp
@@ -456,6 +456,10 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
set.setVisAttributes( theDetector, x_det.visStr(), envelope );
+
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ set.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
return set;
}
diff --git a/Detector/DetCEPCv4/src/tracker/SIT_Simple_Planar_geo.cpp b/Detector/DetCEPCv4/src/tracker/SIT_Simple_Planar_geo.cpp
index e6a93e80..f7679146 100644
--- a/Detector/DetCEPCv4/src/tracker/SIT_Simple_Planar_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/SIT_Simple_Planar_geo.cpp
@@ -473,6 +473,10 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
//--------------------------------------
sit.setVisAttributes( theDetector, x_det.visStr(), envelope );
+
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ sit.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
return sit;
}
diff --git a/Detector/DetCEPCv4/src/tracker/VXD04_geo.cpp b/Detector/DetCEPCv4/src/tracker/VXD04_geo.cpp
index 1ed9e3a7..ae2d4d83 100644
--- a/Detector/DetCEPCv4/src/tracker/VXD04_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/VXD04_geo.cpp
@@ -1582,10 +1582,12 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
//--------------------------------------
-
-
vxd.setVisAttributes( theDetector, x_det.visStr(), envelope );
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ vxd.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
+
return vxd;
}
DECLARE_DETELEMENT(VXD04,create_element)
--
GitLab