From 0a00901653131cb6f32e252e9a2c4e2ce3c9789f Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Tue, 2 Feb 2021 17:28:14 +0800
Subject: [PATCH] Solve the overlap problem of endcap
---
Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml | 4 ++--
Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
index 39f06065..36230440 100644
--- a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
@@ -84,10 +84,10 @@
<constant name="DC_Endcap_z" value="0.1*mm"/>
<constant name="DC_half_length" value="2225*mm" />
<constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_z" />
- <constant name="InnerTracker_half_length" value="MainTracker_half_length" />
+ <constant name="InnerTracker_half_length" value="DC_half_length" />
<constant name="InnerTracker_inner_radius" value="234*mm"/>
<constant name="InnerTracker_outer_radius" value="906*mm"/>
- <constant name="OuterTracker_half_length" value="MainTracker_half_length"/>
+ <constant name="OuterTracker_half_length" value="DC_half_length"/>
<constant name="OuterTracker_inner_radius" value="1085*mm"/>
<constant name="OuterTracker_outer_radius" value="1720*mm"/>
diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
index 09799eca..6894e6a4 100644
--- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
+++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
@@ -147,7 +147,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
double Endcap_rmin = theDetector.constant<double>("DC_Endcap_rmin");
double Endcap_rmax = theDetector.constant<double>("DC_Endcap_rmax");
double Endcap_z = theDetector.constant<double>("DC_Endcap_dz");
- dd4hep::Tube det_Endcap_solid(Endcap_rmin,Endcap_rmax,Endcap_z);
+ dd4hep::Tube det_Endcap_solid(Endcap_rmin,Endcap_rmax,0.5*Endcap_z);
dd4hep::Volume det_Endcap_vol(det_name+"Endcap",det_Endcap_solid,det_mat);
det_Endcap_vol.setVisAttributes(theDetector,"YellowVis");
--
GitLab