From ddf60f8f9b865ed6342de215b80d8f78edf43233 Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 6 Jan 2025 14:44:32 +0800
Subject: [PATCH 01/12] Update the beam pipe geometry as the latest Acc deisgn

---
 .../CRD_common_v02/Beampipe_v01_07.xml        | 341 +++++++++++++++++
 .../CRD_common_v02/Beampipe_v01_Shield.xml    | 350 ++++++++++++++++++
 .../TDR_o1_v01/TDR_Dimensions_v01_01.xml      |  13 +-
 3 files changed, 703 insertions(+), 1 deletion(-)
 create mode 100644 Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
 create mode 100644 Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml

diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
new file mode 100644
index 00000000..0a8a75cd
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -0,0 +1,341 @@
+<lccdd>
+  <info name="CRD" title="CRD Beam pipe" author="Chengdong Fu" url="no" status="development" version="1.0">
+    <comment>A beampipe for CRD</comment>
+  </info>
+
+  <display>
+    <vis name="TubeVis"   alpha="0.1" r="1.0" g="0.7"  b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="VacVis"   alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+  </display>
+
+  <define>
+    <constant name="BeamPipe_Iron_thickness"        value="2.5*mm"/>
+    <constant name="BeamPipe_BeAl_zmin"             value="BeamPipe_CentralBe_zmax-2.5*mm"/>
+    <constant name="BeamPipe_BeAl_thickness1"       value="0.3*mm"/>
+    <constant name="BeamPipe_BeAl_thickness2"       value="0.5*mm"/>
+    <constant name="BeamPipe_Al_thickness3"         value="1.3*mm"/>
+    <constant name="BeamPipe_Cooling_zpos1"         value="96.0*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius1" value="11.2*mm"/>
+    <constant name="BeamPipe_Cooling_zpos2"         value="118.25*mm"/>
+    <constant name="BeamPipe_Cooling_zpos3"         value="162.8*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius3" value="13.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos4"         value="168.4*mm"/>
+    <constant name="BeamPipe_Al_thickness4"         value="1.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos5"         value="177.35*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius5" value="19.0*mm"/>
+    <constant name="BeamPipe_Cooling_zpos6"         value="BeamPipe_CentralAl_zmax"/>
+    <constant name="BeamPipe_CablePipe_thickness1"  value="1.5*mm"/>
+    <constant name="BeamPipe_CablePipe_thickness2"  value="1.6*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos0"          value="219.8*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos1"          value="222.8*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius1"  value="12.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius1"  value="17.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos2"          value="240.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius2"  value="27.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos3"          value="250.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos4"          value="259.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius4"  value="27.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos5"          value="262.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos6"          value="372.5*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius6"  value="27.9*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius6"  value="43.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos7"          value="386.5*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius7"  value="44.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos8"          value="388.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos9"          value="465.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius9"  value="65.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos10"         value="470.0*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius9"  value="45.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos11"         value="495.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos12"         value="500.0*mm"/>
+  </define>
+
+  <detectors>        
+    <detector name="BeamPipe" type="CRDBeamPipe_v01" vis="VacVis" printLevel="ERROR">
+      <parameter crossingangle="CrossingAngle" />
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_BEAMPIPE"/>
+
+      <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_BeAl_zmin" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="TubeVis"/>
+	<layer material="G4_WATER" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeAlLinker" zStart="BeamPipe_BeAl_zmin" zEnd="BeamPipe_CentralBe_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_BeAl_thickness1" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling1" zStart="BeamPipe_CentralBe_zmax" zEnd="BeamPipe_Cooling_zpos1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" thicknessEnd="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_outer_thickness+BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling2" zStart="BeamPipe_Cooling_zpos1" zEnd="BeamPipe_Cooling_zpos2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling3" zStart="BeamPipe_Cooling_zpos2" zEnd="BeamPipe_Cooling_zpos3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+	<layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling4" zStart="BeamPipe_Cooling_zpos3" zEnd="BeamPipe_Cooling_zpos4" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling5" zStart="BeamPipe_Cooling_zpos4" zEnd="BeamPipe_Cooling_zpos5" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling6" zStart="BeamPipe_Cooling_zpos5" zEnd="BeamPipe_Cooling_zpos6" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" thicknessEnd="0" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" thicknessEnd="BeamPipe_Al_thickness-BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type="Waist" name="Waist1st" zStart="BeamPipe_CentralAl_zmax" zEnd="BeamPipe_ExpandAl_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- cable pipe-->
+      <section type="CenterSide" name="IPCablePipeFront" zStart="BeamPipe_CablePipe_zpos0" zEnd="BeamPipe_CablePipe_zpos1" rStart="BeamPipe_CablePipe_inner_radius1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_inner_radius1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe1" zStart="BeamPipe_CablePipe_zpos1" zEnd="BeamPipe_CablePipe_zpos2" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe2" zStart="BeamPipe_CablePipe_zpos2" zEnd="BeamPipe_CablePipe_zpos3" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1+BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe3" zStart="BeamPipe_CablePipe_zpos3" zEnd="BeamPipe_CablePipe_zpos4" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+	<layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe4" zStart="BeamPipe_CablePipe_zpos4" zEnd="BeamPipe_CablePipe_zpos5" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius2"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe5" zStart="BeamPipe_CablePipe_zpos5" zEnd="BeamPipe_CablePipe_zpos6"
+	       rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1" rEnd="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe6" zStart="BeamPipe_CablePipe_zpos6" zEnd="BeamPipe_CablePipe_zpos7" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe7" zStart="BeamPipe_CablePipe_zpos7" zEnd="BeamPipe_CablePipe_zpos8" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_outer_radius6"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe8" zStart="BeamPipe_CablePipe_zpos8" zEnd="BeamPipe_CablePipe_zpos9"
+	       rStart="BeamPipe_CablePipe_inner_radius6" rEnd="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+               thicknessEnd="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe9" zStart="BeamPipe_CablePipe_zpos9" zEnd="BeamPipe_CablePipe_zpos10" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe10" zStart="BeamPipe_CablePipe_zpos10" zEnd="BeamPipe_CablePipe_zpos11" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe11" zStart="BeamPipe_CablePipe_zpos11" zEnd="BeamPipe_CablePipe_zpos12" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- end -->
+      <section type="Runway" name="Waist2nd" zStart="BeamPipe_ExpandAl_zmax" zEnd="BeamPipe_Linker_zmin" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist3rd" zStart="BeamPipe_Linker_zmin" zEnd="BeamPipe_Linker_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist4th" zStart="BeamPipe_Linker_zmax" zEnd="BeamPipe_Waist_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width"
+	       shift="BeamPipe_SecondExpand_width-BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Crotch" name="Fork" zStart="BeamPipe_Waist_zmax" zEnd="BeamPipe_Crotch_zmax"
+	       rStart="BeamPipe_Central_inner_radius" rEnd="BeamPipe_Central_inner_radius" size="BeamPipe_SecondExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="FirstDoublePipe" zStart="BeamPipe_Crotch_zmax" zEnd="BeamPipe_FirstSeparated_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="BeforeMask" zStart="BeamPipe_FirstSeparated_zmax" zEnd="BeamPipe_SR_Mask_z1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask1" zStart="BeamPipe_SR_Mask_z1" zEnd="BeamPipe_SR_Mask_z2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" thicknessEnd="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask2" zStart="BeamPipe_SR_Mask_z2" zEnd="BeamPipe_SR_Mask_z3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask3" zStart="BeamPipe_SR_Mask_z3" zEnd="BeamPipe_Q1a_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Fork_inner_radius"  vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Cu_thickness"  vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1a" zStart="BeamPipe_Q1a_zmin" zEnd="BeamPipe_Q1a_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Q1Linker" zStart="BeamPipe_Q1a_zmax" zEnd="BeamPipe_Q1b_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" thicknessEnd="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1b" zStart="BeamPipe_Q1b_zmin" zEnd="BeamPipe_Q1b_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="QF1Linker" zStart="BeamPipe_Q1b_zmax" zEnd="BeamPipe_QF1_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" thicknessEnd="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="QF1" zStart="BeamPipe_QF1_zmin" zEnd="BeamPipe_QF1_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Farest" zStart="BeamPipe_QF1_zmax" zEnd="BeamPipe_end_z" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+
+      <!-- Magnets and their cooling, support -->
+      <section type="CenterSide" name="AntiSolenoid1" zStart="1130*mm" zEnd="1900*mm" rStart="90*mm">
+        <layer material="CrZrCu18150" thickness="20*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <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">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_CenterSide" zStart="1900*mm" zEnd="3800*mm" rStart="175*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_Linker" zStart="3800*mm" zEnd="3910*mm" rStart="175*mm">
+        <layer material="G4_Ti" thickness="3*mm" thicknessEnd="68*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_RearSide" zStart="3910*mm" zEnd="7160*mm" rStart="240*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_1" zStart="1130*mm" zEnd="1135*mm" rStart="75*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <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">
+        <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">
+        <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">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4i" zStart="1930*mm" zEnd="4000*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4o" zStart="1905*mm" zEnd="3940*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5l" zStart="3940*mm" zEnd="3945*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5r" zStart="4000*mm" zEnd="4005*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6i" zStart="4005*mm" zEnd="7050*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6o" zStart="3945*mm" zEnd="7050*mm" rStart="205*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_7" zStart="7050*mm" zEnd="7055*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1l" zStart="1135*mm" zEnd="1160*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <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">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2l" zStart="1905*mm" zEnd="1930*mm" rStart="120*mm">
+        <layer material="lHe" thickness="20*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2i" zStart="1925*mm" zEnd="3964*mm" rStart="110*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2o" zStart="1930*mm" zEnd="3945*mm" rStart="130*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r1" zStart="3964*mm" zEnd="4000*mm" rStart="110*mm">
+        <layer material="lHe" thickness="65*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r2" zStart="3945*mm" zEnd="3964*mm" rStart="130*mm">
+        <layer material="lHe" thickness="45*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3l" zStart="3945*mm" zEnd="3970*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3i" zStart="3970*mm" zEnd="7000*mm" rStart="175*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3o" zStart="3970*mm" zEnd="7000*mm" rStart="195*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3r" zStart="7000*mm" zEnd="7050*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+    </detector>
+  </detectors>        
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
new file mode 100644
index 00000000..32c170d3
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
@@ -0,0 +1,350 @@
+<lccdd>
+  <info name="CRD" title="CRD Beam pipe" author="Chengdong Fu" url="no" status="development" version="1.0">
+    <comment>A beampipe for CRD</comment>
+  </info>
+
+  <display>
+    <vis name="TubeVis"   alpha="0.1" r="1.0" g="0.7"  b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="VacVis"   alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+  </display>
+
+  <define>
+    <constant name="BeamPipe_Iron_thickness"        value="2.5*mm"/>
+    <constant name="BeamPipe_BeAl_zmin"             value="BeamPipe_CentralBe_zmax-2.5*mm"/>
+    <constant name="BeamPipe_BeAl_thickness1"       value="0.3*mm"/>
+    <constant name="BeamPipe_BeAl_thickness2"       value="0.5*mm"/>
+    <constant name="BeamPipe_Al_thickness3"         value="1.3*mm"/>
+    <constant name="BeamPipe_Cooling_zpos1"         value="96.0*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius1" value="11.2*mm"/>
+    <constant name="BeamPipe_Cooling_zpos2"         value="118.25*mm"/>
+    <constant name="BeamPipe_Cooling_zpos3"         value="162.8*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius3" value="13.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos4"         value="168.4*mm"/>
+    <constant name="BeamPipe_Al_thickness4"         value="1.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos5"         value="177.35*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius5" value="19.0*mm"/>
+    <constant name="BeamPipe_Cooling_zpos6"         value="BeamPipe_CentralAl_zmax"/>
+    <constant name="BeamPipe_CablePipe_thickness1"  value="1.5*mm"/>
+    <constant name="BeamPipe_CablePipe_thickness2"  value="1.6*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos0"          value="219.8*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos1"          value="222.8*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius1"  value="12.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius1"  value="17.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos2"          value="240.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius2"  value="27.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos3"          value="250.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos4"          value="259.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius4"  value="27.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos5"          value="262.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos6"          value="372.5*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius6"  value="27.9*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius6"  value="43.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos7"          value="386.5*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius7"  value="44.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos8"          value="388.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos9"          value="465.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius9"  value="65.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos10"         value="470.0*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius9"  value="45.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos11"         value="495.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos12"         value="500.0*mm"/>
+  </define>
+
+  <detectors>        
+    <detector name="BeamPipe" type="CRDBeamPipe_v01" vis="VacVis" printLevel="ERROR">
+      <parameter crossingangle="CrossingAngle" />
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_BEAMPIPE"/>
+
+      <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_BeAl_zmin" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="TubeVis"/>
+	<layer material="G4_WATER" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeAlLinker" zStart="BeamPipe_BeAl_zmin" zEnd="BeamPipe_CentralBe_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_BeAl_thickness1" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling1" zStart="BeamPipe_CentralBe_zmax" zEnd="BeamPipe_Cooling_zpos1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" thicknessEnd="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_outer_thickness+BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling2" zStart="BeamPipe_Cooling_zpos1" zEnd="BeamPipe_Cooling_zpos2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling3" zStart="BeamPipe_Cooling_zpos2" zEnd="BeamPipe_Cooling_zpos3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+	<layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling4" zStart="BeamPipe_Cooling_zpos3" zEnd="BeamPipe_Cooling_zpos4" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling5" zStart="BeamPipe_Cooling_zpos4" zEnd="BeamPipe_Cooling_zpos5" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling6" zStart="BeamPipe_Cooling_zpos5" zEnd="BeamPipe_Cooling_zpos6" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" thicknessEnd="0" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" thicknessEnd="BeamPipe_Al_thickness-BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type="Waist" name="Waist1st" zStart="BeamPipe_CentralAl_zmax" zEnd="BeamPipe_ExpandAl_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- cable pipe-->
+      <section type="CenterSide" name="IPCablePipeFront" zStart="BeamPipe_CablePipe_zpos0" zEnd="BeamPipe_CablePipe_zpos1" rStart="BeamPipe_CablePipe_inner_radius1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_inner_radius1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe1" zStart="BeamPipe_CablePipe_zpos1" zEnd="BeamPipe_CablePipe_zpos2" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe2" zStart="BeamPipe_CablePipe_zpos2" zEnd="BeamPipe_CablePipe_zpos3" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1+BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe3" zStart="BeamPipe_CablePipe_zpos3" zEnd="BeamPipe_CablePipe_zpos4" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+	<layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe4" zStart="BeamPipe_CablePipe_zpos4" zEnd="BeamPipe_CablePipe_zpos5" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius2"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe5" zStart="BeamPipe_CablePipe_zpos5" zEnd="BeamPipe_CablePipe_zpos6"
+	       rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1" rEnd="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe6" zStart="BeamPipe_CablePipe_zpos6" zEnd="BeamPipe_CablePipe_zpos7" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe7" zStart="BeamPipe_CablePipe_zpos7" zEnd="BeamPipe_CablePipe_zpos8" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_outer_radius6"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe8" zStart="BeamPipe_CablePipe_zpos8" zEnd="BeamPipe_CablePipe_zpos9"
+	       rStart="BeamPipe_CablePipe_inner_radius6" rEnd="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+               thicknessEnd="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe9" zStart="BeamPipe_CablePipe_zpos9" zEnd="BeamPipe_CablePipe_zpos10" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe10" zStart="BeamPipe_CablePipe_zpos10" zEnd="BeamPipe_CablePipe_zpos11" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe11" zStart="BeamPipe_CablePipe_zpos11" zEnd="BeamPipe_CablePipe_zpos12" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- end -->
+      <section type="Runway" name="Waist2nd" zStart="BeamPipe_ExpandAl_zmax" zEnd="BeamPipe_Linker_zmin" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist3rd" zStart="BeamPipe_Linker_zmin" zEnd="BeamPipe_Linker_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist4th" zStart="BeamPipe_Linker_zmax" zEnd="BeamPipe_Waist_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width"
+	       shift="BeamPipe_SecondExpand_width-BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Crotch" name="Fork" zStart="BeamPipe_Waist_zmax" zEnd="BeamPipe_Crotch_zmax"
+	       rStart="BeamPipe_Central_inner_radius" rEnd="BeamPipe_Central_inner_radius" size="BeamPipe_SecondExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="FirstDoublePipe" zStart="BeamPipe_Crotch_zmax" zEnd="BeamPipe_FirstSeparated_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="BeforeMask" zStart="BeamPipe_FirstSeparated_zmax" zEnd="BeamPipe_SR_Mask_z1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask1" zStart="BeamPipe_SR_Mask_z1" zEnd="BeamPipe_SR_Mask_z2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" thicknessEnd="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask2" zStart="BeamPipe_SR_Mask_z2" zEnd="BeamPipe_SR_Mask_z3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask3" zStart="BeamPipe_SR_Mask_z3" zEnd="BeamPipe_Q1a_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Fork_inner_radius"  vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Cu_thickness"  vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1a" zStart="BeamPipe_Q1a_zmin" zEnd="BeamPipe_Q1a_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Q1Linker" zStart="BeamPipe_Q1a_zmax" zEnd="BeamPipe_Q1b_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" thicknessEnd="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1b" zStart="BeamPipe_Q1b_zmin" zEnd="BeamPipe_Q1b_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="QF1Linker" zStart="BeamPipe_Q1b_zmax" zEnd="BeamPipe_QF1_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" thicknessEnd="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="QF1" zStart="BeamPipe_QF1_zmin" zEnd="BeamPipe_QF1_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Farest" zStart="BeamPipe_QF1_zmax" zEnd="BeamPipe_end_z" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+
+      <!-- Magnets and their cooling, support -->
+      <section type="CenterSide" name="AntiSolenoid1" zStart="1130*mm" zEnd="1900*mm" rStart="50*mm">
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+        <layer material="CrZrCu18150" thickness="20*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="BeforeCryoW" zStart="950*mm" zEnd="1050*mm" rStart="100.0*mm">
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <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"/>
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_FrontSide" zStart="1056*mm" zEnd="1900*mm" rStart="130.75*mm" rEnd="175*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_CenterSide" zStart="1900*mm" zEnd="3800*mm" rStart="175*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_Linker" zStart="3800*mm" zEnd="3910*mm" rStart="175*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_RearSide" zStart="3910*mm" zEnd="7160*mm" rStart="240*mm">
+        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_1" zStart="1130*mm" zEnd="1135*mm" rStart="75*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <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">
+        <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">
+        <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">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4i" zStart="1930*mm" zEnd="4000*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4o" zStart="1905*mm" zEnd="3940*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5l" zStart="3940*mm" zEnd="3945*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5r" zStart="4000*mm" zEnd="4005*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6i" zStart="4005*mm" zEnd="7050*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6o" zStart="3945*mm" zEnd="7050*mm" rStart="205*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_7" zStart="7050*mm" zEnd="7055*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1l" zStart="1135*mm" zEnd="1160*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <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">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2l" zStart="1905*mm" zEnd="1930*mm" rStart="120*mm">
+        <layer material="lHe" thickness="20*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2i" zStart="1925*mm" zEnd="3964*mm" rStart="110*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2o" zStart="1930*mm" zEnd="3945*mm" rStart="130*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r1" zStart="3964*mm" zEnd="4000*mm" rStart="110*mm">
+        <layer material="lHe" thickness="65*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r2" zStart="3945*mm" zEnd="3964*mm" rStart="130*mm">
+        <layer material="lHe" thickness="45*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3l" zStart="3945*mm" zEnd="3970*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3i" zStart="3970*mm" zEnd="7000*mm" rStart="175*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3o" zStart="3970*mm" zEnd="7000*mm" rStart="195*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3r" zStart="7000*mm" zEnd="7050*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+    </detector>
+  </detectors>        
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index 07863eea..637add50 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -67,6 +67,8 @@
     <constant name="BeamPipe_Al_thickness"         value="2.0*mm"/>
     <constant name="BeamPipe_ThinCu_thickness"     value="2.0*mm"/>
     <constant name="BeamPipe_Cu_thickness"         value="3.0*mm"/>
