From 09ad16419fa549c30023e631a4a0dac71f909f70 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Sat, 14 Aug 2021 18:37:52 +0000
Subject: [PATCH] HcalEndcap rmin: beampipe expands at 2 cross angle
---
compact/definitions.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 1490d9c4..ab69892a 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -487,15 +487,12 @@ end of the solenoid coils.
<documentation>
-EcalEndcapP_rmin and EcalEndcapN_rmin need to be set in sync with the forward and backward detectors
+EcalEndcapP_rmin and EcalEndcapN_rmin need to be set in sync with the forward and backward detectors.
</documentation>
<constant name="EcalEndcapP_rmin" value="200.0*mm"/>
<constant name="EcalEndcapN_rmin" value="5*cm"/>
<constant name="EcalEndcapN_rmax" value="BarrelTracking_rmax"/>
- <constant name="HcalEndcapP_rmin" value="EcalEndcapP_rmin"/>
- <constant name="HcalEndcapN_rmin" value="EcalEndcapN_rmin"/>
-
<documentation>
## EM Calorimeter Parameters
@@ -567,10 +564,12 @@ The logic goes like this:
<constant name="HcalEndcapP_length" value="120.0*cm"/>
<constant name="HcalEndcapN_length" value="105.0*cm"/>
- <constant name="HcalBarrel_thickness" value="100.0*cm "/>
+ <constant name="HcalEndcapP_rmin" value="max(EcalEndcapP_rmin + HcalEndcapP_length * tan(2.0 * abs(CrossingAngle)), 15 * cm)"/>
+ <constant name="HcalEndcapN_rmin" value="max(EcalEndcapN_rmin + HcalEndcapN_length * tan (abs(CrossingAngle)), 11 * cm)"/>
- <constant name="HcalBarrel_rmin" value="Solenoid_rmax"/>
- <constant name="HcalBarrel_rmax" value="HcalBarrel_rmin + HcalBarrel_thickness"/>
+ <constant name="HcalBarrel_thickness" value="100.0*cm "/>
+ <constant name="HcalBarrel_rmin" value="Solenoid_rmax"/>
+ <constant name="HcalBarrel_rmax" value="HcalBarrel_rmin + HcalBarrel_thickness"/>
<constant name="HcalBarrelAvailThickness" value="HcalBarrel_thickness"/>
--
GitLab