Updated TOF geometry parameters and template

eic · Oct 2, 2024 · 638d0cc · 638d0cc
1 parent 4c6c58a
commit 638d0cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml
@@ -41,19 +41,20 @@
 
     <comment> Main parameters for Barrel TOF layers </comment>
     <comment> Barrel TOF region </comment>
-    <constant name="BarrelTOF_zmin"          value="112.5*cm"/>
-    <constant name="BarrelTOF_zmax"          value="174.0*cm"/>
-    <constant name="BarrelTOF_radius_design" value="64.6*cm"/>
+    <constant name="BarrelTOF_zmin"          value="117.5*cm"/>
+    <constant name="BarrelTOF_zmax"          value="162.5*cm"/>
+    <constant name="BarrelTOF_radius_design" value="61.6*cm"/>
 
     <comment> Forward TOF region  </comment>
-    <constant name="ForwardTOFRegion_zmin"        value="174.0*cm" />
+    <constant name="ForwardTOFRegion_zmin"        value="ForwardPIDRegion_zmin" />
+    <constant name="ForwardTOFRegion_zmax"        value="ForwardTOFRegion_zmin + ForwardTOFRegion_length" />
     <constant name="ForwardTOFRegion_tan"         value="CentralTrackingRegionP_tan" />
     <constant name="ForwardTOFRegion_minR"        value="8*cm" />
-    <constant name="ForwardTOFRegion_maxR"        value="50*cm" />
+    <constant name="ForwardTOFRegion_maxR"        value="57.5*cm" />
     <constant name="ForwardTOF_xOffset"           value="-2.75*cm" />
     <constant name="ForwardTOF_det_height"        value="2.0*cm" />
     <constant name="ForwardTOF_length"            value="min(ForwardTOFRegion_length, 2.*cm)"/>
-    <constant name="ForwardTOF_zmin"              value="ForwardTOFRegion_zmin + ForwardTOFRegion_length - ForwardTOF_length - 1*cm"/>
+    <constant name="ForwardTOF_zmin"              value="ForwardTOFRegion_zmax - ForwardTOF_length - 1*cm"/>
 
     <comment> Service/Support setup </comment>
     <constant name="TrackerSupportCyl_rmin1"          value="TrackerEndcapDisk_rmax + 2*cm"/> <comment> Ref: Services Material Budget 24.03.04..stp -- 450.00 mm </comment>

diff --git a/compact/tracking/tof_barrel.xml b/compact/tracking/tof_barrel.xml
@@ -1,5 +1,5 @@
 <!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
-<!-- Copyright (C) 2022 Zhenyu Ye -->
+<!-- Copyright (C) 2022-2023 Zhenyu Ye -->
 
 <lccdd>
 <info name="tof_barrel.xml"
@@ -59,9 +59,11 @@
     <constant name="BarrelTOF_Module_nphi"         value="144"/>
     <constant name="BarrelTOF_Module_nz"           value="1"/>
 
+    <constant name="BarrelTOF_rOffset0"            value="5.6*cm"/>
     <constant name="BarrelTOF_rOffset1"            value="1.6*cm"/>
     <constant name="BarrelTOF_rOffset2"            value="1.4*cm"/>
-    <constant name="BarrelTOF_rmin"                value="BarrelTOF_radius-BarrelTOF_rOffset1"/>
+    <constant name="BarrelTOF_rmin"                value="BarrelTOF_radius-BarrelTOF_rOffset0"/>
+    <constant name="BarrelTOF_rmin1"               value="BarrelTOF_radius-BarrelTOF_rOffset1"/>
     <constant name="BarrelTOF_rmax"                value="BarrelTOF_radius+BarrelTOF_rOffset2"/>
     <constant name="BarrelTOF_zoffset"             value="0.5*(BarrelTOF_zmax - BarrelTOF_zmin)"/>
     <constant name="BarrelTOF_length1"             value="BarrelTOF_zmin + BarrelTOF_zmax"/>
@@ -91,7 +93,7 @@
       insideTrackingVolume="true">
       <type_flags type="DetType_TRACKER + DetType_BARREL"/>
       <dimensions
-        rmin="BarrelTOF_rmin"
+        rmin="BarrelTOF_rmin1"
         rmax="BarrelTOF_rmax"
         length="BarrelTOF_length"/>
       <comment>