+    <constant name="BeamPipe_Cu_thickness_z"         value="10*cm"/>
+    <constant name="BeamPipe_Cu_thickness_z1"         value="50*cm"/>
 
     <constant name="BeamPipe_CentralBe_zmax"       value="81.5*mm"/>
     <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
@@ -78,13 +80,22 @@
     <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
     <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
     <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SR_Mask_z1"            value="1850*mm"/>
+    <constant name="BeamPipe_SR_Mask_z2"            value="1870*mm"/>
+    <constant name="BeamPipe_SR_Mask_z3"            value="1880*mm"/>
     <constant name="BeamPipe_Q1a_zmin"             value="1900*mm"/>
     <constant name="BeamPipe_Q1a_zmax"             value="3110*mm"/>
     <constant name="BeamPipe_Q1b_zmin"             value="3190*mm"/>
     <constant name="BeamPipe_Q1b_zmax"             value="4400*mm"/>
     <constant name="BeamPipe_QF1_zmin"             value="4700*mm"/>
     <constant name="BeamPipe_QF1_zmax"             value="6200*mm"/>
-    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+    <constant name="BeamPipe_end_z"                value="10000*mm"/>
+    <constant name="BeamPipe_farest_z"                value="72123.7*mm"/>
+    <constant name="BeamPipe_farest_z1"                value="190000*mm"/>
+    <constant name="BeamPipe_farest_inner_radius"      value="28*mm"/>
+    <constant name="BeamPipe_field_radius"      value="90*mm"/>
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid"      value="7*mm"/>
+    <constant name="BeamPipe_Bepipe_Au_thickness"      value="10*um"/>
 
     <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
     <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
