From 120a19e2440b9338892c98025c7f80f2efccd050 Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Mon, 21 Dec 2020 21:40:50 +0800
Subject: [PATCH] Modify the parameters corresponding to DC in CRD
---
.../compact/CRD_common_v01/DC_Simple_v01_01.xml | 14 ++++++++++----
.../compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
index 2ad73a40..71037c5c 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
@@ -16,26 +16,32 @@
<constant name="SDT_half_length" value="MainTracker_half_length"/>
<constant name="SDT_length" value="SDT_half_length*2"/>
- <constant name="SDT_inner_chamber_radius_min" value="SDT_radius_min"/>
+ <constant name="SDT_inner_chamber_radius_min" value="235*mm"/>
<constant name="SDT_inner_chamber_radius_max" value="InnerTracker_outer_radius"/>
<constant name="SDT_inner_chamber_length" value="SDT_length"/>
<constant name="SDT_outer_chamber_radius_min" value="OuterTracker_inner_radius"/>
- <constant name="SDT_outer_chamber_radius_max" value="SDT_radius_max"/>
+ <constant name="SDT_outer_chamber_radius_max" value="1715*mm"/>
<constant name="SDT_outer_chamber_length" value="SDT_length"/>
<constant name="SDT_inner_chamber_layer_number" value="67"/>
<constant name="SDT_outer_chamber_layer_number" value="63"/>
<constant name="SDT_chamber_layer_width" value="10*mm"/>
<constant name="Epsilon" value="0*deg"/>
+
+ <constant name="SDT_inner_wall_radius_min" value="234.8*mm"/>
+ <constant name="SDT_inner_wall_radius_max" value="235*mm"/>
+ <constant name="SDT_outer_wall_radius_min" value="1715*mm"/>
+ <constant name="SDT_outer_wall_radius_max" value="1717.8*mm"/>
+
</define>
<detectors>
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="BlueVis" sensitive="true" insideTrackingVolume="true">
<envelope vis="SeeThrough">
<shape type="BooleanShape" operation="Union" material="Air">
- <shape type="Tube" rmin="SDT_inner_chamber_radius_min" rmax="SDT_inner_chamber_radius_max" dz="SDT_half_length" />
- <shape type="Tube" rmin="SDT_outer_chamber_radius_min" rmax="SDT_outer_chamber_radius_max" dz="SDT_half_length" />
+ <shape type="Tube" rmin="SDT_radius_min" rmax="SDT_inner_chamber_radius_max" dz="SDT_half_length" />
+ <shape type="Tube" rmin="SDT_outer_chamber_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
</shape>
</envelope>
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 0c1d96af..64a9a153 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
@@ -83,11 +83,11 @@
<constant name="MainTracker_half_length" value="2225*mm" />
<constant name="InnerTracker_half_length" value="MainTracker_half_length" />
- <constant name="InnerTracker_inner_radius" value="235*mm"/>
+ <constant name="InnerTracker_inner_radius" value="234*mm"/>
<constant name="InnerTracker_outer_radius" value="909*mm"/>
<constant name="OuterTracker_half_length" value="MainTracker_half_length"/>
<constant name="OuterTracker_inner_radius" value="1085*mm"/>
- <constant name="OuterTracker_outer_radius" value="1716*mm"/>
+ <constant name="OuterTracker_outer_radius" value="1720*mm"/>
<constant name="SIT1_inner_radius" value="152.90*mm"/>
<constant name="SIT1_half_length" value="368.00*mm"/>
--
GitLab