@@ -128,7 +130,7 @@
       </module>
       <layer module="BarrelTOF_Module1" id="1" vis="TOFLayerVis">
         <barrel_envelope
-          inner_r="BarrelTOF_rmin"
+          inner_r="BarrelTOF_rmin1"
           outer_r="BarrelTOF_rmax"
           z_length="BarrelTOF_length+2*BarrelTOF_zOffset"
           z0="BarrelTOF_zoffset"/>

diff --git a/templates/DetectorParameterTable.csv.jinja2 b/templates/DetectorParameterTable.csv.jinja2
@@ -7,7 +7,7 @@ HADRON DIRECTION END CAP,Service Gap,,{{ForwardServiceGap_length}},,,,{{ForwardS
 CENTRAL DETECTOR,Dual RICH,,{{DRICH_length}},{{DRICH_rmin0}},{{DRICH_rmax2}},,{{DRICH_zmin}},{{DRICH_zmin+DRICH_length}}
 CENTRAL DETECTOR,Dual RICH,Detector Section,,{{DRICH_rmin0}},,,,
 CENTRAL DETECTOR,Dual RICH,Aerogel Section,,{{DRICH_rmin0}},,,,
-CENTRAL DETECTOR,HD Time of Flight/Tracker,,,,,,,
+CENTRAL DETECTOR,HD Time of Flight/Tracker,,{{ForwardTOFRegion_length}},{{ForwardTOFRegion_minR}},{{ForwardTOFRegion_maxR}},{{ForwardTOFRegion_zmin}},{{ForwardTOFRegion_zmin}},{{ForwardTOFRegion_zmax}}
 CENTRAL DETECTOR,Barrel Flux Return,,,,,,,
 CENTRAL DETECTOR,Barrel Hadron Calorimeter,,{{HcalBarrel_length2}},{{HcalBarrel_rmin1}},{{HcalBarrel_rmax}},{{HcalBarrel_offset}},-{{HcalBarrelBackward_zmax-HcalBarrel_offset}},{{HcalBarrelForward_zmax+HcalBarrel_offset}}
 CENTRAL DETECTOR,Barrel Hadron Calorimeter,HD Section,,{{HcalBarrel_length2-HcalBarrel_length1}},{{HcalBarrel_rmin2}},{{HcalBarrel_rmax}},{{HcalBarrel_length1/4+HcalBarrel_offset}},{{HcalBarrel_length1/2+HcalBarrel_offset}},{{HcalBarrelForward_zmax+HcalBarrel_offset}}
@@ -31,7 +31,7 @@ CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,Dirc Bar/MPGD  Support,,,,,,
 CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,DIRC Readout Support,{{DIRCReadout_length}},,,,,
 CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,DIRC Bar Box,{{DIRCBar_length}},,,,,
 CENTRAL DETECTOR,Integrated DIRC/MPGD Detector,Inner MPGD,,,,,,
-CENTRAL DETECTOR,Barrel Time of Flight/Tracker,,{{BarrelTOF_length}},{{BarrelTOF_rmin}},{{BarrelTOF_rmax}},,,
+CENTRAL DETECTOR,Barrel Time of Flight/Tracker,,{{BarrelTOF_length}},{{BarrelTOF_rmin}},{{BarrelTOF_rmax}},{{BarrelTOF_zoffset}},-{{BarrelTOF_zmin}},{{BarrelTOF_zmax}}
 CENTRAL DETECTOR,HD MPGD 2,,{{ForwardMPGD_AllowedSpace}},{{ForwardMPGDLayer2_rmin}},{{ForwardMPGDLayer2_rmax}},{{ForwardMPGDLayer2_zmin}},{{ForwardMPGDLayer2_zmin}},{{ForwardMPGDLayer2_zmin+ForwardMPGD_AllowedSpace}}
 CENTRAL DETECTOR,HD MPGD 1,,{{ForwardMPGD_AllowedSpace}},{{ForwardMPGDLayer1_rmin}},{{ForwardMPGDLayer1_rmax}},{{ForwardMPGDLayer1_zmin}},{{ForwardMPGDLayer1_zmin}},{{ForwardMPGDLayer1_zmin+ForwardMPGD_AllowedSpace}}
 CENTRAL DETECTOR,Inner Tracker (Micromegas),,,,,,,