From 2e853a98a3531248d067c803dacf5d288fed85bf Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 19 Aug 2021 08:22:58 +0000
Subject: [PATCH] Fix vis
---
.gitlab-ci.yml | 1 +
compact/central_tracker.xml | 38 +++++++--------
compact/ci_ecal.xml | 6 +--
compact/colors.xml | 1 -
compact/colors_geoviewer.xml | 22 +++++++++
compact/dirc.xml | 22 ++++-----
compact/display.xml | 54 +++++++++++----------
compact/display_geoviewer.xml | 88 +++++++++++++++-------------------
compact/gem_tracker_endcap.xml | 16 +++----
compact/pid_config_acadia.xml | 1 +
compact/vertex_tracker.xml | 18 +++----
11 files changed, 141 insertions(+), 126 deletions(-)
create mode 100644 compact/colors_geoviewer.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be82eb58..e0a293a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,7 @@ dump_geometry:
## subsystem views
- |
mv ${DETECTOR_PATH}/compact/display_geoviewer.xml ${DETECTOR_PATH}/compact/display.xml
+ mv ${DETECTOR_PATH}/compact/colors_geoviewer.xml ${DETECTOR_PATH}/compact/colors.xml
for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
geo_name=`basename $xml .xml`_geo.root
cp $xml ${DETECTOR_PATH}/geo.xml
diff --git a/compact/central_tracker.xml b/compact/central_tracker.xml
index 735fb4da..77203e2c 100644
--- a/compact/central_tracker.xml
+++ b/compact/central_tracker.xml
@@ -200,7 +200,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
name="TrackerEndcapP_Inner"
type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="false">
<support material="CarbonFiber" name="sup_cylinder" vis="TrackerSupportVis">
<shape type="Cone"
@@ -215,12 +215,12 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapInner_rmin1"
rmax="TrackerEndcapInner_rmax1"
length="TrackerEndcapInnerLayer_thickness"
zstart="TrackerEndcapInner_zmin" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapInner_rmin1+TrackerEndcapInnerMod1_y/2.0"
zstart="0.0"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module1" />
@@ -232,7 +232,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
name="TrackerEndcapN_Inner"
type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="true">
<support material="CarbonFiber" name="sup_cylinder" vis="TrackerSupportVis">
<shape type="Cone"
@@ -247,12 +247,12 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapInner_rmin1"
rmax="TrackerEndcapInner_rmax1"
length="TrackerEndcapInnerLayer_thickness"
zstart="TrackerEndcapInner_zmin" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapInner_rmin1+TrackerEndcapInnerMod1_y/2.0"
zstart="0"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module1" />
@@ -355,34 +355,34 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin1"
rmax="TrackerEndcapOuter_rmax1"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin1" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin1+TrackerEndcapOuterMod1_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module1" />
</layer>
<layer id="2">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin2"
rmax="TrackerEndcapOuter_rmax2"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin2" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin2+TrackerEndcapOuterMod2_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module2" />
</layer>
<layer id="3">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin3"
rmax="TrackerEndcapOuter_rmax3"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin3" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin3+TrackerEndcapOuterMod3_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module3" />
@@ -394,7 +394,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
name="TrackerEndcapN_Outer"
type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="true">
<support material="CarbonFiber" name="sup_cylinder" vis="TrackerSupportVis"
rmin="TrackerEndcapOuter_rmax3+1.0*mm"
@@ -422,34 +422,34 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin1"
rmax="TrackerEndcapOuter_rmax1"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin1" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin1+TrackerEndcapOuterMod1_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module1" />
</layer>
<layer id="2">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin2"
rmax="TrackerEndcapOuter_rmax2"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin2" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin2+TrackerEndcapOuterMod2_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module2" />
</layer>
<layer id="3">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="TrackerEndcapOuter_rmin3"
rmax="TrackerEndcapOuter_rmax3"
length="TrackerEndcapOuterLayer_thickness"
zstart="TrackerEndcapOuter_zmin3" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="TrackerEndcapOuter_rmin3+TrackerEndcapOuterMod3_y/2.0"
zstart="0.0*mm"
nmodules="TrackerEndcap_NModules" dz="TrackerEndcapModule_dz" module="Module3" />
diff --git a/compact/ci_ecal.xml b/compact/ci_ecal.xml
index 15d1289a..69808f8e 100644
--- a/compact/ci_ecal.xml
+++ b/compact/ci_ecal.xml
@@ -33,13 +33,13 @@
zmin="EcalEndcapP_zmin"
rmin="EcalEndcapP_rmin"
rmax="EcalEndcapP_rmax " />
- <layer repeat="EcalEndcapPLayer1_NRepeat">
+ <layer repeat="EcalEndcapPLayer1_NRepeat" vis="EcalEndcapLayerVis">
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
- <layer repeat="EcalEndcapPLayer2_NRepeat">
+ <layer repeat="EcalEndcapPLayer2_NRepeat" vis="EcalEndcapLayerVis">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
@@ -47,7 +47,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
- <layer repeat="EcalEndcapPLayer3_NRepeat">
+ <layer repeat="EcalEndcapPLayer3_NRepeat" vis="EcalEndcapLayerVis">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
diff --git a/compact/colors.xml b/compact/colors.xml
index af79a3e2..84c92098 100644
--- a/compact/colors.xml
+++ b/compact/colors.xml
@@ -18,5 +18,4 @@
<vis name="AnlDelta_Green" alpha="1" r="0" g="120/256" b="54/256"/>
<vis name="AnlDelta_Blue" alpha="1" r="11/256" g="31/256" b="143/256"/>
-
</display>
diff --git a/compact/colors_geoviewer.xml b/compact/colors_geoviewer.xml
new file mode 100644
index 00000000..9635627b
--- /dev/null
+++ b/compact/colors_geoviewer.xml
@@ -0,0 +1,22 @@
+<display>
+
+ <comment>
+ Similar color to regular scheme but with values that can be displayed by geoviewer
+ </comment>
+ <vis name="AnlGreen" alpha="1" r="100/256" g="200/256" b="0/256"/>
+ <vis name="AnlViolet" alpha="1" r="100/256" g="0/256" b="150/256"/>
+ <vis name="AnlProcess_Blue" alpha="1" r="0/256" g="100/256" b="202/256"/>
+ <vis name="AnlOrange" alpha="1" r="255/256" g="121/256" b="0"/>
+ <vis name="AnlRed" alpha="1" r="205/256" g="45/256 " b="45/256"/>
+ <vis name="AnlGold" alpha="1" r="248/256" g="188/256" b="0/256"/>
+ <vis name="AnlBlue" alpha="1" r="0/256" g="96/256" b="156/256"/>
+ <vis name="AnlTeal" alpha="1" r="0/256" g="161/256" b="156/256"/>
+ <vis name="AnlGray" alpha="1" r="102/256" g="102/256" b="102/256"/>
+ <vis name="AnlLight_Gray" alpha="1" r="209/256" g="209/256" b="209/256"/>
+ <!-- off-white (or white) don't work! -->
+ <!--vis name="AnlOff_White" alpha="1" r="242/256" g="242/256" b="242/256"/-->
+ <vis name="AnlDelta_Red" alpha="1" r="161/256" g="45/256" b="45/256"/>
+ <vis name="AnlDelta_Green" alpha="1" r="0" g="110/256" b="50/256"/>
+ <vis name="AnlDelta_Blue" alpha="1" r="45/256" g="45/256" b="110/256"/>
+
+</display>
diff --git a/compact/dirc.xml b/compact/dirc.xml
index 3515080d..baa108b1 100644
--- a/compact/dirc.xml
+++ b/compact/dirc.xml
@@ -38,7 +38,7 @@
<!-- DIRC length -->
<constant name="DIRCMain_length" value="DIRC_length"/>
- <constant name="DIRCFake_offset" value="DIRC_offset-20*cm"/>
+ <constant name="DIRCFake_offset" value="DIRC_offset+15*cm"/>
<!-- Box - main DIRC modules -->
<constant name="DIRCBox_count" value="16" comment="Number of DIRC boxes per... DIRC. 16 - default"/>
@@ -107,16 +107,16 @@
</regions>
<display>
- <vis name="DIRCTube" alpha="0.1" r="0" g="0.6" b="0.6" visible="true" showDaughters="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCBox" alpha="0.1" r="256/256" g="256/256" b="256/256" visible="true" showDaughters="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCLens1" alpha="1" r="3/256" g="37/256" b="76/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCLens2" alpha="1" r="17/256" g="103/256" b="177/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCLens3" alpha="1" r="0/256" g="128/256" b="128/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCBar" alpha="1" r="0/256" g="128/256" b="128/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCGlue" alpha="1" r="125/256" g="0/256" b="128/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCMirror" alpha="1" r="0" g="0" b="1" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCPrism" alpha="1" r="212/256" g="175/256" b="55/256" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
- <vis name="DIRCFd" alpha="1" r="0.7" g="0" b="0" visible="true" showDaughters="false" />
+ <vis name="DIRCTube" ref="AnlTeal" alpha="0.1" visible="true" showDaughters="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCBox" ref="AnlLight_Gray" alpha="0.1" visible="true" showDaughters="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCLens1" ref="AnlProcess_Blue" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCLens2" ref="AnlProcess_Blue" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCLens3" ref="AnlTeal" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCBar" ref="AnlTeal" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCGlue" ref="AnlViolet" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCMirror" ref="AnlGray" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCPrism" ref="AnlTeal" visible="true" showDaughters="false" lineStyle="solid" drawingStyle="solid" />
+ <vis name="DIRCFd" ref="AnlRed" visible="true" showDaughters="false" />
</display>
<detectors>
diff --git a/compact/display.xml b/compact/display.xml
index d9a43a12..18927484 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -12,11 +12,11 @@
</comment>
<vis name="TrackerVis" ref="AnlRed" />
<vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
- <vis name="TrackerLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
<vis name="VertexSupportVis" ref="AnlBlue" showDaughters="false" />
- <vis name="VertexLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="VertexModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
<vis name="TOFVis" ref="AnlGreen" showDaughters="true" />
@@ -25,28 +25,30 @@
ECal Vis
</comment>
<vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="true"/>
- <vis name="EcalEndcapVis" ref="AnlGold" showDaughters="false" visible="true"/>
<vis name="EcalBarrelVis" ref="AnlGold" showDaughters="false" visible="true"/>
- <vis name="EcalBarrelStaveVis" ref="AnlViolet" showDaughters="false" visible="true" />
- <vis name="EcalBarrelEnvelopeVis" ref="AnlViolet" showDaughters="false" visible="true" />
+ <vis name="EcalBarrelStaveVis" ref="AnlOrange" showDaughters="false" visible="true" />
+ <vis name="EcalBarrelEnvelopeVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalBarrelSupportVis" ref="AnlOrange" showDaughters="false" visible="true"/>
- <vis name="EcalBarrelLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
- <vis name="EcalBarrelSliceVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="EcalBarrelLayerVis" ref="AnlGold" showDaughters="true" visible="true"/>
+ <vis name="EcalBarrelSliceVis" ref="AnlGray" showDaughters="false" visible="true"/>
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
- <vis name="EcalEndcapNModuleVis" ref="AnlTeal" showDaughters="false" visible="true"/>
+ <vis name="EcalEndcapVis" ref="AnlGold" showDaughters="false" visible="true"/>
+ <vis name="EcalEndcapLayerVis" ref="AnlGold" showDaughters="false" visible="true"/>
+
+ <vis name="EcalEndcapNModuleVis" ref="AnlGold" showDaughters="false" visible="true"/>
<comment>
HCal Vis
</comment>
- <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"/>
+ <vis name="HcalVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelStaveVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalBarrelLayerVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapLayerVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalSensorVis" ref="AnlBlue" showDaughters="false" visible="false"/>
+ <vis name="HcalAbsorberVis" ref="AnlGray" showDaughters="false" visible="false"/>
<comment>
Solenoid
@@ -59,12 +61,12 @@
<comment>
PID Detectors
</comment>
- <vis name="RICHVis" ref="AnlViolet" showDaughters="true"/>
+ <vis name="RICHVis" ref="AnlTeal" showDaughters="true"/>
<vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="false"/>
<vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="true" visible="false"/>
- <vis name="DIRCModuleVis" ref="AnlBlue" showDaughters="true" visible="false"/>
- <vis name="DIRCSupportVis" ref="VertexSupportVis" showDaughters="true" visible="true"/>
+ <vis name="DIRCModuleVis" ref="AnlTeal" showDaughters="true" visible="false"/>
+ <vis name="DIRCSupportVis" ref="AnlGray" showDaughters="true" visible="true"/>
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>
@@ -87,16 +89,16 @@
<vis name="ci_GEMVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/>
<vis name="ci_HCALVis" r= "0.6" g="0" b="0.6" alpha="1.0" showDaughters="true" visible="true"/>
- <vis name="DRICH_vessel_vis" alpha="1.0" r="1.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
- <vis name="DRICH_gas_vis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true" />
- <vis name="DRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
+ <vis name="DRICH_vessel_vis" ref="AnlGray" showDaughters="true" visible="true" />
+ <vis name="DRICH_gas_vis" ref="AnlGreen" alpha="0.5" showDaughters="true" visible="true" />
+ <vis name="DRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
<vis name="DRICH_filter_vis" alpha="1.0" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
- <vis name="DRICH_mirror_vis" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
- <vis name="DRICH_sensor_vis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
+ <vis name="DRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
+ <vis name="DRICH_sensor_vis" ref="AnlGreen" showDaughters="true" visible="true" />
- <vis name="MRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
+ <vis name="MRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
- <vis name="MRICH_lens_vis" ref="AnlViolet" showDaughters="true" visible="true" />
+ <vis name="MRICH_lens_vis" ref="AnlGray" showDaughters="true" visible="true" />
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
</display>
diff --git a/compact/display_geoviewer.xml b/compact/display_geoviewer.xml
index 9b649161..38f123dd 100644
--- a/compact/display_geoviewer.xml
+++ b/compact/display_geoviewer.xml
@@ -12,42 +12,43 @@
</comment>
<vis name="TrackerVis" ref="AnlRed" />
<vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
- <vis name="TrackerLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="TrackerSubassemblyVis" ref="TrackerLayerVis"/>
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" />
<vis name="VertexSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
- <vis name="VertexLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="VertexModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" />
- <vis name="TOFVis" ref="AnlGreen" showDaughters="true" visible="true"/>
+ <vis name="TOFVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<comment>
ECal Vis
</comment>
- <vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="true"/>
- <vis name="EcalEndcapVis" ref="AnlGold" showDaughters="true" visible="true"/>
- <vis name="EcalBarrelVis" ref="AnlGold" showDaughters="true" visible="true"/>
- <vis name="EcalBarrelStaveVis" ref="AnlViolet" showDaughters="true" visible="true" />
- <vis name="EcalBarrelEnvelopeVis" ref="AnlViolet" showDaughters="true" visible="true" />
- <vis name="EcalBarrelSupportVis" ref="AnlOrange" showDaughters="true" visible="true"/>
- <vis name="EcalBarrelLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
- <vis name="EcalBarrelSliceVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="EcalBarrelLayerVis" ref="AnlGold"/>
+ <vis name="EcalBarrelEnvelopeVis" ref="AnlGold" showDaughters="true" visible="false" />
+ <vis name="EcalBarrelStaveVis" ref="AnlOrange" showDaughters="true" visible="false" />
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
+ <vis name="EcalBarrelSliceVis" ref="AnlGray"/>
+ <vis name="EcalBarrelSupportVis" ref="AnlOrange"/>
+
+ <vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="false"/>
+ <vis name="EcalEndcapVis" ref="AnlGold" showDaughters="true" visible="true"/>
+ <vis name="EcalEndcapLayerVis" ref="AnlGold" showDaughters="false" visible="true"/>
- <vis name="EcalEndcapNModuleVis" ref="AnlTeal" showDaughters="false" visible="true"/>
+ <vis name="EcalEndcapNModuleVis" ref="AnlGold" showDaughters="false" visible="true"/>
<comment>
HCal Vis
</comment>
- <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="true" visible="true"/>
- <vis name="HcalEndcapVis" ref="AnlViolet" showDaughters="false" visible="true"/>
- <vis name="HcalEndcapLayerVis" ref="AnlViolet" showDaughters="true" visible="true"/>
- <vis name="HcalSensorVis" ref="AnlRed" showDaughters="true" visible="true"/>
- <vis name="HcalAbsorberVis" ref="AnlViolet" showDaughters="true" visible="true"/>
+ <vis name="HcalVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalBarrelStaveVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalBarrelLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalEndcapVis" ref="AnlBlue" showDaughters="false" visible="true"/>
+ <vis name="HcalEndcapLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalSensorVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="HcalAbsorberVis" ref="AnlGray" showDaughters="true" visible="true"/>
<comment>
Solenoid
@@ -60,12 +61,12 @@
<comment>
PID Detectors
</comment>
- <vis name="RICHVis" ref="AnlViolet" showDaughters="true"/>
+ <vis name="RICHVis" ref="AnlTeal" showDaughters="true"/>
<vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="false" visible="true"/>
- <vis name="DIRCModuleVis" ref="AnlBlue" showDaughters="true" visible="true"/>
- <vis name="DIRCSupportVis" ref="VertexSupportVis" showDaughters="true" visible="true"/>
+ <vis name="DIRCModuleVis" ref="AnlTeal" showDaughters="true" visible="true"/>
+ <vis name="DIRCSupportVis" ref="AnlGray" showDaughters="true" visible="true"/>
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>
@@ -74,43 +75,32 @@
</comment>
<vis name="BeamPipeVis" ref="AnlLight_Gray" showDaughters="true" visible="true"/>
- <vis name="cb_SolenoidVis" alpha="0.4" r= "0.1" g="0.0" b="0.1" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_ECAL_Vis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_ECAL_module_Vis" alpha="1.0" r= "0.1" g="1.0" b="0.9" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_HCAL_Vis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="cb_CTDVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="cb_CTD_Si_layerVis" alpha="1.0" r= "0.9" g="1.0" b="0.1" showDaughters="true" visible="true"/>
- <vis name="ce_GEMVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="cb_GEM_layerVis" alpha="0.8" r= "0.8" g="0.4" b="0.3" showDaughters="true" visible="true"/>
- <vis name="cb_VTX_BarrelVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="cb_VTX_Barrel_layerVis" alpha="2.0" r= "0.0" g="0.2" b="0.8" showDaughters="true" visible="true"/>
-
- <vis name="ci_GEMVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/>
- <vis name="ci_HCALVis" r= "0.6" g="0" b="0.6" alpha="1.0" showDaughters="true" visible="true"/>
-
- <vis name="DRICH_vessel_vis" alpha="1.0" ref="AnlGray" showDaughters="true" visible="true" />
- <vis name="DRICH_gas_vis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true" />
- <vis name="DRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
+
+ <vis name="DRICH_vessel_vis" ref="AnlGray" showDaughters="true" visible="true" />
+ <vis name="DRICH_gas_vis" ref="AnlGreen" alpha="0.5" showDaughters="true" visible="true" />
+ <vis name="DRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
<vis name="DRICH_filter_vis" alpha="1.0" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
- <vis name="DRICH_mirror_vis" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
- <vis name="DRICH_sensor_vis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
+ <vis name="DRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
+ <vis name="DRICH_sensor_vis" ref="AnlGreen" showDaughters="true" visible="true" />
- <vis name="MRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
+ <vis name="MRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
- <vis name="MRICH_lens_vis" ref="AnlViolet" showDaughters="true" visible="true" />
+ <vis name="MRICH_lens_vis" ref="AnlGray" showDaughters="true" visible="true" />
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
<comment>
- Deprecated colors used for IP6 vis
+ Deprecated values used for IP6 vis
</comment>
- <vis name="GreenVis" alpha="1.0" r= "0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
- <vis name="RedVis" alpha="0.2" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
- <vis name="RPVis" alpha="0.99" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
- <vis name="RPLayerVis" alpha="0.99" r= "0.0" g="0.7" b="0.3" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="BlueVis" alpha="1.0" r= "0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="OrangeVis" alpha="1.0" r= "1.0" g="0.45" b="0.0" showDaughters="true" visible="true"/>
- <vis name="RedGreenVis" alpha="0.5" r= "1.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+ <vis name="GreenVis" ref="AnlGreen" showDaughters="true" visible="true"/>
+ <vis name="RedVis" ref="AnlRed" showDaughters="true" visible="true"/>
+ <vis name="RPVis" ref="AnlDelta_Red" showDaughters="true" visible="true"/>
+ <vis name="RPLayerVis" ref="AnlTeal" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="BlueVis" ref="AnlBlue" showDaughters="true" visible="true"/>
+ <vis name="OrangeVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="BlueGreenVis" alpha="0.5" r= "0.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="PurpleVis" alpha="1.0" r= "1.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="DoubleRedG" alpha="0.5" r= "2.0" g=".10" b="0.0" showDaughters="true" visible="true"/>
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index 81a9a927..7aa77862 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -91,7 +91,7 @@
name="GEMTrackerEndcapP"
type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="false">
<module name="GEMModule1" vis="TrackerLayerVis">
<trd x1="GEMTrackerEndcapP_x1/2.0" x2="GEMTrackerEndcapP_x2/2.0" z="GEMTrackerEndcapP_y/2"/>
@@ -133,12 +133,12 @@
<module_component thickness="1.0*mm" material="Mylar" vis="TrackerSupportVis"/>
</module>
<layer id="1" >
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin = "GEMTrackerEndcapP_rmin"
rmax = "GEMTrackerEndcapP_rmax"
length="GEMTrackerEndcapP_thickness"
zstart="GEMTrackerEndcapP_zmin" />
- <ring vis="AnlRed" module="GEMModule1"
+ <ring vis="TrackerVis" module="GEMModule1"
r="GEMTrackerEndcapP_rmin+GEMTrackerEndcapP_y/2.0"
zstart="0"
nmodules="12" dz="GEMTrackerEndcap_dz" />
@@ -154,7 +154,7 @@
name="GEMTrackerEndcapN"
type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="true">
<module name="GEMModule1" vis="TrackerLayerVis">
<trd x1="GEMTrackerEndcapN_x1/2.0" x2="GEMTrackerEndcapN_x2/2.0" z="GEMTrackerEndcapN_y/2"/>
@@ -172,7 +172,7 @@
</frame>
</comment>
<comment> Going from HV side to readout side</comment>
- <module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
+ <module_component thickness="25.0*um" material="Mylar" name="entrance_window" vis="TrackerLayerVis"/>
<module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
<module_component thickness="50.0*um" material="Kapton" name="cathode_foil"/>
<module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
@@ -189,19 +189,19 @@
<module_component thickness="50.0*um" material="Kapton" name="readout_foil"/>
<module_component thickness=" 5.0*um" material="Copper" name="readout_cu"/>
<module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
- <module_component thickness="25.0*um" material="Mylar" name="exit_window"/>
+ <module_component thickness="25.0*um" material="Mylar" name="exit_window" vis="TrackerLayerVis"/>
</module>
<module name="GEMSupportSpokes" vis="TrackerSupportVis">
<trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapN_y/2"/>
<module_component thickness="1.0*mm" material="Mylar" vis="TrackerSupportVis"/>
</module>
<layer id="1" >
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin = "GEMTrackerEndcapN_rmin"
rmax = "GEMTrackerEndcapN_rmax"
length="GEMTrackerEndcapN_thickness"
zstart="GEMTrackerEndcapN_zmin" />
- <ring vis="AnlRed" module="GEMModule1"
+ <ring vis="TrackerVis" module="GEMModule1"
r="GEMTrackerEndcapN_rmin+GEMTrackerEndcapN_y/2.0"
zstart="0.1"
nmodules="12" dz="GEMTrackerEndcap_dz" />
diff --git a/compact/pid_config_acadia.xml b/compact/pid_config_acadia.xml
index 9c9e5072..48a099cd 100644
--- a/compact/pid_config_acadia.xml
+++ b/compact/pid_config_acadia.xml
@@ -1,6 +1,7 @@
<lccdd>
<include ref="fake_dirc.xml"/>
+<!--include ref="dirc.xml"/-->
<include ref="mrich.xml"/>
<include ref="drich.xml"/>
diff --git a/compact/vertex_tracker.xml b/compact/vertex_tracker.xml
index 81aee020..61458b4d 100644
--- a/compact/vertex_tracker.xml
+++ b/compact/vertex_tracker.xml
@@ -117,7 +117,7 @@ Simple carbon fiber support shell.
width="VertexBarrelShellStave_width"
length="VertexBarrelShell_length"
thickness="VertexBarrelShell_thickness"
- vis="VertexLayerVis" />
+ vis="VertexSupportVis" />
</module>
<comment> Layers composed of many arrayed modules </comment>
<layer module="Module1" id="1" vis="VertexLayerVis">
@@ -161,7 +161,7 @@ Simple carbon fiber support shell.
name="VertexEndcapP"
type="athena_TrapEndcapTracker"
readout="VertexEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="false">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="VertexEndcapMod1_x1/2.0" x2="VertexEndcapMod1_x2/2.0" z="VertexEndcapMod1_y/2"/>
@@ -170,12 +170,12 @@ Simple carbon fiber support shell.
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="VertexTrackerEndcapP_rmin"
rmax="VertexTrackerEndcapP_rmax"
length="VertexEndcapLayer_thickness"
zstart="VertexTrackerEndcapP_zmin + VertexEndcapLayer_dz/2.0" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="VertexTrackerEndcapP_rmin+VertexEndcapMod1_y/2.0"
zstart="0.0"
nmodules="12" dz="2.5 * mm" module="Module1" />
@@ -188,7 +188,7 @@ Simple carbon fiber support shell.
name="VertexEndcapN"
type="athena_TrapEndcapTracker"
readout="VertexEndcapHits"
- vis="AnlRed"
+ vis="TrackerVis"
reflect="true">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="VertexEndcapMod1_x1/2.0" x2="VertexEndcapMod1_x2/2.0" z="VertexEndcapMod1_y/2"/>
@@ -197,12 +197,12 @@ Simple carbon fiber support shell.
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module>
<layer id="1">
- <envelope vis="AnlRed"
+ <envelope vis="TrackerVis"
rmin="VertexTrackerEndcapN_rmin"
rmax="VertexTrackerEndcapN_rmax"
length="VertexEndcapLayer_thickness"
zstart="VertexTrackerEndcapN_zmin + VertexEndcapLayer_dz/2.0" />
- <ring vis="AnlRed"
+ <ring vis="TrackerVis"
r="VertexTrackerEndcapN_rmin+VertexEndcapMod1_y/2.0"
zstart="0.0"
nmodules="12" dz="2.5 * mm" module="Module1" />
@@ -216,7 +216,7 @@ Simple carbon fiber support shell.
type="athena_SimpleDiskTracker"
readout="VertexEndcapHits"
insideTrackingVolume="true"
- reflect="false" vis="AnlRed">
+ reflect="false" vis="TrackerVis">
<position x="0" y="0" z="0.0*mm"/>
<layer id="1" vis="AnlOrange"
inner_z="VertexTrackerEndcapP_zmin + 0.5*VertexTrackerEndcap_delta"
@@ -241,7 +241,7 @@ Simple carbon fiber support shell.
type="athena_SimpleDiskTracker"
readout="VertexEndcapHits"
insideTrackingVolume="true"
- reflect="true" vis="AnlRed">
+ reflect="true" vis="TrackerVis">
<position x="0" y="0" z="-0.0*mm-1.0e-9*mm"/>
<layer id="1" vis="AnlOrange"
inner_z="VertexTrackerEndcapN_zmin + 0.5*VertexTrackerEndcap_delta"
--
GitLab