From ab400a96e4290856d01e032b5cb6130c6d8431c5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 13 Apr 2021 18:07:22 -0500
Subject: [PATCH] Fixed overlaps
- Added some fudging numbers for ecal endcap z positions. Should fix
this in the future..
---
compact/definitions.xml | 8 ++++----
reference_detector.xml | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 06a23d73..1c972714 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -373,7 +373,7 @@
<constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/>
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelPIDThickness + 5.0 * mm"/>
- <constant name="HcalBarrel_rmax" value="Solenoid_rmin - 40.0 *mm "/>
+ <constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/>
<constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
<constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
@@ -389,8 +389,8 @@
<constant name="BarrelLength" value="SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength"/>
<constant name="Barrel_offset" value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0"/>
- <constant name="EndcapPTotalCal_length" value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 0.0 * mm)"/>
- <constant name="EndcapNTotalCal_length" value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 0.0 * mm)"/>
+ <constant name="EndcapPTotalCal_length" value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
+ <constant name="EndcapNTotalCal_length" value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
<constant name="EndcapP_CalDivide" value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
<constant name="EndcapN_CalDivide" value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
@@ -593,7 +593,7 @@
ce_GEM Parameters
------------------
</comment>
- <constant name="ce_GEM_rmin" value="7.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
+ <constant name="ce_GEM_rmin" value="10.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
<!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
<constant name="ce_GEM_rmax" value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps </comment>
<!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
diff --git a/reference_detector.xml b/reference_detector.xml
index 0aa5cd1c..aa89d843 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -122,7 +122,6 @@
<include ref="compact/ce_GEM.xml"/>
<include ref="compact/ffi_ZDC.xml"/>
<include ref="compact/ci_GEM.xml"/>
-
<include ref="compact/hcal.xml"/>
<!--
<include ref="compact/ci_HCAL.xml"/>
--
GitLab