From f0d7aa5f54ca490da29170709d01fd1d636599e4 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 24 Mar 2021 23:21:59 -0500
Subject: [PATCH] modified: compact/definitions.xml
---
compact/definitions.xml | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index c7321b9..d8535e9 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -247,7 +247,7 @@
<constant name="Solenoid_thickness" value="400*mm"/>
<constant name="Solenoid_rmin" value="2000.0*mm"/>
<constant name="Solenoid_rmax" value="Solenoid_rmin + Solenoid_thickness"/>
- <constant name="SolenoidLength" value="4050.0*mm"/>
+ <constant name="SolenoidLength" value="6000.0*mm"/>
<constant name="SolenoidBarrelCryostatThickness" value=" 1.0 * cm"/>
<constant name="SolenoidBarrelGapThickness" value=" 3.3 * cm"/>
@@ -288,6 +288,17 @@
<constant name="SolenoidYokeChamferAngle" value="0.2"/>
+
+ <comment>
+ ---------------------------------
+ Other Central Detector parameters
+ --------------------------------
+ These are needed here to compute the dependent parameters.
+ </comment>
+ <constant name="RICHLength" value="1.5*m"/>
+ <constant name="TRDLength" value="40.0*cm"/>
+ <constant name="ForwardTOFLength" value="10.0*cm"/>
+
<comment>
============================
Tracking Parameters
@@ -302,8 +313,8 @@
-------------------------
</comment>
<constant name="VertexTrackerInnerRadius" value="30.0*mm"/>
- <constant name="VertexTrackerOuterRadius" value="Solenoid_rmin/2.0"/>
- <constant name="VertexTrackerOuterBarrelLength" value="300.0*mm"/>
+ <constant name="VertexTrackerOuterRadius" value="90.0*mm"/>
+ <constant name="VertexTrackerOuterBarrelLength" value="400.0*mm"/>
<comment>
@@ -312,9 +323,11 @@
--------------------------
</comment>
<constant name="SiliconTrackerInnerRadius" value="95.0*mm"/>
- <constant name="SiliconTrackerInnerBarrelLength" value="400.0*mm"/>
+ <constant name="SiliconTrackerInnerBarrelLength" value="500.0*mm"/>
<constant name="SiliconTrackerOuterRadius" value="Solenoid_rmax/2.0"/>
- <constant name="SiliconTrackerOuterBarrelLength" value="SolenoidLength/2.0"/>
+ <constant name="SiliconTrackerOuterBarrelLength" value="SolenoidLength/3.0"/>
+
+
<comment>
------------
@@ -328,7 +341,7 @@
<constant name="EcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * CalBarrelDivider"/>
<constant name="HcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * (1.0 - CalBarrelDivider)"/>
- <constant name="EcalBarrelLength" value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
+ <constant name="EcalBarrelLength" value="SiliconTrackerOuterBarrelLength+RICHLength+ForwardTOFLength+TRDLength"/>
<constant name="EcalEndcap_zmin" value="EcalBarrelLength/2.0"/>
<constant name="AvailTotalEndcapCalorimetryThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - (EcalEndcap_zmin + 10.0 * mm)"/>
@@ -421,10 +434,10 @@
Gaseous RICH Parameters
-----------------------
</comment>
- <constant name="RICHZMin" value="SolenoidYokeEndcap_zmin + 1 * cm"/>
+ <constant name="RICHZMin" value="SiliconTrackerOuterBarrelLength/2.0 + 1 * cm"/>
<constant name="RICHRMin" value="15 * cm"/>
<constant name="RICHRMax" value="60 * cm"/>
- <constant name="RICHDepth" value="1 * m"/>
+ <constant name="RICHDepth" value="1.0*m"/>
<comment>
--
GitLab