From 266acbeb16e01bfeb45181b31e54f2424a913156 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Wed, 1 Sep 2021 22:51:23 +0000
Subject: [PATCH] Tweak barrel setup
---
compact/definitions.xml | 8 ++++----
compact/fake_dirc.xml | 8 ++------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 417fe0e1..2117abf2 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -373,8 +373,8 @@ Examples:
<constant name="BackwardPID_rmax" value="TrackerBarrel_rmax"/>
<comment> Note: PID has space for DIRC, ExtraSpace has room for other detectors past the PID</comment>
- <constant name="BarrelPIDThickness" value="10.0 * cm"/>
- <constant name="BarrelExtraSpaceThickness" value="7.0 * cm"/>
+ <constant name="BarrelPIDThickness" value="8.0 * cm"/>
+ <constant name="BarrelExtraSpaceThickness" value="0.0 * cm"/>
<documentation level="0">
### Extra tracking region behind the endcap PID system
@@ -424,9 +424,9 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<constant name="EcalEndcapN_rmin" value="max((EcalEndcapN_zmin + EcalEndcapN_length) * tan(abs(CrossingAngle)) + 12.5 * mm, 5*cm)"/>
<constant name="EcalEndcapN_rmax" value="TrackerBarrel_rmax"/>
- <constant name="EcalBarrelEnvelope_thickness" value="40.0*cm"/>
+ <constant name="EcalBarrelEnvelope_thickness" value="45.0*cm"/>
<constant name="EcalBarrel_rmin" value="CentralTracking_rmax + BarrelPIDThickness + BarrelExtraSpaceThickness"/>
- <constant name="EcalBarrelForward_length" value="-21*cm"/>
+ <constant name="EcalBarrelForward_length" value="-20*cm"/>
<constant name="EcalBarrelForward_zmax" value="ForwardPID_zmin + EcalBarrelForward_length"/>
<constant name="EcalBarrelBackward_zmax" value="BackwardPID_zmin + BackwardInnerEndcap_length + EcalEndcapN_length"/>
<constant name="EcalBarrel_length" value="EcalBarrelForward_zmax + EcalBarrelBackward_zmax"/>
diff --git a/compact/fake_dirc.xml b/compact/fake_dirc.xml
index 7dfce9ab..fdc17daf 100644
--- a/compact/fake_dirc.xml
+++ b/compact/fake_dirc.xml
@@ -1,11 +1,7 @@
<lccdd>
- <comment>
- DIRC consists of 16 (default) identical modules making a barrel.
- </comment>
-
<define>
- <constant name="DIRCModule_count" value="16" comment="Number of DIRC boxes per... DIRC. 16 - default"/>
+ <constant name="DIRCModule_count" value="CaloSides" />
<constant name="DIRCBar_thickness" value="17*mm" />
<constant name="DIRCBar_length" value="DIRC_length-8*cm" />
@@ -21,7 +17,7 @@
<constant name="DIRCModule_thickness" value="DIRCModule_rmax - DIRC_rmin" />
<constant name="DIRCFrame_rmax" value="DIRC_rmin + DIRCFrame_thickness" />
- <constant name="DIRCModule_halfangle" value="180*degree/DIRCModule_count" />
+ <constant name="DIRCModule_halfangle" value="180*degree/DIRCModule_count" />
<constant name="DIRCModule_width" value="2*DIRC_rmin * tan(DIRCModule_halfangle)"/>
<constant name="DIRCModule_rmin" value="DIRC_rmin + 1*cm"/>
--
GitLab