-- 
GitLab


From da3551dd2cff74971eb86568ac557f29f0cf62a6 Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 6 Jan 2025 16:02:43 +0800
Subject: [PATCH 02/12] Update the beampipe to 07

---
 Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index 6aa3193e..52d42723 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -27,7 +27,7 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_06.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
   <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>
-- 
GitLab


From c010ed85829a29f0c51657fc57c578790c8ed5d2 Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 6 Jan 2025 16:30:11 +0800
Subject: [PATCH 03/12] Update Beampipe and LumiCal

---
 .../compact/CRD_common_v01/Lumical_o1_v01.xml       | 13 +++----------
 .../compact/CRD_common_v02/Beampipe_v01_Shield.xml  |  2 +-
 2 files changed, 4 insertions(+), 11 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 e6023ac2..3a9a7b12 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
@@ -79,18 +79,11 @@
                 </slice>
             </layer>
             <layer name = "LYSO_2nd">
-                <slice  dx="10*mm" dy="10*mm" dz="200*mm" material="LYSO" vis="GrayVis" sensitive="yes" limits="5*mm">
-	            <position x="0" y="-12*mm" z="1000*mm"/>
+                <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"/>
 	            <rotation x="0" y="0" z="0" />
                 </slice>
             </layer>
-            <layer name = "LYSO_out_W">
-                <slice dx = "10*mm" dy="10*mm" dz="200*mm" material="G4_W" vis="LumicalFlangeVis"
-                sensitive = "no" limits = "5*mm">
-                <position x="0" y="-12" z="1000*mm"/>
-                <rotation x="0" y="0" z="0"/>
-                </slice>
-            </layer>
         
             
         </detector>
@@ -118,4 +111,4 @@
     </readout>
   </readouts>
 
-</lccdd>
\ No newline at end of file
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
index 32c170d3..35aeb5f5 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
@@ -247,7 +247,7 @@
       <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
-      <section type="CenterSide" name="BeforeCryoW" zStart="950*mm" zEnd="1050*mm" rStart="100.0*mm">
+      <section type="CenterSide" name="BeforeCryoW" zStart="800*mm" zEnd="1050*mm" rStart="100.0*mm">
         <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
       </section>
       <section type="CenterSide" name="MagnetShell_Front" zStart="1050*mm" zEnd="1056*mm" rStart="50.0*mm">
-- 
GitLab


From ec09808f284660f4836e82223a882d85d8256829 Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 6 Jan 2025 16:35:54 +0800
Subject: [PATCH 04/12] Update the default setting to baseline with shielding

---
 Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index 52d42723..0b05f0b9 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -27,7 +27,7 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_Shield.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
   <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>
-- 
GitLab


