From 00a2c887f09233ed6c51c4983577e50b4217bb02 Mon Sep 17 00:00:00 2001
From: FU Chengdong <fucd@ihep.ac.cn>
Date: Wed, 24 Apr 2024 01:47:30 +0000
Subject: [PATCH] Geom: Correct wrong parameter
---
.../compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml | 2 +-
Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml | 2 +-
Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml | 2 +-
Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml | 2 +-
Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml
index b161b0bb..7b97e410 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml
@@ -83,7 +83,7 @@
<slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
</flex>
<sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
- deadwire_length="(19*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+ deadwire_length="(10*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
</ladder>
</layer>
<layer layer_id="2" ladder_radius="48*mm" ladder_offset="(8.4+10.213840)*mm" n_ladders="24" n_sensors_per_side="0">
diff --git a/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml b/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml
index dda851d6..cf923ffb 100644
--- a/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
<include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/>
<!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/-->
diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml
index e0a91d17..1c41fb6d 100644
--- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/>
<fields>
diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml
index a5089584..b39a915a 100644
--- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/>
<include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/>
<!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/-->
diff --git a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml
index cc30d11b..a1b6f0af 100644
--- a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml
@@ -32,7 +32,7 @@
<include ref="../CRD_common_v01/VXD_StaggeredLadder_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
<fields>
diff --git a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml
index 79eea6dc..365d3f29 100644
--- a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_StaggeredLadder_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
<include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/>
<!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/-->
diff --git a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml
index ececd616..d2efa509 100644
--- a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_03.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_03.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
<fields>
diff --git a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml
index 1804d93a..c9f94424 100644
--- a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml
@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_03.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_03.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
- <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
+ <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
<include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/>
<!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/-->
diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml
index 65915aa7..73ec69de 100644
--- a/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml
@@ -84,7 +84,7 @@
<constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
<constant name="Vertex_outer_radius" value="70*mm"/>
- <constant name="Vertex_half_length" value="430*mm"/>
+ <constant name="Vertex_half_length" value="210*mm"/>
<constant name="BeamPipe_VertexRegion_rmax" value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml
index f6d1d6e4..f58fe4f1 100644
--- a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml
@@ -30,7 +30,7 @@
<!--old version, should be check/-->
<include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
<!--preliminary vertex and tracker, to update/-->
- <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+ <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_02.xml"/>
<include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
<include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/>
diff --git a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
index 52a6209d..e267c61e 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
@@ -19,8 +19,8 @@ rndmgensvc = RndmGenSvc("RndmGenSvc")
rndmgensvc.Engine = rndmengine.name()
# option for standalone tracker study
-geometry_option = "CRD_o1_v01/CRD_o1_v01-onlyTracker.xml"
-#geometry_option = "CRD_o1_v01/CRD_o1_v01.xml"
+#geometry_option = "CRD_o1_v01/CRD_o1_v01-onlyTracker.xml"
+geometry_option = "CRD_o1_v01/CRD_o1_v01.xml"
if not os.getenv("DETCRDROOT"):
print("Can't find the geometry. Please setup envvar DETCRDROOT." )
--
GitLab