From 74590fe750d4651418a1e3b8568d8eefbc510996 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Tue, 17 Aug 2021 18:02:45 +0000
Subject: [PATCH] Resolve "HCal: color layers differently"
---
compact/display.xml | 16 +++++++++-------
compact/display_detailed.xml | 16 +++++++++-------
compact/hcal.xml | 9 +++++----
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/compact/display.xml b/compact/display.xml
index 16cac3b3..2f8df0d0 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -39,13 +39,15 @@
<comment>
HCal Vis
</comment>
- <vis name="HcalVis" ref="AnlViolet" showDaughters="false"/>
- <vis name="HcalBarrelVis" ref="AnlViolet" showDaughters="false" visible="true" />
- <vis name="HcalBarrelStaveVis" ref="AnlViolet" showDaughters="false" visible="true" />
- <vis name="HcalEndcapVis" ref="AnlProcess_Blue" showDaughters="false" visible="true" />
- <vis name="HcalSensorVis" ref="AnlProcess_Blue" showDaughters="false" visible="false" />
- <vis name="HcalAbsorberVis" ref="AnlProcess_Blue" showDaughters="false" visible="false" />
-
+ <vis name="HcalVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelStaveVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalBarrelLayerVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapLayerVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalSensorVis" ref="AnlBlue" showDaughters="false" visible="false"/>
+ <vis name="HcalAbsorberVis" ref="AnlViolet" showDaughters="false" visible="false"/>
+
<comment>
Solenoid
</comment>
diff --git a/compact/display_detailed.xml b/compact/display_detailed.xml
index e7935c1c..e138c40e 100644
--- a/compact/display_detailed.xml
+++ b/compact/display_detailed.xml
@@ -39,13 +39,15 @@
<comment>
HCal Vis
</comment>
- <vis name="HcalVis" ref="AnlViolet" showDaughters="false"/>
- <vis name="HcalBarrelVis" ref="AnlViolet" showDaughters="false" visible="true" />
- <vis name="HcalBarrelStaveVis" ref="AnlViolet" showDaughters="false" visible="true" />
- <vis name="HcalEndcapVis" ref="AnlProcess_Blue" showDaughters="false" visible="true" />
- <vis name="HcalSensorVis" ref="AnlProcess_Blue" showDaughters="false" visible="false" />
- <vis name="HcalAbsorberVis" ref="AnlProcess_Blue" showDaughters="false" visible="false" />
-
+ <vis name="HcalVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelStaveVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelLayerVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalEndcapLayerVis" ref="AnlViolet" showDaughters="false" visible="true"/>
+ <vis name="HcalSensorVis" ref="AnlBlue" showDaughters="false" visible="false"/>
+ <vis name="HcalAbsorberVis" ref="AnlViolet" showDaughters="false" visible="false"/>
+
<comment>
Solenoid
</comment>
diff --git a/compact/hcal.xml b/compact/hcal.xml
index 180a5b12..09344a5d 100644
--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -21,6 +21,7 @@
name="HcalBarrel"
type="athena_EcalBarrel"
readout="HcalBarrelHits"
+ vis="HcalBarrelVis"
calorimeterType="HAD_BARREL"
offset="HcalBarrel_offset"
gap="0.*cm"
@@ -29,8 +30,8 @@
numsides="CaloSides"
rmin="HcalBarrel_rmin"
z="HcalBarrelLength"/>
- <staves vis="HcalBarrelVis"/>
- <layer repeat="HcalBarrelLayer_NRepeat">
+ <staves vis="HcalBarrelStaveVis"/>
+ <layer repeat="HcalBarrelLayer_NRepeat" vis="HcalBarrelLayerVis">
<slice material="Steel235" thickness="HcalBarrelSteelThickness" vis="HcalAbsorberVis"/>
<slice material="Polystyrene" thickness="HcalBarrelPolystyreneThickness" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
@@ -50,7 +51,7 @@
zmin="HcalEndcapP_zmin"
rmin="HcalEndcapP_rmin"
rmax="HcalBarrel_rmax"/>
- <layer repeat="HcalEndcapPLayer_NRepeat" vis="HcalEndcapVis" >
+ <layer repeat="HcalEndcapPLayer_NRepeat" vis="HcalEndcapLayerVis" >
<slice material="Steel235" thickness="HcalEndcapPSteelThickness" vis="HcalAbsorberVis"/>
<slice material="Polystyrene" thickness="HcalEndcapPPolystyreneThickness" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
@@ -69,7 +70,7 @@
zmin="HcalEndcapN_zmin"
rmin="HcalEndcapN_rmin"
rmax="HcalBarrel_rmax"/>
- <layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapVis" >
+ <layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapLayerVis" >
<slice material="Steel235" thickness="HcalEndcapNSteelThickness" vis="HcalAbsorberVis"/>
<slice material="Polystyrene" thickness="HcalEndcapNPolystyreneThickness" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
--
GitLab