From 6f43387f7ef21b916a39b376d4ca218cfe671048 Mon Sep 17 00:00:00 2001
From: Chengdong Fu <fucd@ihep.ac.cn>
Date: Mon, 13 Jan 2025 15:58:30 +0800
Subject: [PATCH 05/12] add anti-solenoid field

---
 .../CRD_common_v02/Beampipe_v01_07.xml        |  6 +--
 .../CRD_common_v02/Beampipe_v01_Shield.xml    |  6 +--
 .../TDR_o1_v01/TDR_Dimensions_v01_01.xml      | 33 ++++++++++-----
 .../DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml  | 41 ++++++++++++++-----
 4 files changed, 59 insertions(+), 27 deletions(-)

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 0a8a75cd..ea16c275 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -237,13 +237,13 @@
       </section>
 
       <!-- Magnets and their cooling, support -->
-      <section type="CenterSide" name="AntiSolenoid1" zStart="1130*mm" zEnd="1900*mm" rStart="90*mm">
+      <section type="CenterSide" name="AntiSolenoid1" zStart="BeamPipe_AntiSolenoid1_zmin" zEnd="BeamPipe_AntiSolenoid1_zmax" rStart="BeamPipe_AntiSolenoid1_inner_radius">
         <layer material="CrZrCu18150" thickness="20*mm" vis="MagentaVis"/>
       </section>
-      <section type="CenterSide" name="AntiSolenoid2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+      <section type="CenterSide" name="AntiSolenoid2" zStart="BeamPipe_AntiSolenoid2_zmin" zEnd="BeamPipe_AntiSolenoid2_zmax" rStart="BeamPipe_AntiSolenoid2_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
-      <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+      <section type="CenterSide" name="AntiSolenoid3" zStart="BeamPipe_AntiSolenoid3_zmin" zEnd="BeamPipe_AntiSolenoid3_zmax" rStart="BeamPipe_AntiSolenoid3_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
       <section type="CenterSide" name="MagnetShell_Front" zStart="1050*mm" zEnd="1056*mm" rStart="50.0*mm">
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
index 35aeb5f5..de29eaa7 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_Shield.xml
@@ -237,14 +237,14 @@
       </section>
 
       <!-- Magnets and their cooling, support -->
-      <section type="CenterSide" name="AntiSolenoid1" zStart="1130*mm" zEnd="1900*mm" rStart="50*mm">
+      <section type="CenterSide" name="AntiSolenoid1" zStart="BeamPipe_AntiSolenoid1_zmin" zEnd="BeamPipe_AntiSolenoid1_zmax" rStart="BeamPipe_AntiSolenoid1_inner_radius">
         <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
         <layer material="CrZrCu18150" thickness="20*mm" vis="MagentaVis"/>
       </section>
-      <section type="CenterSide" name="AntiSolenoid2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+      <section type="CenterSide" name="AntiSolenoid2" zStart="BeamPipe_AntiSolenoid2_zmin" zEnd="BeamPipe_AntiSolenoid2_zmax" rStart="BeamPipe_AntiSolenoid2_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
-      <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+      <section type="CenterSide" name="AntiSolenoid3" zStart="BeamPipe_AntiSolenoid3_zmin" zEnd="BeamPipe_AntiSolenoid3_zmax" rStart="BeamPipe_AntiSolenoid3_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
       <section type="CenterSide" name="BeforeCryoW" zStart="800*mm" zEnd="1050*mm" rStart="100.0*mm">
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index 637add50..abe8bb6c 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -67,8 +67,8 @@
     <constant name="BeamPipe_Al_thickness"         value="2.0*mm"/>
     <constant name="BeamPipe_ThinCu_thickness"     value="2.0*mm"/>
     <constant name="BeamPipe_Cu_thickness"         value="3.0*mm"/>
-    <constant name="BeamPipe_Cu_thickness_z"         value="10*cm"/>
-    <constant name="BeamPipe_Cu_thickness_z1"         value="50*cm"/>
+    <constant name="BeamPipe_Cu_thickness_z"       value="10*cm"/>
+    <constant name="BeamPipe_Cu_thickness_z1"      value="50*cm"/>
 
     <constant name="BeamPipe_CentralBe_zmax"       value="81.5*mm"/>
     <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
@@ -80,9 +80,9 @@
     <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
     <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
     <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
-    <constant name="BeamPipe_SR_Mask_z1"            value="1850*mm"/>
-    <constant name="BeamPipe_SR_Mask_z2"            value="1870*mm"/>
-    <constant name="BeamPipe_SR_Mask_z3"            value="1880*mm"/>
+    <constant name="BeamPipe_SR_Mask_z1"           value="1850*mm"/>
+    <constant name="BeamPipe_SR_Mask_z2"           value="1870*mm"/>
+    <constant name="BeamPipe_SR_Mask_z3"           value="1880*mm"/>
     <constant name="BeamPipe_Q1a_zmin"             value="1900*mm"/>
     <constant name="BeamPipe_Q1a_zmax"             value="3110*mm"/>
     <constant name="BeamPipe_Q1b_zmin"             value="3190*mm"/>
@@ -90,11 +90,22 @@
     <constant name="BeamPipe_QF1_zmin"             value="4700*mm"/>
     <constant name="BeamPipe_QF1_zmax"             value="6200*mm"/>
     <constant name="BeamPipe_end_z"                value="10000*mm"/>
-    <constant name="BeamPipe_farest_z"                value="72123.7*mm"/>
-    <constant name="BeamPipe_farest_z1"                value="190000*mm"/>
+    <constant name="BeamPipe_farest_z"             value="72123.7*mm"/>
+    <constant name="BeamPipe_farest_z1"            value="190000*mm"/>
+
+    <constant name="BeamPipe_AntiSolenoid1_zmin"         value="1130*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_zmax"         value="1900*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_inner_radius" value="90*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmin"         value="1930*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmax"         value="3964*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_inner_radius" value="120*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmin"         value="3970*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmax"         value="7000*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_inner_radius" value="185*mm"/>
+
     <constant name="BeamPipe_farest_inner_radius"      value="28*mm"/>
-    <constant name="BeamPipe_field_radius"      value="90*mm"/>
-    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid"      value="7*mm"/>
+    <!--constant name="BeamPipe_field_radius"             value="90*mm"/-->
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
     <constant name="BeamPipe_Bepipe_Au_thickness"      value="10*um"/>
 
     <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
@@ -173,7 +184,7 @@
     <constant name="Ecal_barrel_symmetry"     value="32"/>
     <constant name="Ecal_Tpc_gap"             value="Ecal_barrel_inner_radius-TPC_outer_radius"/>
 
-    <constant name="Ecal_endcap_inner_radius" value="400*mm"/>
+    <constant name="Ecal_endcap_inner_radius" value="350*mm"/>
     <constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
     <constant name="Ecal_endcap_zmin"         value="2930*mm"/>
     <constant name="Ecal_endcap_thickness"    value="Ecal_barrel_thickness"/>
@@ -274,7 +285,7 @@
     <!--standard scale-->
     <constant name="Muon_standard_scale" value="94*cm"/>    
     <!--constant name="Muon_total_length" value="8950*mm"/--><!--overlap with coil and hcal-->
-    <constant name="Muon_total_length" value="Yoke_endcap_zmin*2"/>
+    <constant name="Muon_total_length" value="9150*mm"/>
 
     <!--Muon Barrel>
     <constant name="Muon_barrel_barrel_num" value="2"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index 0b05f0b9..30099be7 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -42,7 +42,7 @@
   <!--include ref="../CRD_common_v01/OTKEndcap_v01_01.xml"/-->
 
   <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_02.xml"/>
-  <include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_02.xml"/>
+  <include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_03.xml"/>
   <include ref="../CRD_common_v01/SHcalGlass_Barrel_v05.xml"/>
   <include ref="../CRD_common_v01/SHcalGlass_Endcaps_v01.xml"/>
 
@@ -55,25 +55,46 @@
   <include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/-->
  
   <!--muon detector-->
-  <include ref="../CRD_common_v01/Muon_Barrel_v01_03.xml"/>
+  <include ref="../CRD_common_v01/Muon_Barrel_v01_04.xml"/>
   <include ref="../CRD_common_v01/Muon_Endcap_v01_02.xml"/>
   <include ref="../CRD_common_v01/ParaffinEndcap_v01_01.xml"/>
  
   <fields>
