Skip to content

Commit

Permalink
Merge branch '18-drich-increase-z-length-and-add-space-for-services' …
Browse files Browse the repository at this point in the history 
…into 'main'

Resolve "dRICH: increase z-length, and add space for services"

Closes #18

See merge request EIC/detectors/ecce!33
  • Loading branch information
@wdconinc
wdconinc committed Jul 20, 2022
2 parents 21f4aeb + 467a401 commit 7b47e8a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
12 changes: 9 additions & 3 deletions compact/definitions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,12 @@ Examples:

<comment> Global PID regions with suballocations for TOF and RICH detectors </comment>
<constant name="ForwardPIDRegion_zmin" value="CentralTrackingRegionP_zmax" />
<constant name="ForwardPIDRegion_length" value="120.0*cm" />
<constant name="ForwardPIDRegion_length" value="155.0*cm" />
<constant name="ForwardPIDRegion_rmax" value="180.0*cm" />

<comment> Forward TOF region currenlty empty for future upgrades </comment>
<constant name="ForwardTOFRegion_zmin" value="ForwardPIDRegion_zmin" />
<constant name="ForwardTOFRegion_length" value="20.0*cm" />
<constant name="ForwardTOFRegion_length" value="35.0*cm" />
<constant name="ForwardTOFRegion_rmax" value="CentralTrackingRegion_rmax" />
<constant name="ForwardTOFRegion_tan" value="CentralTrackingRegionP_tan" />

Expand Down Expand Up @@ -491,6 +492,11 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<constant name="ForwardServiceGap_zmin" value="ForwardPIDRegion_zmin + ForwardInnerEndcapRegion_length"/>
<constant name="ForwardServiceGap_zmax" value="ForwardServiceGap_zmin + ForwardServiceGap_length"/>

<comment> Radial service gap between dRICH and HcalBarrel </comment>
<constant name="ForwardServiceGap_thickness" value="15.0*cm"/>
<constant name="ForwardServiceGap_rmin" value="ForwardPIDRegion_rmax"/>
<constant name="ForwardServiceGap_rmax" value="ForwardServiceGap_rmin + ForwardServiceGap_thickness"/>

<constant name="BackwardServiceGap_length" value="10.0 * cm"/>
<constant name="BackwardServiceGap_zmin" value="320.0 * cm"/> <!-- FIXME hardcoded -->
<constant name="BackwardServiceGap_zmax" value="BackwardServiceGap_zmin + BackwardServiceGap_length"/>
Expand Down Expand Up @@ -557,7 +563,7 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<constant name="HcalEndcapN_rmin" value="max((HcalEndcapN_zmin + HcalEndcapN_length) * tan(abs(CrossingAngle)) + 22.25 * mm, 11 * cm)"/>

<constant name="HcalBarrel_thickness" value="88.0*cm"/> <!-- ref: ECCE proposal -->
<constant name="HcalBarrel_rmin" value="182*cm"/> <!-- ref: ECCE proposal -->
<constant name="HcalBarrel_rmin" value="ForwardServiceGap_rmax"/>
<constant name="HcalBarrel_rmax" value="HcalBarrel_rmin + HcalBarrel_thickness"/>
<constant name="HcalBarrelForward_zmax" value="ForwardServiceGap_zmin"/>
<constant name="HcalBarrelBackward_zmax" value="BackwardServiceGap_zmin"/>
Expand Down
19 changes: 10 additions & 9 deletions compact/drich.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@

<define>
<!-- vessel (=snout+tank) geometry -->
<constant name="DRICH_zmin" value="ForwardRICHRegion_zmin"/> <!-- vessel front -->
<constant name="DRICH_Length" value="ForwardRICHRegion_length"/> <!-- overall vessel length (including snout) -->
<constant name="DRICH_rmin0" value="ForwardRICHRegion_zmin * ForwardRICHRegion_tan1"/> <!-- bore radius at dRICh vessel frontplane -->
<constant name="DRICH_rmin1" value="(ForwardRICHRegion_zmin + ForwardRICHRegion_length) * ForwardRICHRegion_tan2"/> <!-- bore radius at dRICh vessel backplane -->
<constant name="DRICH_Length" value="ForwardRICHRegion_length"/> <!-- overall vessel length -->
<constant name="DRICH_zmin" value="ForwardRICHRegion_zmin"/>
<constant name="DRICH_zmax" value="DRICH_zmin + DRICH_Length"/>
<constant name="DRICH_rmin0" value="DRICH_zmin * ForwardRICHRegion_tan1"/> <!-- bore radius at dRICh entrance -->
<constant name="DRICH_rmin1" value="DRICH_zmax * ForwardRICHRegion_tan2"/> <!-- bore radius at dRICh exit -->
<constant name="DRICH_wall_thickness" value="0.5*cm"/> <!-- thickness of radial walls -->
<constant name="DRICH_window_thickness" value="0.1*cm"/> <!-- thickness of entrance and exit walls -->
<!-- tank geometry: cylinder, holding the majority of detector components -->
<constant name="DRICH_rmax2" value="HcalBarrel_rmin-2*cm"/> <!-- cylinder radius, near maximal to fit HCal barrel inner polygon -->
<!-- snout geometry: cone with front radius rmax0 and back radius of rmax1 -->
<constant name="DRICH_rmax0" value="95.0*cm"/>
<constant name="DRICH_SnoutLength" value="20.0*cm"/>
<constant name="DRICH_SnoutSlope" value="DRICH_rmax2 / (DRICH_zmin + DRICH_Length)"/>
<constant name="DRICH_rmax0" value="DRICH_SnoutSlope * DRICH_zmin"/>
<constant name="DRICH_rmax1" value="DRICH_SnoutSlope * ( DRICH_zmin + DRICH_SnoutLength)"/>
<constant name="DRICH_SnoutSlope" value="DRICH_rmax0 / DRICH_zmin"/> <!-- TODO: increase slope to allow more space for aerogel cones ? -->
<constant name="DRICH_rmax1" value="DRICH_rmax0 + DRICH_SnoutLength * DRICH_SnoutSlope"/>
<!-- tank geometry: cylinder, holding the majority of detector components -->
<constant name="DRICH_rmax2" value="ForwardPIDRegion_rmax"/> <!-- cylinder radius -->
<!-- additional parameters -->
<constant name="DRICH_aerogel_thickness" value="4.0*cm"/> <!-- aerogel thickness -->
<constant name="DRICH_sensor_size" value="25.8*mm"/> <!-- sensor side length -->
Expand Down

0 comments on commit 7b47e8a

Please sign in to comment.