From 5fefb6a3562ee65dec1a7a1d7e32ae7a4a5572b0 Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Thu, 25 Mar 2021 14:55:53 +0800
Subject: [PATCH] Update of DC parameters in v02 of CRD

---
 .../CRD_o1_v02/CRD_Dimensions_v01_02.xml      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
index 0ef534ce..9e1f0dfa 100644
--- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
@@ -83,14 +83,23 @@
 
     <constant name="DC_Endcap_z" value="0.1*mm"/>
     <constant name="DC_half_length"  value="2225*mm" />
+    <constant name="DC_safe_distance" value="0.2*mm"/>
+    <constant name="DC_inner_chamber_layer_rbegin" value="235*mm"/>
+    <constant name="DC_inner_chamber_layer_rend" value="905*mm"/>
+    <constant name="DC_outer_chamber_layer_rbegin" value="1085*mm"/>
+    <constant name="DC_outer_chamber_layer_rend" value="1715*mm"/>
+    <constant name="DC_inner_chamber_radius_min" value="DC_inner_chamber_layer_rbegin"/>
+    <constant name="DC_inner_chamber_radius_max" value="909*mm"/>
+    <constant name="DC_outer_chamber_radius_min" value="DC_outer_chamber_layer_rbegin"/>
+    <constant name="DC_outer_chamber_radius_max" value="1716*mm"/>
     <constant name="MainTracker_half_length"  value="DC_half_length+DC_Endcap_z" />
     <constant name="InnerTracker_half_length"  value="DC_half_length" />
-    <constant name="InnerTracker_inner_radius" value="234.8*mm"/>
-    <constant name="InnerTracker_outer_radius" value="908.8*mm"/>
+    <constant name="InnerTracker_inner_radius" value="234*mm"/>
+    <constant name="InnerTracker_outer_radius" value="DC_inner_chamber_radius_max"/>
     <constant name="OuterTracker_half_length"  value="DC_half_length"/>
-    <constant name="OuterTracker_inner_radius" value="1084.8*mm"/>
-    <constant name="OuterTracker_outer_radius" value="1717.8*mm"/>
-    
+    <constant name="OuterTracker_inner_radius" value="DC_outer_chamber_radius_min-DC_safe_distance"/>
+    <constant name="OuterTracker_outer_radius" value="1720*mm"/>
+
     <constant name="SIT1_inner_radius"   value="140*mm"/>
     <constant name="SIT1_half_length"    value="368.00*mm"/>
     <constant name="SIT2_inner_radius"   value="225*mm"/>
-- 
GitLab