-    <field name="InnerSolenoid" type="solenoid"
-           inner_field="Field_nominal_value"
-           outer_field="0"
-           zmax="SolenoidCoil_half_length"
-           inner_radius="SolenoidCoil_center_radius"
-           outer_radius="Solenoid_outer_radius">
+    <field name="InnerField" type="solenoid"
+	   inner_field="0"
+	   outer_field="Field_nominal_value"
+	   zmax="SolenoidCoil_half_length"
+	   inner_radius="BeamPipe_AntiSolenoid3_inner_radius"
+	   outer_radius="SolenoidCoil_center_radius">
     </field>
-    <field name="OuterSolenoid" type="solenoid"
+    <field name="OuterField" type="solenoid"
            inner_field="0"
            outer_field="Field_outer_nominal_value"
            zmax="SolenoidCoil_half_length"
-           inner_radius="Solenoid_outer_radius"
+           inner_radius="SolenoidCoil_center_radius"
            outer_radius="Yoke_barrel_inner_radius">
     </field>
+    <field name="BeamPipeField1" type="solenoid"
+	   inner_field="Field_nominal_value"
+	   outer_field="0"
+	   zmax="BeamPipe_AntiSolenoid1_zmin"
+	   inner_radius="BeamPipe_AntiSolenoid1_inner_radius"
+	   outer_radius="BeamPipe_AntiSolenoid1_inner_radius">
+    </field>
+    <field name="BeamPipeField2" type="solenoid"
+	   inner_field="0"
+	   outer_field="Field_nominal_value"
+	   zmax="BeamPipe_AntiSolenoid2_zmin"
+	   inner_radius="BeamPipe_AntiSolenoid1_inner_radius"
+	   outer_radius="BeamPipe_AntiSolenoid2_inner_radius">
+    </field>
+    <field name="BeamPipeField3" type="solenoid"
+	   inner_field="0"
+	   outer_field="Field_nominal_value"
+	   zmax="min(BeamPipe_AntiSolenoid3_zmin,SolenoidCoil_half_length)"
+	   inner_radius="BeamPipe_AntiSolenoid2_inner_radius"
+	   outer_radius="BeamPipe_AntiSolenoid3_inner_radius">
+    </field>
   </fields>
 
 </lccdd>
-- 
GitLab


From 4b8cb22e99f030fe7123c6131e1bb5f414edeb7c Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Tue, 25 Feb 2025 10:30:45 +0800
Subject: [PATCH 06/12] Update with the latest beampipe and cryo

---
 .../CRD_common_v02/Beampipe_v01_07.xml        |  16 +-
 .../CRD_common_v02/Beampipe_v01_08.xml        | 341 ++++++++++++++++++
 .../TDR_o1_v01/TDR_Dimensions_v01_01.xml      |  14 +-
 .../DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml  |  39 +-
 4 files changed, 363 insertions(+), 47 deletions(-)
 create mode 100644 Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml

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 ea16c275..4d2b741f 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -61,6 +61,7 @@
 
       <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_BeAl_zmin" rStart="0">
 	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="Au" thickness="0.005*mm" vis="VacVis"/>
 	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="TubeVis"/>
 	<layer material="G4_WATER" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
 	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
@@ -238,7 +239,7 @@
 
       <!-- Magnets and their cooling, support -->
       <section type="CenterSide" name="AntiSolenoid1" zStart="BeamPipe_AntiSolenoid1_zmin" zEnd="BeamPipe_AntiSolenoid1_zmax" rStart="BeamPipe_AntiSolenoid1_inner_radius">
-        <layer material="CrZrCu18150" thickness="20*mm" vis="MagentaVis"/>
+        <layer material="CrZrCu18150" thickness="30*mm" vis="MagentaVis"/>
       </section>
       <section type="CenterSide" name="AntiSolenoid2" zStart="BeamPipe_AntiSolenoid2_zmin" zEnd="BeamPipe_AntiSolenoid2_zmax" rStart="BeamPipe_AntiSolenoid2_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
@@ -246,20 +247,23 @@
       <section type="CenterSide" name="AntiSolenoid3" zStart="BeamPipe_AntiSolenoid3_zmin" zEnd="BeamPipe_AntiSolenoid3_zmax" rStart="BeamPipe_AntiSolenoid3_inner_radius">
         <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
       </section>
+      <section type="CenterSide" name="BeforeCryoW" zStart="800*mm" zEnd="1050*mm" rStart="100.0*mm">
+        <layer material="G4_W" thickness="10*mm" vis="ShellVis"/>
+      </section>
       <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"/>
+        <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">
-        <layer material="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <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="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <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="G4_Ti" thickness="3*mm" thicknessEnd="68*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="G4_Ti" thickness="3*mm" vis="ShellVis"/>
+        <layer material="stainless_steel" thickness="15*mm" vis="ShellVis"/>
       </section>
       <section type="CenterSide" name="MagnetSupport_1" zStart="1130*mm" zEnd="1135*mm" rStart="75*mm">
         <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
