From ba4673474f796d4a041aab09d8d49ad69babcf7a Mon Sep 17 00:00:00 2001 From: myliu <201916234@mail.sdu.edu.cn> Date: Tue, 11 May 2021 22:30:57 +0800 Subject: [PATCH] Simple modification --- .../DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml | 5 ++--- .../DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml | 9 ++++----- .../DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml | 7 +++---- Detector/DetDriftChamber/compact/det.xml | 4 ++-- 4 files changed, 11 insertions(+), 14 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 d381120d..ca4d0d06 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 @@ -19,9 +19,8 @@ <constant name="world_z" value="world_size"/> <!-- SDT --> - <constant name="DetID_DC" value="7"/> - <constant name="SDT_radius_min" value="Tracker_inner_radius"/> - <constant name="SDT_radius_max" value="Tracker_outer_radius"/> + <constant name="SDT_radius_min" value="799.78*mm"/> + <constant name="SDT_radius_max" value="1803*mm"/> <constant name="SDT_half_length" value="MainTracker_half_length"/> <constant name="DC_length" value="DC_half_length*2"/> 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 af995705..2be7bf35 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 @@ -5,7 +5,7 @@ <info name="CRDDimensions" title="master file with includes and world dimension" - author="C.D.Fu, " + author="C.D.Fu, Mengyao Liu" url="no" status="development" version="1.0"> @@ -96,12 +96,11 @@ <!-- Parameters of single drift chamber --> <constant name="DC_chamber_layer_rbegin" value="800*mm"/> - <constant name="DC_chamber_layer_rend" value="1720*mm"/> + <constant name="DC_chamber_layer_rend" value="1800*mm"/> <constant name="DC_chamber_radius_min" value="DC_chamber_layer_rbegin-DC_safe_distance"/> <constant name="DC_chamber_radius_max" value="DC_chamber_layer_rend+DC_safe_distance"/> - <constant name="Tracker_half_length" value="DC_half_length" /> - <constant name="Tracker_inner_radius" value="799.78*mm"/> - <constant name="Tracker_outer_radius" value="1723*mm"/> + <constant name="DC_inner_radius" value="799.78*mm"/> + <constant name="DC_outer_radius" value="1803*mm"/> <constant name="SIT1_inner_radius" value="152.90*mm"/> <constant name="SIT1_half_length" value="368.00*mm"/> 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 59f64c50..ca49e6ca 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 @@ -5,7 +5,7 @@ <info name="CRDDimensions" title="master file with includes and world dimension" - author="C.D.Fu, " + author="C.D.Fu, Mengyao Liu" url="no" status="development" version="1.0"> @@ -96,12 +96,11 @@ <!-- Parameters of single drift chamber --> <constant name="DC_chamber_layer_rbegin" value="800*mm"/> - <constant name="DC_chamber_layer_rend" value="1720*mm"/> + <constant name="DC_chamber_layer_rend" value="1800*mm"/> <constant name="DC_chamber_radius_min" value="DC_chamber_layer_rbegin-DC_safe_distance"/> <constant name="DC_chamber_radius_max" value="DC_chamber_layer_rend+DC_safe_distance"/> - <constant name="Tracker_half_length" value="DC_half_length" /> <constant name="Tracker_inner_radius" value="799.78*mm"/> - <constant name="Tracker_outer_radius" value="1723*mm"/> + <constant name="Tracker_outer_radius" value="1803*mm"/> <constant name="SIT1_inner_radius" value="140*mm"/> diff --git a/Detector/DetDriftChamber/compact/det.xml b/Detector/DetDriftChamber/compact/det.xml index 73f1c278..58bd2dd9 100644 --- a/Detector/DetDriftChamber/compact/det.xml +++ b/Detector/DetDriftChamber/compact/det.xml @@ -27,7 +27,7 @@ <!-- SDT --> <constant name="DetID_DC" value="7"/> <constant name="SDT_radius_min" value="799.78*mm"/> - <constant name="SDT_radius_max" value="1723*mm"/> + <constant name="SDT_radius_max" value="1803*mm"/> <constant name="DC_Endcap_dz" value="0.1*mm"/> @@ -42,7 +42,7 @@ <constant name="SDT_outer_wall_thickness" value="2.8*mm"/> <constant name="DC_chamber_layer_rbegin" value="800*mm"/> - <constant name="DC_chamber_layer_rend" value="1720*mm"/> + <constant name="DC_chamber_layer_rend" value="1800*mm"/> <constant name="DC_chamber_radius_min" value="DC_chamber_layer_rbegin-DC_safe_distance"/> <constant name="DC_chamber_radius_max" value="DC_chamber_layer_rend+DC_safe_distance"/> -- GitLab