From cdeb3ef814c9142f433352f8da569653d320840a Mon Sep 17 00:00:00 2001
From: Haoyu Shi <shihy@ihep.ac.cn>
Date: Mon, 3 Mar 2025 07:17:34 +0000
Subject: [PATCH] Fix the overlaps in Lumi and pipe
---
.../compact/CRD_common_v01/Lumical_o1_v01.xml | 20 +++++++++----------
.../CRD_common_v02/Beampipe_v01_07.xml | 10 +++++-----
.../CRD_common_v02/Beampipe_v01_08.xml | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
index 3cbbb5be..1dea47c4 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
@@ -44,31 +44,31 @@
</slice>
</layer>
<layer name = "Flange">
- <slice type="Tubs" rmin="18.5*mm" rmax="100*mm" z="30*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="FlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="100*mm" z="30*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="FlangeVis">
<position x="0" y="0*mm" z="685*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="710*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="98*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="98*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="730*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="750*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="755*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="760*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="765*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="770*mm"/>
</slice>
- <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+ <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
<position x="0" y="0*mm" z="775*mm"/>
</slice>
</layer>
@@ -80,7 +80,7 @@
</layer>
<layer name = "LYSO_2nd">
<slice dx="10*mm" dy="10*mm" dz="150*mm" material="LYSO" vis="GrayVis" sensitive="yes" limits="5*mm">
- <position x="0" y="-12*mm" z="800*mm"/>
+ <position x="0" y="-12*mm" z="875*mm"/>
<rotation x="0" y="0" z="0" />
</slice>
</layer>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
index 4d2b741f..7a8bb312 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -253,14 +253,14 @@
<section type="CenterSide" name="MagnetShell_Front" zStart="1050*mm" zEnd="1056*mm" rStart="50.0*mm">
<layer material="stainless_steel" thickness="90.75*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetShell_FrontSide" zStart="1056*mm" zEnd="1900*mm" rStart="130.75*mm" rEnd="175*mm">
+ <section type="CenterSide" name="MagnetShell_FrontSide" zStart="1056*mm" zEnd="1900*mm" rStart="132.75*mm" rEnd="175*mm">
<layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetShell_CenterSide" zStart="1900*mm" zEnd="3800*mm" rStart="175*mm">
<layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetShell_Linker" zStart="3800*mm" zEnd="3910*mm" rStart="175*mm">
- <layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
+ <layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetShell_RearSide" zStart="3910*mm" zEnd="7160*mm" rStart="240*mm">
<layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
@@ -271,10 +271,10 @@
<section type="CenterSide" name="MagnetSupport_2i" zStart="1135*mm" zEnd="1925*mm" rStart="75*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetSupport_2o" zStart="1135*mm" zEnd="1900*mm" rStart="120*mm">
+ <section type="CenterSide" name="MagnetSupport_2o" zStart="1135*mm" zEnd="1900*mm" rStart="130*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetSupport_3l" zStart="1900*mm" zEnd="1905*mm" rStart="120*mm">
+ <section type="CenterSide" name="MagnetSupport_3l" zStart="1900*mm" zEnd="1905*mm" rStart="130*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetSupport_3r" zStart="1925*mm" zEnd="1930*mm" rStart="75*mm">
@@ -307,7 +307,7 @@
<section type="CenterSide" name="MagnetCooling_1i" zStart="1160*mm" zEnd="1900*mm" rStart="80*mm">
<layer material="lHe" thickness="10*mm" vis="BlueVis"/>
</section>
- <section type="CenterSide" name="MagnetCooling_1o" zStart="1160*mm" zEnd="1900*mm" rStart="110*mm">
+ <section type="CenterSide" name="MagnetCooling_1o" zStart="1160*mm" zEnd="1900*mm" rStart="120*mm">
<layer material="lHe" thickness="10*mm" vis="BlueVis"/>
</section>
<section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
index 44dba92d..d972ef73 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
@@ -249,7 +249,7 @@
<section type="CenterSide" name="MagnetShell_Front" zStart="1050*mm" zEnd="1056*mm" rStart="50.0*mm">
<layer material="G4_Ti" thickness="80.75*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetShell_FrontSide" zStart="1056*mm" zEnd="1900*mm" rStart="130.75*mm" rEnd="175*mm">
+ <section type="CenterSide" name="MagnetShell_FrontSide" zStart="1056*mm" zEnd="1900*mm" rStart="132.75*mm" rEnd="175*mm">
<layer material="G4_Ti" thickness="5*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetShell_CenterSide" zStart="1900*mm" zEnd="3800*mm" rStart="175*mm">
@@ -267,10 +267,10 @@
<section type="CenterSide" name="MagnetSupport_2i" zStart="1135*mm" zEnd="1925*mm" rStart="75*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetSupport_2o" zStart="1135*mm" zEnd="1900*mm" rStart="120*mm">
+ <section type="CenterSide" name="MagnetSupport_2o" zStart="1135*mm" zEnd="1900*mm" rStart="130*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
- <section type="CenterSide" name="MagnetSupport_3l" zStart="1900*mm" zEnd="1905*mm" rStart="120*mm">
+ <section type="CenterSide" name="MagnetSupport_3l" zStart="1900*mm" zEnd="1905*mm" rStart="130*mm">
<layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
</section>
<section type="CenterSide" name="MagnetSupport_3r" zStart="1925*mm" zEnd="1930*mm" rStart="75*mm">
@@ -303,7 +303,7 @@
<section type="CenterSide" name="MagnetCooling_1i" zStart="1160*mm" zEnd="1900*mm" rStart="80*mm">
<layer material="lHe" thickness="10*mm" vis="BlueVis"/>
</section>
- <section type="CenterSide" name="MagnetCooling_1o" zStart="1160*mm" zEnd="1900*mm" rStart="110*mm">
+ <section type="CenterSide" name="MagnetCooling_1o" zStart="1160*mm" zEnd="1900*mm" rStart="120*mm">
<layer material="lHe" thickness="10*mm" vis="BlueVis"/>
</section>
<section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
--
GitLab