new file mode 100644
index 00000000..44dba92d
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
@@ -0,0 +1,341 @@
+<lccdd>
+  <info name="CRD" title="CRD Beam pipe" author="Chengdong Fu" url="no" status="development" version="1.0">
+    <comment>A beampipe for CRD without shielding</comment>
+  </info>
+
+  <display>
+    <vis name="TubeVis"   alpha="0.1" r="1.0" g="0.7"  b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="VacVis"   alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+  </display>
+
+  <define>
+    <constant name="BeamPipe_Iron_thickness"        value="2.5*mm"/>
+    <constant name="BeamPipe_BeAl_zmin"             value="BeamPipe_CentralBe_zmax-2.5*mm"/>
+    <constant name="BeamPipe_BeAl_thickness1"       value="0.3*mm"/>
+    <constant name="BeamPipe_BeAl_thickness2"       value="0.5*mm"/>
+    <constant name="BeamPipe_Al_thickness3"         value="1.3*mm"/>
+    <constant name="BeamPipe_Cooling_zpos1"         value="96.0*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius1" value="11.2*mm"/>
+    <constant name="BeamPipe_Cooling_zpos2"         value="118.25*mm"/>
+    <constant name="BeamPipe_Cooling_zpos3"         value="162.8*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius3" value="13.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos4"         value="168.4*mm"/>
+    <constant name="BeamPipe_Al_thickness4"         value="1.5*mm"/>
+    <constant name="BeamPipe_Cooling_zpos5"         value="177.35*mm"/>
+    <constant name="BeamPipe_Cooling_outer_radius5" value="19.0*mm"/>
+    <constant name="BeamPipe_Cooling_zpos6"         value="BeamPipe_CentralAl_zmax"/>
+    <constant name="BeamPipe_CablePipe_thickness1"  value="1.5*mm"/>
+    <constant name="BeamPipe_CablePipe_thickness2"  value="1.6*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos0"          value="219.8*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos1"          value="222.8*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius1"  value="12.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius1"  value="17.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos2"          value="240.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius2"  value="27.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos3"          value="250.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos4"          value="259.8*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius4"  value="27.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos5"          value="262.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos6"          value="372.5*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius6"  value="27.9*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius6"  value="43.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos7"          value="386.5*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius7"  value="44.4*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos8"          value="388.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos9"          value="465.0*mm"/>
+    <constant name="BeamPipe_CablePipe_outer_radius9"  value="65.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos10"         value="470.0*mm"/>
+    <constant name="BeamPipe_CablePipe_inner_radius9"  value="45.5*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos11"         value="495.0*mm"/>
+    <constant name="BeamPipe_CablePipe_zpos12"         value="500.0*mm"/>
+  </define>
+
+  <detectors>        
+    <detector name="BeamPipe" type="CRDBeamPipe_v01" vis="VacVis" printLevel="ERROR">
+      <parameter crossingangle="CrossingAngle" />
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_BEAMPIPE"/>
+
+      <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_BeAl_zmin" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="TubeVis"/>
+	<layer material="G4_WATER" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeAlLinker" zStart="BeamPipe_BeAl_zmin" zEnd="BeamPipe_CentralBe_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness/2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
+        <layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_BeAl_thickness1" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling1" zStart="BeamPipe_CentralBe_zmax" zEnd="BeamPipe_Cooling_zpos1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_inner_thickness" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness" thicknessEnd="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Be_outer_thickness+BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_BeAl_thickness2" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling2" zStart="BeamPipe_Cooling_zpos1" zEnd="BeamPipe_Cooling_zpos2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_BeAl_thickness2" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness-BeamPipe_BeAl_thickness2"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling3" zStart="BeamPipe_Cooling_zpos2" zEnd="BeamPipe_Cooling_zpos3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+	<layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling4" zStart="BeamPipe_Cooling_zpos3" zEnd="BeamPipe_Cooling_zpos4" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius3-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness3"
+	       thicknessEnd="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" thicknessEnd="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling5" zStart="BeamPipe_Cooling_zpos4" zEnd="BeamPipe_Cooling_zpos5" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" vis="TubeVis"/>
+      </section>
+      <section type ="Center" name="IPBeCooling6" zStart="BeamPipe_Cooling_zpos5" zEnd="BeamPipe_Cooling_zpos6" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness3" vis="TubeVis"/>
+        <layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_outer_radius5-BeamPipe_Central_inner_radius-BeamPipe_Al_thickness3-BeamPipe_Al_thickness4" thicknessEnd="0" vis="GrayVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness4" thicknessEnd="BeamPipe_Al_thickness-BeamPipe_Al_thickness3" vis="TubeVis"/>
+      </section>
+      <section type="Waist" name="Waist1st" zStart="BeamPipe_CentralAl_zmax" zEnd="BeamPipe_ExpandAl_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- cable pipe-->
+      <section type="CenterSide" name="IPCablePipeFront" zStart="BeamPipe_CablePipe_zpos0" zEnd="BeamPipe_CablePipe_zpos1" rStart="BeamPipe_CablePipe_inner_radius1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_inner_radius1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe1" zStart="BeamPipe_CablePipe_zpos1" zEnd="BeamPipe_CablePipe_zpos2" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe2" zStart="BeamPipe_CablePipe_zpos2" zEnd="BeamPipe_CablePipe_zpos3" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1+BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe3" zStart="BeamPipe_CablePipe_zpos3" zEnd="BeamPipe_CablePipe_zpos4" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+	<layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe4" zStart="BeamPipe_CablePipe_zpos4" zEnd="BeamPipe_CablePipe_zpos5" rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius2-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius2"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe5" zStart="BeamPipe_CablePipe_zpos5" zEnd="BeamPipe_CablePipe_zpos6"
+	       rStart="BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness1" rEnd="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius4-BeamPipe_CablePipe_outer_radius1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe6" zStart="BeamPipe_CablePipe_zpos6" zEnd="BeamPipe_CablePipe_zpos7" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe7" zStart="BeamPipe_CablePipe_zpos7" zEnd="BeamPipe_CablePipe_zpos8" rStart="BeamPipe_CablePipe_inner_radius6">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius6-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+	       thicknessEnd="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2+BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_outer_radius6"
+	       thicknessEnd="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe8" zStart="BeamPipe_CablePipe_zpos8" zEnd="BeamPipe_CablePipe_zpos9"
+	       rStart="BeamPipe_CablePipe_inner_radius6" rEnd="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius7-BeamPipe_CablePipe_inner_radius6-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2"
+               thicknessEnd="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe9" zStart="BeamPipe_CablePipe_zpos9" zEnd="BeamPipe_CablePipe_zpos10" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness1" vis="TubeVis"/>
+        <layer material="Air" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9-BeamPipe_CablePipe_thickness1-BeamPipe_CablePipe_thickness2" vis="VacVis"/>
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_thickness2" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe10" zStart="BeamPipe_CablePipe_zpos10" zEnd="BeamPipe_CablePipe_zpos11" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_CablePipe_outer_radius9-BeamPipe_CablePipe_inner_radius9" vis="TubeVis"/>
+      </section>
+      <section type="CenterSide" name="IPCablePipe11" zStart="BeamPipe_CablePipe_zpos11" zEnd="BeamPipe_CablePipe_zpos12" rStart="BeamPipe_CablePipe_inner_radius9">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <!-- end -->
+      <section type="Runway" name="Waist2nd" zStart="BeamPipe_ExpandAl_zmax" zEnd="BeamPipe_Linker_zmin" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist3rd" zStart="BeamPipe_Linker_zmin" zEnd="BeamPipe_Linker_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Runway" name="Waist4th" zStart="BeamPipe_Linker_zmax" zEnd="BeamPipe_Waist_zmax" rStart="BeamPipe_Central_inner_radius" size="BeamPipe_FirstExpand_width"
+	       shift="BeamPipe_SecondExpand_width-BeamPipe_FirstExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Crotch" name="Fork" zStart="BeamPipe_Waist_zmax" zEnd="BeamPipe_Crotch_zmax"
+	       rStart="BeamPipe_Central_inner_radius" rEnd="BeamPipe_Central_inner_radius" size="BeamPipe_SecondExpand_width">
+        <layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="FirstDoublePipe" zStart="BeamPipe_Crotch_zmax" zEnd="BeamPipe_FirstSeparated_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_ThinCu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="BeforeMask" zStart="BeamPipe_FirstSeparated_zmax" zEnd="BeamPipe_SR_Mask_z1" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask1" zStart="BeamPipe_SR_Mask_z1" zEnd="BeamPipe_SR_Mask_z2" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Fork_inner_radius" thicknessEnd="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask2" zStart="BeamPipe_SR_Mask_z2" zEnd="BeamPipe_SR_Mask_z3" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="SRMask3" zStart="BeamPipe_SR_Mask_z3" zEnd="BeamPipe_Q1a_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Fork_inner_radius"  vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Cu_thickness"  vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1a" zStart="BeamPipe_Q1a_zmin" zEnd="BeamPipe_Q1a_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Q1Linker" zStart="BeamPipe_Q1a_zmax" zEnd="BeamPipe_Q1b_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" thicknessEnd="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="Q1b" zStart="BeamPipe_Q1b_zmin" zEnd="BeamPipe_Q1b_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="QF1Linker" zStart="BeamPipe_Q1b_zmax" zEnd="BeamPipe_QF1_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Q1b_inner_radius" thicknessEnd="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+      <section type="Legs" name="QF1" zStart="BeamPipe_QF1_zmin" zEnd="BeamPipe_QF1_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+        <layer material="CrZrCu18150" thickness="6.0*mm" vis="MagentaVis"/>
+      </section>
+      <section type="Legs" name="Farest" zStart="BeamPipe_QF1_zmax" zEnd="BeamPipe_end_z" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="TubeVis"/>
+      </section>
+
+      <!-- Magnets and their cooling, support -->
+      <section type="CenterSide" name="AntiSolenoid1" zStart="1130*mm" zEnd="1900*mm" rStart="90*mm">
+        <layer material="CrZrCu18150" thickness="30*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <section type="CenterSide" name="AntiSolenoid3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+        <layer material="CrZrCu18150" thickness="10*mm" vis="MagentaVis"/>
+      </section>
+      <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">
+        <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">
+        <layer material="G4_Ti" thickness="5*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_Linker" zStart="3800*mm" zEnd="3910*mm" rStart="175*mm">
+        <layer material="G4_Ti" thickness="5*mm" thicknessEnd="68*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_RearSide" zStart="3910*mm" zEnd="7160*mm" rStart="240*mm">
+        <layer material="G4_Ti" thickness="5*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_1" zStart="1130*mm" zEnd="1135*mm" rStart="75*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <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">
+        <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">
+        <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">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4i" zStart="1930*mm" zEnd="4000*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4o" zStart="1905*mm" zEnd="3940*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5l" zStart="3940*mm" zEnd="3945*mm" rStart="140*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5r" zStart="4000*mm" zEnd="4005*mm" rStart="105*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6i" zStart="4005*mm" zEnd="7050*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6o" zStart="3945*mm" zEnd="7050*mm" rStart="205*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_7" zStart="7050*mm" zEnd="7055*mm" rStart="170*mm">
+        <layer material="G4_Al" thickness="2*mm" vis="ShellVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1l" zStart="1135*mm" zEnd="1160*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <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">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
+        <layer material="lHe" thickness="40*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2l" zStart="1905*mm" zEnd="1930*mm" rStart="120*mm">
+        <layer material="lHe" thickness="20*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2i" zStart="1925*mm" zEnd="3964*mm" rStart="110*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2o" zStart="1930*mm" zEnd="3945*mm" rStart="130*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r1" zStart="3964*mm" zEnd="4000*mm" rStart="110*mm">
+        <layer material="lHe" thickness="65*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r2" zStart="3945*mm" zEnd="3964*mm" rStart="130*mm">
+        <layer material="lHe" thickness="45*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3l" zStart="3945*mm" zEnd="3970*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3i" zStart="3970*mm" zEnd="7000*mm" rStart="175*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3o" zStart="3970*mm" zEnd="7000*mm" rStart="195*mm">
+        <layer material="lHe" thickness="10*mm" vis="BlueVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3r" zStart="7000*mm" zEnd="7050*mm" rStart="175*mm">
+        <layer material="lHe" thickness="30*mm" vis="BlueVis"/>
+      </section>
+    </detector>
+  </detectors>        
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index abe8bb6c..2e12f481 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -67,8 +67,6 @@
     <constant name="BeamPipe_Al_thickness"         value="2.0*mm"/>
     <constant name="BeamPipe_ThinCu_thickness"     value="2.0*mm"/>
     <constant name="BeamPipe_Cu_thickness"         value="3.0*mm"/>
