Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated TOF geometry parameters and template for comparison with geometry DB Detector-20231031150001 #605

Closed
wants to merge 1 commit into from
Closed

Updated TOF geometry parameters and template for comparison with geometry DB Detector-20231031150001 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions compact/tracking/definitions_craterlake.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
yezhenyu2003 marked this conversation as resolved.
Show resolved Hide resolved

<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>
Expand Down
10 changes: 6 additions & 4 deletions compact/tracking/tof_barrel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions templates/DetectorParameterTable.csv.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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),,,,,,,
Expand Down
Loading