diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6442362ddf8fafea764c0c3c29f482af7d43770f..a475980f598751cdc022f9ca09f0a49938aa41d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,7 +123,6 @@ dump_geometry:
- |
sed -i -e '/<detectors>/,/<\/detectors>/d' ${DETECTOR_PATH}/compact/tracking_config*.xml
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/colors.xml b/compact/colors.xml
index 84c92098748960c1044254f0af60f6aa71ecd2b1..867f3db94d07fd6f07dd3e22b9a6452d3054c563 100644
--- a/compact/colors.xml
+++ b/compact/colors.xml
@@ -1,21 +1,26 @@
<display>
- <comment>
- A coherent color scheme. Pick from these colors and (in theory) it should look pretty good.
+ <comment>
+ Colors tweaked to be displayable by geoViewer
</comment>
- <vis name="AnlGreen" alpha="1" r="119/255" g="179/255" b="0"/>
- <vis name="AnlViolet" alpha="1" r="91/256" g="0" b="145/256"/>
- <vis name="AnlProcess_Blue" alpha="1" r="0/256" g="130/256" b="202/256"/>
+ <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="32/256 " b="44/256"/>
- <vis name="AnlGold" alpha="1" r="248/256" g="178/256" b="0/256"/>
+ <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"/>
- <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="43/256" b="47/256"/>
- <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"/>
+ <vis name="AnlLightGray" ref="AnlLight_Gray" />
+ <!-- off-white (or white) don't work! -->
+ <!--vis name="AnlOff_White" alpha="1" r="242/256" g="242/256" b="242/256"/-->
+ <vis name="AnlDarkRed" alpha="1" r="161/256" g="45/256" b="45/256"/>
+ <vis name="AnlDarkGreen" alpha="1" r="0" g="110/256" b="50/256"/>
+ <vis name="AnlDarkBlue" alpha="1" r="45/256" g="45/256" b="110/256"/>
+ <vis name="AnlDelta_Red" ref="AnlDarkRed"/>
+ <vis name="AnlDelta_Green" ref="AnlDarkGreen"/>
+ <vis name="AnlDelta_Blue" ref="AnlDarkBlue"/>
</display>
diff --git a/compact/colors2.xml b/compact/colors2.xml
deleted file mode 100644
index 93dbcf6a73d3d277804ca50880032b8853eae79c..0000000000000000000000000000000000000000
--- a/compact/colors2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<display>
-
- <comment>
- This is where another color scheme can be developed.
- Note this is currently just a copy of colors.xml
- </comment>
- <vis name="AnlGreen" alpha="1" r="119/255" g="179/255" b="0"/>
- <vis name="AnlViolet" alpha="1" r="91/256" g="0" b="145/256"/>
- <vis name="AnlProcess_Blue" alpha="1" r="0/256" g="130/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="32/256 " b="44/256"/>
- <vis name="AnlGold" alpha="1" r="248/256" g="178/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"/>
- <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="43/256" b="47/256"/>
- <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
deleted file mode 100644
index 9635627bcd1c8a5e1e47c5f9d466d3ba534c8c60..0000000000000000000000000000000000000000
--- a/compact/colors_geoviewer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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/display.xml b/compact/display.xml
index f242ac80dbcc05762dae6d35fecf93d9bc13359f..cb021b22a60df4930cba2eb8aefa4bf7d52d7219 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -27,6 +27,16 @@
<vis name="TOFVis" ref="AnlGreen" showDaughters="true" />
+ <vis name="FFTrackerVis" ref="AnlRed" />
+ <vis name="FFTrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="false" />
+ <vis name="FFTrackerShieldingVis" ref="AnlGray" visible="true" showDaughters="false" />
+ <vis name="FFTrackerServiceVis" ref="AnlGold" visible="true" showDaughters="false" />
+ <vis name="FFTrackerLayerVis" ref="TrackerVis" visible="true" showDaughters="true" />
+ <vis name="FFTrackerModuleVis" ref="FFTrackerLayerVis" visible="true" showDaughters="true" />
+ <vis name="FFTrackerSurfaceVis" ref="FFTrackerLayerVis" visible="true" showDaughters="true" />
+ <comment> For shielded modules by default just display to module instead of 6 layers </comment>
+ <vis name="FFTrackerShieldedModuleVis" ref="FFTrackerModuleVis" visible="true" showDaughters="false" />
+
<comment>
ECal Vis
</comment>
@@ -45,6 +55,12 @@
<vis name="EcalEndcapNModuleVis" ref="AnlGold" showDaughters="false" visible="true"/>
+ <vis name="FFPreVis" ref="AnlGold" showDaughters="true" visible="true"/>
+ <vis name="FFPreLayerVis" ref="FFPreVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreModuleVis" ref="FFPreLayerVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreRadiatorVis" ref="FFPreModuleVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreReadoutVis" ref="FFTrackerSurfaceVis" showDaughters="true" visible="true"/>
+
<comment>
HCal Vis
</comment>
@@ -65,7 +81,7 @@
<comment>
Solenoid
</comment>
- <vis name="SolenoidCoilVis" ref="AnlLight_Gray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="SolenoidCoilVis" ref="AnlLightGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
<vis name="SolenoidYokeVis" ref="AnlLight_Gray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
@@ -83,9 +99,11 @@
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<comment>
- Beam line
+ Beam line with magnets
</comment>
- <vis name="BeamPipeVis" ref="AnlLight_Gray" showDaughters="true" visible="true"/>
+ <vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
+ <vis name="FFMagnetVis" ref="AnlGreen" showDaughters="true" visible="true"/>
+ <vis name="FFMagnetCoilVis" ref="AnlRed" 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"/>
diff --git a/compact/display_geoviewer.xml b/compact/display_geoviewer.xml
index fb5f0c80c2f603110063abd09201483756495d19..4dc26ceb3701342bbd2c37edf213cfc4b75d2fe0 100644
--- a/compact/display_geoviewer.xml
+++ b/compact/display_geoviewer.xml
@@ -27,6 +27,16 @@
<vis name="TOFVis" ref="AnlTeal" showDaughters="true" visible="true"/>
+ <vis name="FFTrackerVis" ref="AnlRed" />
+ <vis name="FFTrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="false" />
+ <vis name="FFTrackerShieldingVis" ref="AnlGray" visible="true" showDaughters="false" />
+ <vis name="FFTrackerServiceVis" ref="AnlGold" visible="true" showDaughters="false" />
+ <vis name="FFTrackerLayerVis" ref="TrackerVis" visible="true" showDaughters="true" />
+ <vis name="FFTrackerModuleVis" ref="FFTrackerLayerVis" visible="true" showDaughters="true" />
+ <vis name="FFTrackerSurfaceVis" ref="FFTrackerLayerVis" visible="true" showDaughters="true" />
+ <comment> For shielded modules by default just display to module instead of 6 layers </comment>
+ <vis name="FFTrackerShieldedModuleVis" ref="FFTrackerModuleVis" visible="true" showDaughters="false" />
+
<comment>
ECal Vis
</comment>
@@ -44,6 +54,12 @@
<vis name="EcalEndcapNModuleVis" ref="AnlGold" showDaughters="false" visible="true"/>
+ <vis name="FFPreVis" ref="AnlGold" showDaughters="true" visible="true"/>
+ <vis name="FFPreLayerVis" ref="FFPreVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreModuleVis" ref="FFPreLayerVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreRadiatorVis" ref="FFPreModuleVis" showDaughters="true" visible="true"/>
+ <vis name="FFPreReadoutVis" ref="FFTrackerSurfaceVis" showDaughters="true" visible="true"/>
+
<comment>
HCal Vis
</comment>
@@ -82,9 +98,11 @@
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<comment>
- Beam line
+ Beam line with magnets
</comment>
- <vis name="BeamPipeVis" ref="AnlLight_Gray" showDaughters="true" visible="true"/>
+ <vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
+ <vis name="FFMagnetVis" ref="AnlGreen" showDaughters="true" visible="true"/>
+ <vis name="FFMagnetCoilVis" ref="AnlRed" 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"/>