-    <constant name="BeamPipe_Cu_thickness_z"       value="10*cm"/>
-    <constant name="BeamPipe_Cu_thickness_z1"      value="50*cm"/>
 
     <constant name="BeamPipe_CentralBe_zmax"       value="81.5*mm"/>
     <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
@@ -89,9 +87,7 @@
     <constant name="BeamPipe_Q1b_zmax"             value="4400*mm"/>
     <constant name="BeamPipe_QF1_zmin"             value="4700*mm"/>
     <constant name="BeamPipe_QF1_zmax"             value="6200*mm"/>
-    <constant name="BeamPipe_end_z"                value="10000*mm"/>
-    <constant name="BeamPipe_farest_z"             value="72123.7*mm"/>
-    <constant name="BeamPipe_farest_z1"            value="190000*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
 
     <constant name="BeamPipe_AntiSolenoid1_zmin"         value="1130*mm"/>
     <constant name="BeamPipe_AntiSolenoid1_zmax"         value="1900*mm"/>
@@ -103,16 +99,12 @@
     <constant name="BeamPipe_AntiSolenoid3_zmax"         value="7000*mm"/>
     <constant name="BeamPipe_AntiSolenoid3_inner_radius" value="185*mm"/>
 
-    <constant name="BeamPipe_farest_inner_radius"      value="28*mm"/>
-    <!--constant name="BeamPipe_field_radius"             value="90*mm"/-->
-    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
-    <constant name="BeamPipe_Bepipe_Au_thickness"      value="10*um"/>
-
-    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_Central_inner_radius"  value="9.995*mm"/>
     <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
     <constant name="BeamPipe_FirstExpand_width"     value="35*mm"/>
     <constant name="BeamPipe_SecondExpand_width"    value="39*mm"/>
     <constant name="BeamPipe_Mask_inner_radius"     value="6*mm"/>
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
     <constant name="BeamPipe_Q1a_inner_radius"      value="BeamPipe_Fork_inner_radius"/>
     <constant name="BeamPipe_Q1b_inner_radius"      value="11.5*mm"/>
     <constant name="BeamPipe_QF1_inner_radius"      value="16*mm"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index 30099be7..9d971524 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -27,7 +27,7 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_Shield.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
   <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>
@@ -60,41 +60,20 @@
   <include ref="../CRD_common_v01/ParaffinEndcap_v01_01.xml"/>
  
   <fields>
-    <field name="InnerField" type="solenoid"
-	   inner_field="0"
-	   outer_field="Field_nominal_value"
-	   zmax="SolenoidCoil_half_length"
-	   inner_radius="BeamPipe_AntiSolenoid3_inner_radius"
-	   outer_radius="SolenoidCoil_center_radius">
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
     </field>
-    <field name="OuterField" type="solenoid"
+    <field name="OuterSolenoid" type="solenoid"
            inner_field="0"
            outer_field="Field_outer_nominal_value"
            zmax="SolenoidCoil_half_length"
-           inner_radius="SolenoidCoil_center_radius"
+           inner_radius="Solenoid_outer_radius"
            outer_radius="Yoke_barrel_inner_radius">
     </field>
-    <field name="BeamPipeField1" type="solenoid"
-	   inner_field="Field_nominal_value"
-	   outer_field="0"
-	   zmax="BeamPipe_AntiSolenoid1_zmin"
-	   inner_radius="BeamPipe_AntiSolenoid1_inner_radius"
-	   outer_radius="BeamPipe_AntiSolenoid1_inner_radius">
-    </field>
-    <field name="BeamPipeField2" type="solenoid"
-	   inner_field="0"
-	   outer_field="Field_nominal_value"
-	   zmax="BeamPipe_AntiSolenoid2_zmin"
-	   inner_radius="BeamPipe_AntiSolenoid1_inner_radius"
-	   outer_radius="BeamPipe_AntiSolenoid2_inner_radius">
-    </field>
-    <field name="BeamPipeField3" type="solenoid"
-	   inner_field="0"
-	   outer_field="Field_nominal_value"
-	   zmax="min(BeamPipe_AntiSolenoid3_zmin,SolenoidCoil_half_length)"
-	   inner_radius="BeamPipe_AntiSolenoid2_inner_radius"
-	   outer_radius="BeamPipe_AntiSolenoid3_inner_radius">
-    </field>
   </fields>
 
 </lccdd>
-- 
GitLab


From 3de402fabba5b77d11d06da4293fed257c5ed09c Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Fri, 28 Feb 2025 14:11:13 +0800
Subject: [PATCH 07/12] Fix overlaps

---
 .../compact/CRD_common_v01/Lumical_o1_v01.xml | 114 ------------------
 1 file changed, 114 deletions(-)
 delete mode 100644 Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml

diff --git a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
deleted file mode 100644
index 3a9a7b12..00000000
--- a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<lccdd>
-    
-    <define>
-        <constant name="Lumical_cell_size" value="3*mm"/>
-        <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
-        
-    </define>
-
-  <display>
-    <vis name="LumicalDiskVis"     alpha="1.0" r="0" g="0.5"  b="0.5"  showDaughters="true"  visible="true"/>
-    <vis name="LumicalFlangeVis"   alpha="1.0" r="1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
-    <vis name="LumicalCuVis"       alpha="1.0" r="1.0" g="1.0" b="0"   showDaughters="true" visible="true"/>
-  </display>
-
-
-    <detectors>
-        <detector name="Lumical" id="DetID_LCAL" type="Lumical_v01" readout="LumicalCollection" vis="SeeThrough" insideTrackingVolume="false">
-            <envelope> 
-                <shape type = "Assembly"/>
-            </envelope>
-            <type_flags type=" DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC " />
-
-            <sensitive type="calorimeter"/>
-            
-            <subsegmentation key="module" value="1"/>
-            <subsegmentation key="module" value="2"/>
-            <subsegmentation key="module" value="3"/>
-            <subsegmentation key="module" value="5"/>
-            
-            <layer name = "Disk_Si_1st">
-                <slice type = "Box" dx = "12*mm" dy="29.5*mm" dz = "6*mm" material = "G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
-                    <position x="0" y="26.75*mm" z="560*mm"/>
-                </slice>
-                <slice type="Tubs" rmin="0" rmax="29.5*mm" z="6*mm" phi1="0*deg" phi2="90*deg" material="G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
-                    <position x="6*mm" y="12*mm" z="560*mm"/>
-                </slice>
-            </layer>
-            <layer name = "Disk_Si_2nd">
-                <slice type ="Box" dx = "24*mm" dy="39*mm" dz = "7.263*mm" material = "G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
-                    <position x="0" y="31.5*mm" z="640*mm"/>
-                </slice>
-                <slice type="Tubs" rmin="0" rmax="39*mm" z="6*mm" phi1="0*deg" phi2="90*deg" material="G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
-                    <position x="12*mm" y="12*mm" z="640*mm"/>
-                </slice>
-            </layer>
-            <layer name = "Flange">
-                <slice type="Tubs" rmin="17.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="17.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="17.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="17.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="17.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="17.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="17.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="17.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="17.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>
-            <layer name = "LYSO_1st">
-                <slice  dx="3*mm" dy="3*mm" dz="23*mm" material="LYSO" vis="GrayVis" sensitive="yes" limits="5*mm">
-	            <position x="0" y="-12*mm" z="658.5*mm"/>
-	            <rotation x="0" y="0" z="0" />
-                </slice>
-            </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"/>
-	            <rotation x="0" y="0" z="0" />
-                </slice>
-            </layer>
-        
-            
-        </detector>
-    </detectors>
-
-  <readouts>
-    <readout name="LumicalCollection">
-        
-        <segmentation   type="MultiSegmentation"  key="module">
-             <segmentation name="RPCgrid_Si_1st" type="CartesianGridXY"   key_value="1"  grid_size_x="0.1*mm" grid_size_y="0.1*mm"  />
-            <segmentation name="RPCgrid_Si_2nd" type="CartesianGridXY"   key_value="2"  grid_size_x="0.1*mm" grid_size_y="0.1*mm"  />
-            <segmentation name="RPCgrid_LYSO_1st" type="CartesianGridXY"   key_value="3"  grid_size_x="3*mm" grid_size_y="3*mm"  />
-            <segmentation name="RPCgrid_LYSO_2nd" type="CartesianGridXY"   key_value="5"  grid_size_x="10*mm" grid_size_y="10*mm"  />
-        </segmentation>
-            
-      
-        <hits_collections>
-            <hits_collection name="LumicalCollection"  key="module" key_value="1"/>
-            <hits_collection name="LumicalCollection"  key="module" key_value="2"/>
-            <hits_collection name="LumicalCollection"  key="module" key_value="3"/>
-            <hits_collection name="LumicalCollection"  key="module" key_value="5"/>
-        </hits_collections>
-
-        <id>system:5,side:-2,stave:-2,module:6,layer:8,slice:8,x:32:-16,y:-16</id>
-    </readout>
-  </readouts>
-
-</lccdd>
-- 
GitLab


