From 8fd8b9987618c0ebf91b17990801503c8d2168f9 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 17 Jul 2021 14:50:00 -0500
Subject: [PATCH] Went ahead and broke up the TOF assembly as well
---
athena.xml | 34 +++++-----------------------------
compact/definitions.xml | 1 +
2 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/athena.xml b/athena.xml
index 23e765f0..31aeebba 100644
--- a/athena.xml
+++ b/athena.xml
@@ -232,39 +232,15 @@
type="DD4hep_SubdetectorAssembly"
vis="TOFSubAssemblyVis">
<composite name="BarrelTOF"/>
+ </detector>
+ <detector id="TOFEndcapSubAssembly_ID"
+ name="TOFEndcapSubAssembly"
+ type="DD4hep_SubdetectorAssembly"
+ vis="TOFSubAssemblyVis">
<composite name="ForwardTOF"/>
<composite name="BackwardTOF"/>
</detector>
- <!--
- <detector id="TrackerBarrelSubAssembly_Inner_ID"
- name="TrackerBarrelSubAssembly_Inner"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerBarrel_Inner"/>
- </detector>
- <detector id="TrackerEndcapSubAssembly_Inner_ID"
- name="TrackerEndcapSubAssembly_Inner"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerEndcapN_Inner"/>
- <composite name="TrackerBarrel_Inner"/>
- <composite name="TrackerEndcapP_Inner"/>
- </detector>
- <detector id="TrackerBarrelSubAssembly_Outer_ID"
- name="TrackerBarrelSubAssembly_Outer"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerBarrel_Outer"/>
- </detector>
- <detector id="TrackerEndcapSubAssembly_Outer_ID"
- name="TrackerEndcapSubAssembly_Outer"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerEndcapP_Outer"/>
- <composite name="TrackerEndcapN_Outer"/>
- </detector>
- -->
</detectors>
<include ref="compact/vertex_tracker.xml"/>
diff --git a/compact/definitions.xml b/compact/definitions.xml
index eb58560d..dfd75523 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -163,6 +163,7 @@
<constant name="BarrelTRD_ID" value="91"/>
<constant name="BarrelTOF_ID" value="92"/>
<constant name="TOFSubAssembly_ID" value="93"/>
+ <constant name="TOFEndcapSubAssembly_ID" value="94"/>
<comment>
=====================================
--
GitLab