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

Closes #18 (closed)

• see issue for more details

Changes to definitions.xml relevant for other detectors:

• add constant ForwardPIDRegion_rmax for the PID region; this is used to define a new radial service gap between the PID region and the barrel HCal
• the new service gap pushes HcalBarrel_rmin to 195 cm (see Roland's slides, linked in #18 (closed))

compact/definitions.xml

@@ -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" />
 
@@ -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"/>
@@ -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"/>