From aabad5d6d8629453ca1f9eca3360099bfa71686c Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Fri, 28 Feb 2025 14:28:04 +0800
Subject: [PATCH 08/12] Add LumiCal file again, but it is not latest

---
 .../compact/CRD_common_v01/Lumical_o1_v01.xml | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml

diff --git a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
new file mode 100644
index 00000000..3a9a7b12
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
@@ -0,0 +1,114 @@
+<lccdd>
+    
+    <define>
+        <constant name="Lumical_cell_size" value="3*mm"/>
+        <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+        
+    </define>
+
+  <display>
+    <vis name="LumicalDiskVis"     alpha="1.0" r="0" g="0.5"  b="0.5"  showDaughters="true"  visible="true"/>
+    <vis name="LumicalFlangeVis"   alpha="1.0" r="1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
+    <vis name="LumicalCuVis"       alpha="1.0" r="1.0" g="1.0" b="0"   showDaughters="true" visible="true"/>
+  </display>
+
+
+    <detectors>
+        <detector name="Lumical" id="DetID_LCAL" type="Lumical_v01" readout="LumicalCollection" vis="SeeThrough" insideTrackingVolume="false">
+            <envelope> 
+                <shape type = "Assembly"/>
+            </envelope>
+            <type_flags type=" DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC " />
+
+            <sensitive type="calorimeter"/>
+            
+            <subsegmentation key="module" value="1"/>
+            <subsegmentation key="module" value="2"/>
+            <subsegmentation key="module" value="3"/>
+            <subsegmentation key="module" value="5"/>
+            
+            <layer name = "Disk_Si_1st">
+                <slice type = "Box" dx = "12*mm" dy="29.5*mm" dz = "6*mm" material = "G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
+                    <position x="0" y="26.75*mm" z="560*mm"/>
+                </slice>
+                <slice type="Tubs" rmin="0" rmax="29.5*mm" z="6*mm" phi1="0*deg" phi2="90*deg" material="G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
+                    <position x="6*mm" y="12*mm" z="560*mm"/>
+                </slice>
+            </layer>
+            <layer name = "Disk_Si_2nd">
+                <slice type ="Box" dx = "24*mm" dy="39*mm" dz = "7.263*mm" material = "G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
+                    <position x="0" y="31.5*mm" z="640*mm"/>
+                </slice>
+                <slice type="Tubs" rmin="0" rmax="39*mm" z="6*mm" phi1="0*deg" phi2="90*deg" material="G4_Si" vis="LumicalDiskVis" sensitive="yes" limits="5*mm">
+                    <position x="12*mm" y="12*mm" z="640*mm"/>
+                </slice>
+            </layer>
+            <layer name = "Flange">
+                <slice type="Tubs" rmin="17.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="17.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="17.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="17.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="17.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="17.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="17.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="17.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="17.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>
+            <layer name = "LYSO_1st">
+                <slice  dx="3*mm" dy="3*mm" dz="23*mm" material="LYSO" vis="GrayVis" sensitive="yes" limits="5*mm">
+	            <position x="0" y="-12*mm" z="658.5*mm"/>
+	            <rotation x="0" y="0" z="0" />
+                </slice>
+            </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"/>
+	            <rotation x="0" y="0" z="0" />
+                </slice>
+            </layer>
+        
+            
+        </detector>
+    </detectors>
+
+  <readouts>
+    <readout name="LumicalCollection">
+        
+        <segmentation   type="MultiSegmentation"  key="module">
+             <segmentation name="RPCgrid_Si_1st" type="CartesianGridXY"   key_value="1"  grid_size_x="0.1*mm" grid_size_y="0.1*mm"  />
+            <segmentation name="RPCgrid_Si_2nd" type="CartesianGridXY"   key_value="2"  grid_size_x="0.1*mm" grid_size_y="0.1*mm"  />
+            <segmentation name="RPCgrid_LYSO_1st" type="CartesianGridXY"   key_value="3"  grid_size_x="3*mm" grid_size_y="3*mm"  />
+            <segmentation name="RPCgrid_LYSO_2nd" type="CartesianGridXY"   key_value="5"  grid_size_x="10*mm" grid_size_y="10*mm"  />
+        </segmentation>
+            
+      
+        <hits_collections>
+            <hits_collection name="LumicalCollection"  key="module" key_value="1"/>
+            <hits_collection name="LumicalCollection"  key="module" key_value="2"/>
+            <hits_collection name="LumicalCollection"  key="module" key_value="3"/>
+            <hits_collection name="LumicalCollection"  key="module" key_value="5"/>
+        </hits_collections>
+
+        <id>system:5,side:-2,stave:-2,module:6,layer:8,slice:8,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+
+</lccdd>
-- 
GitLab


From 45668762354ef6247c0dca3d8003a065225efb53 Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 3 Mar 2025 10:11:55 +0800
Subject: [PATCH 09/12] Fix the overlaps

---
 .../compact/CRD_common_v01/Lumical_o1_v01.xml | 20 +++++++++----------
 .../CRD_common_v02/Beampipe_v01_07.xml        |  2 +-
 .../CRD_common_v02/Beampipe_v01_08.xml        |  2 +-
 3 files changed, 12 insertions(+), 12 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..b27d9560 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -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..9358eae6 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
@@ -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


From 41fb62dc78b26e990716639af9355bc1773057dd Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 3 Mar 2025 10:33:07 +0800
Subject: [PATCH 10/12] Fix the support

---
 .../DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml     | 8 ++++----
 .../DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

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 b27d9560..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">
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 9358eae6..5b58fbc8 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,7 +267,7 @@
       <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">
-- 
GitLab


From 454978e25fa2843c215ae387b997287441854dbe Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 3 Mar 2025 10:33:59 +0800
Subject: [PATCH 11/12] Change the Lumi pos

---
 Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a8f15a27..1dea47c4 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml
@@ -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>
-- 
GitLab


From 726ef06835e4cd3f821019e8edca023482c8a2bb Mon Sep 17 00:00:00 2001
From: Shy Shi <shyshyshy@outlook.com>
Date: Mon, 3 Mar 2025 14:01:30 +0800
Subject: [PATCH 12/12] Add one more fix in B_08

---
 Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5b58fbc8..d972ef73 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_08.xml
@@ -270,7 +270,7 @@
       <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">
-- 
GitLab