From 1da8c03d6719a647ea0057869d01abccfe0cbe05 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 7 Apr 2021 01:03:53 -0500
Subject: [PATCH] modified: compact/cb_CTD_Si.xml modified:
compact/definitions.xml deleted: compact/refdetector_defs.xml
---
compact/cb_CTD_Si.xml | 3 +++
compact/definitions.xml | 31 +++++++++++--------------------
compact/refdetector_defs.xml | 11 -----------
3 files changed, 14 insertions(+), 31 deletions(-)
delete mode 100644 compact/refdetector_defs.xml
diff --git a/compact/cb_CTD_Si.xml b/compact/cb_CTD_Si.xml
index 06b4f82..3deea23 100644
--- a/compact/cb_CTD_Si.xml
+++ b/compact/cb_CTD_Si.xml
@@ -3,6 +3,9 @@
<comment> Central Barrel Tracker Silicon </comment>
<define>
+ <comment> Si layer opiton </comment>
+ <constant name="cb_CTD_Si_gap" value="5.0 * cm"/>
+ <constant name="cb_CTD_Si_layer" value="15"/>
</define>
<limits>
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 77cde0a..bd3d79d 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -307,7 +307,7 @@
<constant name="ForwardTOFLength" value="10.0*cm"/>
<constant name="ForwardPIDLength" value="RICHLength + TRDLength + ForwardTOFLength"/>
- <constant name="BackwardCherenkovLength" value="50.0*cm"/>
+ <constant name="BackwardCherenkovLength" value="15.0*cm"/>
<constant name="BackwardTOFLength" value="10.0*cm"/>
<constant name="BackwardPIDLength" value="BackwardCherenkovLength + BackwardTOFLength"/>
@@ -346,22 +346,13 @@
-------------------------------
Central Barrel Tracker - Global
-------------------------------
+
+ The cb_CTD_* parameters can probably be moved to the detector specific xml file.
</comment>
- <constant name="cb_CTD_rmin" value="21.0 * cm"/>
- <constant name="cb_CTD_rmax" value="80.0 * cm"/>
- <constant name="cb_CTD_zmax" value="200.0 * cm"/>
- <comment> Original Global parameter </comment>
- <!--
- <constant name="cb_CTD_zmax" value="120.0 * cm"/>
- -->
- <constant name="cb_CTD_length" value="Solenoid_length - cb_CTD_zmax"/>
- <comment> After fix cb_Solenoid parameters </comment>
- <!--
- <constant name="cb_CTD_length" value="cb_Solenoid_z - cb_CTD_zmax"/>
- -->
- <comment> Si layer opiton </comment>
- <constant name="cb_CTD_Si_gap" value="5.0 * cm"/>
- <constant name="cb_CTD_Si_layer" value="15"/>
+ <constant name="cb_CTD_rmin" value="SiliconTrackerInnerRadius"/>
+ <constant name="cb_CTD_rmax" value="SiliconTrackerOuterRadius"/>
+ <constant name="cb_CTD_zmax" value="SiliconTrackerOuterBarrel_zmax"/>
+ <constant name="cb_CTD_length" value="SiliconTrackerOuterBarrelLength"/>
<comment>
------------
@@ -577,10 +568,10 @@
ce_MRICH Parameters
--------------------------
</comment>
- <constant name="ce_MRICHRMin" value="15*cm"/>
- <constant name="ce_MRICHRMax" value="100*cm"/>
- <constant name="ce_MRICHLength" value="15*cm"/>
- <constant name="ce_MRICHZMin" value="-EcalEndcapP_zmin+10.*cm"/>
+ <constant name="ce_MRICHRMin" value="15*cm"/>
+ <constant name="ce_MRICHRMax" value="100*cm"/>
+ <constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
+ <constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/>
<comment>
------------------
diff --git a/compact/refdetector_defs.xml b/compact/refdetector_defs.xml
deleted file mode 100644
index 067c46d..0000000
--- a/compact/refdetector_defs.xml
+++ /dev/null
@@ -1,11 +0,0 @@
- <!-- Define parameter -->
- <define>
- <constant name="world_side" value="50*m"/>
- <constant name="world_x" value="world_side"/>
- <constant name="world_y" value="world_side"/>
- <constant name="world_z" value="world_side"/>
-
- <constant name="tracker_region_zmax" value="6 * m"/>
- <constant name="tracker_region_rmax" value="6 * m"/>
-
- </define>
--
GitLab