diff --git a/athena.xml b/athena.xml
index eca689808e273f2a2bc42251c6a9affb50f46f8f..4206484882c816df0a5cbcc2f93c4a5a42e66da8 100644
--- a/athena.xml
+++ b/athena.xml
@@ -57,7 +57,10 @@
</limits>
<display>
+ <include ref="compact/colors.xml" />
+ <!--include ref="compact/colors2.xml"/-->
<include ref="compact/display.xml" />
+ <!--include ref="compact/display_detailed.xml"/-->
</display>
<documentation level="0">
@@ -88,17 +91,16 @@
<include ref="ip6/beampipe_hadron_B0.xml" />
<include ref="ip6/beampipe.xml" />
- <comment>
- Main magnet
- -----------
+ <documentation level="5">
+ ## Main magnet
+
Note: When changing magnet, also select dimensions in definitions.xml.
- </comment>
+ </documentation>
<include ref="compact/solenoid.xml"/>
- <comment>
- Tracker subassemblies for ACTS
- ------------------------------
- </comment>
+ <documentation level="5">
+ ### Tracker subassemblies for ACTS
+ </documentation>
<detectors>
<detector id="VertexBarrelSubAssembly_ID"
name="VertexBarrelSubAssembly"
@@ -148,49 +150,32 @@
</detectors>
- <comment>
- Central tracking detectors
- --------------------------
- </comment>
- <include ref="compact/vertex_tracker.xml"/>
- <include ref="compact/central_tracker.xml"/>
+ <documentation level="10">
+ ## Central tracking detectors
+ </documentation>
- <include ref="compact/tof_barrel.xml"/>
- <include ref="compact/tof_endcap.xml"/>
- <!--include ref="compact/rwell_tracker_barrel.xml"-->
- <!--include ref="compact/ce_GEM.xml"/-->
- <!--include ref="compact/mm_tracker_barrel.xml"/-->
- <!--include ref="compact/cb_VTX_Barrel.xml"/-->
- <!--include ref="compact/gem_tracker_endcap.xml"/-->
+ <include ref="compact/tracking_config_silicon.xml"/>
- <comment>
- PID detectors
- -------------
- </comment>
+ <!--include ref="compact/tracking_config_mgpds.xml"/-->
+
+ <documentation level="10">
+ ### PID detectors
+ </documentation>
<!--include ref="compact/dirc.xml"/-->
<!--include ref="compact/mrich.xml"/-->
<include ref="compact/forward_trd.xml"/>
<include ref="compact/gaseous_rich.xml"/>
- <comment>
- Central calorimetry
- -------------------
- </comment>
- <include ref="compact/ci_ecal.xml"/>
- <!--<include ref="compact/ci_ecal_shashlik.xml"/>-->
- <!--<include ref="compact/ce_ecal.xml"/>-->
- <include ref="compact/ce_ecal_crystal_glass.xml"/>
- <!-- <include ref="compact/ecal_barrel.xml"/> -->
- <!-- <include ref="compact/ecal_barrel_hybrid.xml"/> -->
- <include ref="compact/ecal_barrel_interlayers.xml"/>
-
+ <documentation level="10">
+ ## Central calorimetry
+ </documentation>
+ <include ref="compact/ecal.xml"/>
<include ref="compact/hcal.xml"/>
- <comment>
- FF elements
- -----------
- </comment>
+ <documentation level="11">
+ ## Far foward detectors
+ </documentation>
<include ref="ip6/B0_tracker.xml"/>
<include ref="ip6/B0_preshower.xml"/>
<include ref="ip6/far_forward_offM_tracker.xml"/>
@@ -260,6 +245,8 @@
FB elements
-----------
None (TODO)
+
+ What is FB?
</comment>
<readouts>
diff --git a/compact/ce_ecal_crystal_glass.xml b/compact/ce_ecal_crystal_glass.xml
index 27068c6965182f5f4d3a8bcb08bac53704643e8d..cea47efc7029ef807bc8f20ba56e4304645104cf 100644
--- a/compact/ce_ecal_crystal_glass.xml
+++ b/compact/ce_ecal_crystal_glass.xml
@@ -17,14 +17,19 @@
<constant name="GlassModule_dy" value="GlassModule_sy + GlassModule_wrap"/>
</define>
<detectors>
- <comment> Backwards Endcap EM Calorimeter, placements generated by script </comment>
+ <comment> </comment>
+ <documentation level="10">
+ #### Backwards Endcap EM Calorimeter
+
+ Backwards Endcap EM Calorimeter, placements generated by script
+ </documentation>
<detector id="ECalEndcapN_ID" name="EcalEndcapN" type="HomogeneousCalorimeter" readout="EcalEndcapNHits">
<position x="0" y="0" z="EcalEndcapN_z0"/>
<rotation x="0" y="0" z="0"/>
<placements>
<lines sector="1" mirrorx="true" mirrory="true">
- <module sizex="CrystalModule_sx" sizey="CrystalModule_sy" sizez="CrystalModule_sz" material="PbWO4" vis="AnlTeal"/>
- <wrapper thickness="CrystalModule_wrap" material="Epoxy" vis="WhiteVis"/>
+ <module sizex="CrystalModule_sx" sizey="CrystalModule_sy" sizez="CrystalModule_sz" material="PbWO4" vis="EcalEndcapNModuleVis"/>
+ <wrapper thickness="CrystalModule_wrap" material="Epoxy" vis="InvisibleWithDaughters"/>
<line axis="x" x="CrystalModule_dx/2." y="CrystalModule_dy*1/2." z="CrystalModule_z0" begin="5" nmods="21"/>
<line axis="x" x="CrystalModule_dx/2." y="CrystalModule_dy*3/2." z="CrystalModule_z0" begin="5" nmods="21"/>
<line axis="x" x="CrystalModule_dx/2." y="CrystalModule_dy*5/2." z="CrystalModule_z0" begin="5" nmods="21"/>
@@ -53,8 +58,8 @@
<line axis="x" x="CrystalModule_dx/2." y="CrystalModule_dy*51/2." z="CrystalModule_z0" begin="0" nmods="6"/>
</lines>
<lines sector="2" mirrorx="true" mirrory="true">
- <module sizex="GlassModule_sx" sizey="GlassModule_sy" sizez="GlassModule_sz" material="PbGlass" vis="AnlBlue"/>
- <wrapper thickness="GlassModule_wrap" material="Epoxy" vis="WhiteVis"/>
+ <module sizex="GlassModule_sx" sizey="GlassModule_sy" sizez="GlassModule_sz" material="PbGlass" vis="EcalEndcapNModuleVis"/>
+ <wrapper thickness="GlassModule_wrap" material="Epoxy" vis="InvisibleWithDaughters"/>
<line axis="x" x="GlassModule_dx/2." y="GlassModule_dy*1/2." z="GlassModule_z0" begin="13" nmods="10"/>
<line axis="x" x="GlassModule_dx/2." y="GlassModule_dy*3/2." z="GlassModule_z0" begin="13" nmods="10"/>
<line axis="x" x="GlassModule_dx/2." y="GlassModule_dy*5/2." z="GlassModule_z0" begin="13" nmods="10"/>
diff --git a/compact/ci_ecal.xml b/compact/ci_ecal.xml
index 443207b2b69a4141ae69a5577d3dc56ad447cacb..15d1289ad0170bd59ca35e1dcf3cba8207a857b6 100644
--- a/compact/ci_ecal.xml
+++ b/compact/ci_ecal.xml
@@ -10,19 +10,16 @@
<regions>
</regions>
- <!-- Common Generic visualization attributes -->
- <comment>Common Generic visualization attributes</comment>
<display>
</display>
<detectors>
- <comment>
- ------------------------------------------
- Forward (Positive Z) Endcap EM Calorimeter
- ------------------------------------------
+ <documentation level="10">
+ #### Forward (Positive Z) Endcap EM Calorimeter
+
A layered EM calorimeter with tungsten and silicon (or scintillator) strips
- </comment>
+ </documentation>
<detector id="ECalEndcapP_ID"
name="EcalEndcapP"
reflect="false"
diff --git a/compact/colors.xml b/compact/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af79a3e2ef2368f26eba2a94b5ae0eb22ee171be
--- /dev/null
+++ b/compact/colors.xml
@@ -0,0 +1,22 @@
+<display>
+
+ <comment>
+ A coherent color scheme. Pick from these colors and (in theory) it should look pretty good.
+ </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/colors2.xml b/compact/colors2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93dbcf6a73d3d277804ca50880032b8853eae79c
--- /dev/null
+++ b/compact/colors2.xml
@@ -0,0 +1,23 @@
+<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/display.xml b/compact/display.xml
index 9666612c4ba2ab6d905c7b083fdade27bef0865c..d20038bedd9c4eae65fc735e3fb10f567633a3e5 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -1,54 +1,67 @@
<display>
- <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="AnlGold_1" alpha="1" r="248/256" g="178/256" b="0/256" visible="true" drawingStyle="wireframe"/>
- <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="AnlGray_1" alpha="1" r="102/256" g="102/256" b="102/256" visible="true" drawingStyle="wireframe"/>
- <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="AnlRed_1" alpha="0.5" r="205/256" g="32/256" b="44/256"/>
+ <comment>
+ See compact/colors.xml for list of colors.
+ </comment>
<vis name="InvisibleNoDaughters" showDaughters="false" visible="false"/>
<vis name="InvisibleWithDaughters" showDaughters="true" visible="false"/>
- <vis name="TrackerSupportVis" ref="AnlBlue" showDaughters="false" />
- <vis name="TrackerLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <comment>
+ Tracking Visualizations
+ </comment>
+ <vis name="TrackerSupportVis" ref="AnlBlue" showDaughters="false" />
+ <vis name="TrackerLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
- <vis name="SiVertexVis" alpha="0.9" r="1" g="0" b="1" showDaughters="true" />
- <vis name="SiTrackerBarrelVis" alpha="0.5" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="SiTrackerVis" alpha="0.9" r="1.0" g="0.0" b="0.0" showDaughters="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="VertexSupportVis" ref="AnlBlue" showDaughters="false" />
+ <vis name="VertexLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
+ <vis name="VertexModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
- <vis name="SiTrackerBarrelVis1" alpha="0.8" r="0.0" g="0.9" b="0.9" showDaughters="true" />
- <vis name="SiTrackerBarrelVis2" alpha="0.8" r="0.1" g="0.9" b="0.0" showDaughters="true" visible="true"/>
- <vis name="SiTrackerEndcapVis1" alpha="0.8" r="1.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="SiTrackerEndcapVis2" alpha="0.8" r="1.0" g="0.45" b="0.0" showDaughters="false" visible="true"/>
- <vis name="SiTrackerSubAssemblyVis" alpha="1" r="0.0" g="0.99" b="0.0" showDaughters="true" visible="true"/>
- <vis name="SiTrackerLayerVis" alpha="1" r="0.0" g="1" b="0.0" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
+ <vis name="TOFVis" ref="AnlGreen" showDaughters="true" />
- <vis name="EcalVis" alpha="0.1" r="0.0" g="0.75" b="0.1" showDaughters="false"/>
- <vis name="EcalEndcapVis" alpha="1.0" r="0.0" g="0.99" b="0.0" showDaughters="false" visible="true" />
- <vis name="EcalBarrelVis" alpha="1.0" r="0.0" g="0.99" b="0.0" showDaughters="false" visible="true" />
-
- <vis name="TOFVis" alpha="0.5" r="1" g="0" b="1" showDaughters="true" />
+ <comment>
+ 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="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="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
+
+ <vis name="EcalEndcapNModuleVis" ref="AnlTeal" showDaughters="false" visible="true"/>
+
+ <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" />
+ <comment>
+ Solenoid
+ </comment>
+ <vis name="SolenoidCoilVis" ref="AnlLight_Gray" 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" />
+
+
+ <comment>
+ PID Detectors
+ </comment>
+ <vis name="RICHVis" ref="AnlViolet" showDaughters="true"/>
- <vis name="SolenoidCoilVis" alpha="1.0" r="0.55" g="0.55" b="0.7" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="SolenoidCryostatVis" alpha="0.4" r="0.55" g="0.55" b="0.7" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="SolenoidYokeVis" alpha="0.2" r="0.8" g="0.1" b="0.1" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
- <vis name="RICHVis" alpha="0.5" r="1" g="0" b="1" showDaughters="true"/>
- <vis name="BeamPipeVis" alpha="1" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/>
+ <comment>
+ Beam line
+ </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"/>
@@ -66,19 +79,20 @@
<comment>
Deprecated colors.
+ 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="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"/
+ vis name="RBG015" alpha="0.5" r= "0.0" g=".2" b="1.0" showDaughters="true" visible="true"/
+ vis name="RBG510" alpha="0.5" r= "1.0" g=".2" b="0.0" showDaughters="true" visible="true"/
+ vis name="RBG" alpha="0.5" r= "1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/
+ vis name="GrayVis" alpha="1.0" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/
</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="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"/>
- <vis name="RBG015" alpha="0.5" r= "0.0" g=".2" b="1.0" showDaughters="true" visible="true"/>
- <vis name="RBG510" alpha="0.5" r= "1.0" g=".2" b="0.0" showDaughters="true" visible="true"/>
- <vis name="RBG" alpha="0.5" r= "1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
- <vis name="GrayVis" alpha="1.0" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/>
+
</display>
diff --git a/compact/display_detailed.xml b/compact/display_detailed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7935c1c8f731301a2633db4711f34d2e348ac7d
--- /dev/null
+++ b/compact/display_detailed.xml
@@ -0,0 +1,99 @@
+ <display>
+
+ <comment>
+ This is where a detailed display can be created.
+ Note this is currently just a copy of display.xml
+ </comment>
+
+ <vis name="InvisibleNoDaughters" showDaughters="false" visible="false"/>
+ <vis name="InvisibleWithDaughters" showDaughters="true" visible="false"/>
+
+ <comment>
+ Tracking Visualizations
+ </comment>
+ <vis name="TrackerSupportVis" ref="AnlBlue" showDaughters="false" />
+ <vis name="TrackerLayerVis" ref="AnlTeal" 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="VertexModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
+
+ <vis name="TOFVis" ref="AnlGreen" showDaughters="true" />
+
+ <comment>
+ 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="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="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
+
+ <vis name="EcalEndcapNModuleVis" ref="AnlTeal" showDaughters="false" visible="true"/>
+
+ <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" />
+
+ <comment>
+ Solenoid
+ </comment>
+ <vis name="SolenoidCoilVis" ref="AnlLight_Gray" 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" />
+
+
+ <comment>
+ PID Detectors
+ </comment>
+ <vis name="RICHVis" ref="AnlViolet" showDaughters="true"/>
+
+ <comment>
+ Beam line
+ </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"/>
+
+ <comment>
+ Deprecated colors.
+ 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="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"/
+ vis name="RBG015" alpha="0.5" r= "0.0" g=".2" b="1.0" showDaughters="true" visible="true"/
+ vis name="RBG510" alpha="0.5" r= "1.0" g=".2" b="0.0" showDaughters="true" visible="true"/
+ vis name="RBG" alpha="0.5" r= "1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/
+ vis name="GrayVis" alpha="1.0" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/
+ </comment>
+
+ </display>
diff --git a/compact/ecal.xml b/compact/ecal.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de9ed8c6189a333f18e71bec0974f91ad908818f
--- /dev/null
+++ b/compact/ecal.xml
@@ -0,0 +1,20 @@
+<lccdd>
+
+ <display>
+ </display>
+ <define>
+ </define>
+
+ <documentation level="10">
+ ### Ecal configuration
+ </documentation>
+ <include ref="ci_ecal.xml"/>
+ <!--<include ref="compact/ci_ecal_shashlik.xml"/>-->
+ <!--<include ref="compact/ce_ecal.xml"/>-->
+ <include ref="ce_ecal_crystal_glass.xml"/>
+ <!-- <include ref="compact/ecal_barrel.xml"/> -->
+ <!-- <include ref="compact/ecal_barrel_hybrid.xml"/> -->
+ <include ref="ecal_barrel_interlayers.xml"/>
+
+</lccdd>
+
diff --git a/compact/ecal_barrel.xml b/compact/ecal_barrel.xml
index a6972dd53b53f3bac0dc7fecf0e4492f525e81d8..142b7323b86438d657a4b5116b917cd29f667f01 100644
--- a/compact/ecal_barrel.xml
+++ b/compact/ecal_barrel.xml
@@ -1,9 +1,7 @@
<lccdd>
- <display>
- <vis name="EcalBarrelEnvelope_vis" alpha="0.9" r="0.99" g="0.5" b="0" showDaughters="true" visible="false" />
- <vis name="EcalBarrelStave_vis" alpha="0.9" r="0.99" g="0.5" b="0" showDaughters="true" visible="false" />
- </display>
+ <display>
+ </display>
<define>
<comment>
---------------------------------------
@@ -47,38 +45,37 @@
<detectors>
- <comment>
- ---------------------
- Barrel EM Calorimeter
- ---------------------
+ <documentation>
+ ### Barrel EM Calorimeter
+
A layered EM calorimeter with tungsten and silicon (AstroPix)
- </comment>
+ </documentation>
<detector
id="ECalBarrel_ID"
name="EcalBarrel"
type="athena_EcalBarrel"
readout="EcalBarrelHits"
calorimeterType="EM_BARREL"
- vis="EcalBarrelEnvelope_vis"
+ vis="EcalBarrelEnvelopeVis"
offset="EcalBarrel_offset">
<dimensions numsides="EcalBarrel_ModRepeat"
rmin="EcalBarrel_rmin"
z="EcalBarrel_length"/>
- <staves vis="EcalBarrelStave_vis">
- <support inside="true" material="Steel235" vis="AnlOrange"
+ <staves vis="EcalBarrelStaveVis">
+ <support inside="true" material="Steel235" vis="EcalBarrelSupportVis"
thickness="EcalBarrel_Support_thickness"
n_beams="3" grid_size="25.0*cm" >
</support>
</staves>
- <layer repeat="min(EcalBarrel_ReadoutLayerNumber, EcalBarrelLayers_nMax)" vis="AnlBlue">
- <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
- <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
- <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="AnlGray"/>
- <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="AnlGold"/>
- <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="AnlGray"/>
- <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/>
- <slice material="TungstenDens24" thickness="EcalBarrel_TungstenThickness" vis="AnlGray"/>
- <slice material="Air" thickness="EcalBarrel_LayerSpacing - EcalBarrel_TungstenThickness" vis="AnlGold"/>
+ <layer repeat="min(EcalBarrel_ReadoutLayerNumber, EcalBarrelLayers_nMax)" vis="EcalBarrelLayerVis">
+ <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="EcalBarrelSliceVis"/>
+ <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="TungstenDens24" thickness="EcalBarrel_TungstenThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Air" thickness="EcalBarrel_LayerSpacing - EcalBarrel_TungstenThickness" vis="EcalBarrelSliceVis"/>
</layer>
</detector>
</detectors>
diff --git a/compact/ecal_barrel_interlayers.xml b/compact/ecal_barrel_interlayers.xml
index 3963cb711cb155434eb4652a020c8ca3de8e17cf..b92259a300324f2c216503a3695c44344f38c13b 100644
--- a/compact/ecal_barrel_interlayers.xml
+++ b/compact/ecal_barrel_interlayers.xml
@@ -1,9 +1,6 @@
<lccdd>
<display>
- <vis name="EcalBarrelEnvelope_vis" alpha="0.9" r="0.99" g="0.5" b="0" showDaughters="true" visible="false" />
- <vis name="EcalBarrelStave_vis" alpha="0.9" r="0.99" g="0.5" b="0" showDaughters="true" visible="false" />
- <vis name="EcalBarrelFiberLayer_vis" alpha="0.9" r="0.1" g="0.5" b="0.5" showDaughters="false" visible="true" />
</display>
<define>
<comment>
@@ -81,20 +78,20 @@
type="athena_EcalBarrelInterlayers"
readout="EcalBarrelHits"
calorimeterType="EM_BARREL"
- vis="EcalBarrelEnvelope_vis"
+ vis="EcalBarrelEnvelopeVis"
offset="EcalBarrel_offset">
<dimensions numsides="EcalBarrel_ModRepeat"
rmin="EcalBarrel_rmin"
z="EcalBarrel_length"/>
- <layer repeat="EcalBarrelImagingLayers_num" vis="AnlBlue"
+ <layer repeat="EcalBarrelImagingLayers_num" vis="EcalBarrelLayerVis"
space_between="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween"
space_before="0.*cm">
- <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
- <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
- <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="AnlGray"/>
- <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="AnlGold"/>
- <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="AnlGray"/>
- <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/>
+ <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="EcalBarrelSliceVis"/>
+ <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="EcalBarrelSliceVis"/>
</layer>
</detector>
@@ -109,20 +106,20 @@
type="athena_EcalBarrelInterlayers"
readout="EcalBarrelScFiHits"
calorimeterType="EM_BARREL"
- vis="EcalBarrelEnvelope_vis"
+ vis="EcalBarrelEnvelopeVis"
offset="EcalBarrel_offset">
<dimensions numsides="EcalBarrel_ModRepeat"
rmin="EcalBarrel_rmin"
z="EcalBarrel_length"/>
- <staves vis="EcalBarrelStave_vis">
- <support material="Steel235" vis="AnlOrange" n_beams="3" grid_size="25.0*cm"
+ <staves vis="EcalBarrelStaveVis">
+ <support material="Steel235" vis="EcalBarrelSupportVis" n_beams="3" grid_size="25.0*cm"
thickness="EcalBarrel_Support_thickness" beam_thickness="EcalBarrel_Support_thickness/4" >
</support>
</staves>
- <layer repeat="EcalBarrelImagingLayers_num-1" vis="AnlBlue"
+ <layer repeat="EcalBarrelImagingLayers_num-1" vis="EcalBarrelLayerVis"
space_between="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween"
space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween/2.">
- <slice material="Lead" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFiberLayer_vis">
+ <slice material="Lead" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFiberLayerVis">
<fiber material="PlasticScint"
sensitive="yes"
radius="EcalBarrel_FiberRadius"
@@ -130,14 +127,14 @@
spacing_z="EcalBarrel_FiberZSpacing">
</fiber>
</slice>
- <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/>
- <slice material="Air" thickness="EcalBarrel_LayerSpacing " vis="AnlGold"/>
+ <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="EcalBarrelSliceVis"/>
+ <slice material="Air" thickness="EcalBarrel_LayerSpacing " vis="EcalBarrelSliceVis"/>
</layer>
- <layer repeat="EcalBarrel_FiberChunkLayers_num" vis="AnlBlue"
+ <layer repeat="EcalBarrel_FiberChunkLayers_num" vis="EcalBarrelLayerVis"
space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween">
<slice material="Lead"
thickness="EcalBarrel_FiberLayerThickness/EcalBarrel_FiberChunkLayers_num"
- vis="EcalBarrelFiberLayer_vis">
+ vis="EcalBarrelFiberLayerVis">
<fiber material="PlasticScint"
sensitive="yes"
radius="EcalBarrel_FiberRadius"
diff --git a/compact/hcal.xml b/compact/hcal.xml
index 45fde3cf578862004fadc35da2ea4d58887c1cdd..2d79c9bbcbef17803957d2d4c3772b5b06119937 100644
--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -11,11 +11,6 @@
</regions>
<display>
- <vis name="HcalVis" alpha="0.9" r="0.75" g="0.0" b="0.0" showDaughters="false"/>
- <vis name="HcalBarrelVis" alpha="0.9" r="0.0" g="0.3" b="0.8" showDaughters="true" visible="true" />
- <vis name="HcalEndcapVis" alpha="0.9" r="0.0" g="0.3" b="0.8" showDaughters="true" visible="true" />
- <vis name="HcalSensorVis" alpha="0.9" r="1.0" g="0.0" b="0.2" showDaughters="true" visible="true" />
- <vis name="HcalAbsorberVis" alpha="0.9" r="0.4" g="0.4" b="0.6" showDaughters="true" visible="true" />
</display>
<!-- Define detector -->
diff --git a/compact/solenoid.xml b/compact/solenoid.xml
index ff4fdf9c128b43e3b3f6fa27b7d66f01e7ad88d0..e1490ea92c79f49579e0eceef2f42e8ab05d2e19 100644
--- a/compact/solenoid.xml
+++ b/compact/solenoid.xml
@@ -108,13 +108,12 @@
</define>
<detectors>
- <comment>
- ---------------
- Solenoid Magnet
+ <documentation level="6">
+ ### Solenoid Magnet
---------------
The solenoid superconducting magnet and surrounding cryostat and
yoke endcaps.
- </comment>
+ </documentation>
<detector
id="Solenoid_ID"
name="SolenoidCoilBarrel"
diff --git a/compact/subsystem_views/pid_only.xml b/compact/subsystem_views/pid_only.xml
index d5be05d4eac18bb19219924540906ba94dad62a8..38ee2f7a3daa5fb0139279b6354421458c64df63 100644
--- a/compact/subsystem_views/pid_only.xml
+++ b/compact/subsystem_views/pid_only.xml
@@ -57,6 +57,7 @@
</limits>
<display>
+ <include ref="compact/colors.xml" />
<include ref="compact/display.xml" />
</display>
diff --git a/compact/subsystem_views/tracking_only.xml b/compact/subsystem_views/tracking_only.xml
index f5e1b26cd922a188403c37b5215db90ee13d363c..8d59a639cf8ba01feca5d4ed77c2ea810a363c1d 100644
--- a/compact/subsystem_views/tracking_only.xml
+++ b/compact/subsystem_views/tracking_only.xml
@@ -57,6 +57,7 @@
</limits>
<display>
+ <include ref="compact/colors.xml" />
<include ref="compact/display.xml" />
</display>
diff --git a/compact/subsystem_views/vertex_only.xml b/compact/subsystem_views/vertex_only.xml
index 7036ea2baade77ad2220a909fe0ce646111e9eeb..32e1e933223f5d7260790ac769344641be3a43dd 100644
--- a/compact/subsystem_views/vertex_only.xml
+++ b/compact/subsystem_views/vertex_only.xml
@@ -57,6 +57,7 @@
</limits>
<display>
+ <include ref="compact/colors.xml" />
<include ref="compact/display.xml" />
</display>
diff --git a/compact/tof.xml b/compact/tof.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c190d55a0169ed0530e652df6ffcf513c0a978f3
--- /dev/null
+++ b/compact/tof.xml
@@ -0,0 +1,19 @@
+<lccdd>
+
+ <display>
+ </display>
+ <define>
+ </define>
+
+ <documentation level="10">
+ ### Time-of-flight detectors
+
+ document here
+
+ </documentation>
+
+ <include ref="tof_barrel.xml"/>
+ <include ref="tof_endcap.xml"/>
+
+</lccdd>
+
diff --git a/compact/tof_barrel.xml b/compact/tof_barrel.xml
index 7a36a9e4dfc6ac283898fef680cc4351ccacce49..7ba847259e566f5441818c7a49faeafc217cdba7 100644
--- a/compact/tof_barrel.xml
+++ b/compact/tof_barrel.xml
@@ -44,8 +44,8 @@
<comment>
Tracker Barrel Modules
</comment>
- <module name="BarrelTOF_Module1" vis="OrgangeVis">
- <frame material="CarbonFiber_25percent" vis="BlueGreenVis"
+ <module name="BarrelTOF_Module1" vis="TOFVis">
+ <frame material="CarbonFiber_25percent" vis="TOFVis"
width="BarrelTOFSpaceFrame_width"
height="BarrelTOFSpaceFrame_height"
length="BarrelTOF_length1"
diff --git a/compact/tof_endcap.xml b/compact/tof_endcap.xml
index 540b04f483d38f586b849977d3f58fc615de9495..c79fe5e00bff8a8c43d6dc3587531dc699549d6d 100644
--- a/compact/tof_endcap.xml
+++ b/compact/tof_endcap.xml
@@ -52,12 +52,12 @@
readout="TOFEndcapHits"
vis="TOFVis"
reflect="false">
- <module name="Module1" vis="OrgangeVis">
+ <module name="Module1" vis="TOFVis">
<trd x1="ForwardTOFMod1_x1/2.0" x2="ForwardTOFMod1_x2/2.0" z="ForwardTOFMod1_y/2"/>
<module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TOFEndcapService_thickness" material="Silicon"/>
</module>
- <module name="Module2" vis="OrgangeVis">
+ <module name="Module2" vis="TOFVis">
<trd x1="ForwardTOFMod2_x1/2.0" x2="ForwardTOFMod2_x2/2.0" z="ForwardTOFMod2_y/2"/>
<module_component thickness="TOFEndcapSensor_thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TOFEndcapService_thickness" material="Silicon"/>
@@ -68,7 +68,7 @@
rmax="ForwardTOF_rmax1"
length="BackwardTOF_thickness"
zstart="ForwardTOF_zmin" />
- <ring vis="AnlRed"
+ <ring vis="TOFVis"
r="ForwardTOF_rmin1+ForwardTOFMod1_y/2.0"
zstart="0.0*mm"
nmodules="12" dz="2.5 * mm" module="Module1" />
@@ -79,7 +79,7 @@
rmax="ForwardTOF_rmax2"
length="BackwardTOF_thickness"
zstart="ForwardTOF_zmin + ForwardTOF_dz" />
- <ring vis="AnlRed"
+ <ring vis="TOFVis"
r="ForwardTOF_rmin2+ForwardTOFMod2_y/2.0"
zstart="0.0*mm"
nmodules="12" dz="2.5 * mm" module="Module2" />
@@ -93,12 +93,12 @@
readout="TOFEndcapHits"
vis="TOFVis"
reflect="true">
- <module name="Module1" vis="OrgangeVis">
+ <module name="Module1" vis="TOFVis">
<trd x1="BackwardTOFMod1_x1/2.0" x2="BackwardTOFMod1_x2/2.0" z="BackwardTOFMod1_y/2"/>
<module_component thickness="TOFEndcapSensor_thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TOFEndcapService_thickness" material="Silicon"/>
</module>
- <module name="Module2" vis="OrgangeVis">
+ <module name="Module2" vis="TOFVis">
<trd x1="BackwardTOFMod2_x1/2.0" x2="BackwardTOFMod2_x2/2.0" z="BackwardTOFMod2_y/2"/>
<module_component thickness="TOFEndcapSensor_thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TOFEndcapService_thickness" material="Silicon"/>
@@ -109,7 +109,7 @@
rmax="BackwardTOF_rmax1"
length="BackwardTOF_thickness"
zstart="BackwardTOF_zmin" />
- <ring vis="AnlRed"
+ <ring vis="TOFVis"
r="BackwardTOF_rmin1+BackwardTOFMod1_y/2.0"
zstart="0.0*mm"
nmodules="12" dz="2.5 * mm" module="Module1" />
@@ -120,7 +120,7 @@
rmax="BackwardTOF_rmax2"
length="BackwardTOF_thickness"
zstart="BackwardTOF_zmin + BackwardTOF_dz" />
- <ring vis="AnlRed"
+ <ring vis="TOFVis"
r="BackwardTOF_rmin2+BackwardTOFMod2_y/2.0"
zstart="0.0*mm"
nmodules="12" dz="2.5 * mm" module="Module2" />
diff --git a/compact/tracking_config_mgpds.xml b/compact/tracking_config_mgpds.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e9b1edbcf45c5a91fd4aa0f4c3e1d4e5f809fbc
--- /dev/null
+++ b/compact/tracking_config_mgpds.xml
@@ -0,0 +1,21 @@
+<lccdd>
+
+ <display>
+ </display>
+ <define>
+ </define>
+
+ <documentation level="10">
+ ### Mixed tracking configuration
+
+ This configuration needs attention!
+ </documentation>
+
+ <include ref="rwell_tracker_barrel.xml">
+ <!--include ref="compact/ce_GEM.xml"/-->
+ <!--include ref="compact/mm_tracker_barrel.xml"/-->
+ <!--include ref="compact/cb_VTX_Barrel.xml"/-->
+ <!--include ref="compact/gem_tracker_endcap.xml"/-->
+
+</lccdd>
+
diff --git a/compact/tracking_config_silicon.xml b/compact/tracking_config_silicon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8860011b141ecf3e88bc8a15573d864e97253b2c
--- /dev/null
+++ b/compact/tracking_config_silicon.xml
@@ -0,0 +1,17 @@
+<lccdd>
+
+ <display>
+ </display>
+ <define>
+ </define>
+
+ <documentation level="10">
+ ### Silicon tracking configuration
+ </documentation>
+
+ <include ref="vertex_tracker.xml"/>
+ <include ref="central_tracker.xml"/>
+ <include ref="tof.xml"/>
+
+</lccdd>
+
diff --git a/compact/vertex_tracker.xml b/compact/vertex_tracker.xml
index d9485adbb36a7dece29fab833167690a8aa47764..ac492937dd0aaa50da9f969616b908d314014d75 100644
--- a/compact/vertex_tracker.xml
+++ b/compact/vertex_tracker.xml
@@ -37,32 +37,12 @@
<constant name="VertexEndcapMod1_x1" value="2.0*VertexTrackerEndcapP_rmin*sin(VertexEndcapModOpeningAngle/2.0)"/>
<constant name="VertexEndcapMod1_x2" value="2.0*VertexTrackerEndcapP_rmax*sin(VertexEndcapModOpeningAngle/2.0)"/>
<constant name="VertexEndcapMod1_y" value="VertexTrackerEndcapP_rmax*cos(VertexEndcapModOpeningAngle/2.0) - VertexTrackerEndcapP_rmin"/>
-
-</define>
-
+ </define>
<display>
</display>
-
<detectors>
-
- <!--
- <detector id="VertexBarrelSubAssembly_ID"
- name="VertexBarrelSubAssembly"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="VertexBarrel" />
- </detector>
- <detector id="VertexEndcapSubAssembly_ID"
- name="VertexEndcapSubAssembly"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="VertexEndcapN" />
- <composite name="VertexEndcapP" />
- </detector>
- -->
-
<detector
id="VertexBarrel_ID"
name="VertexBarrel"
diff --git a/scripts/view6/generate_eps b/scripts/view6/generate_eps
index f7251e5f59cd942708650a62ac5180753c6aaa5e..f63727574253d2e31d2fbc774dc2245130f6a5b0 100755
--- a/scripts/view6/generate_eps
+++ b/scripts/view6/generate_eps
@@ -59,6 +59,7 @@ INPUT_FILE=${FILE_TAG}_input.prim
# units are mm
dawncut 0 0 -1 1 ${INPUT_FILE} ${FILE_TAG}a_temp0.prim
dawncut 0 0 1 1 ${FILE_TAG}a_temp0.prim ${FILE_TAG}a.prim
+../../bin/dawn_tweak --mag 14
dawn -d ${FILE_TAG}a.prim
ps2pdf ${FILE_TAG}a.eps ${FILE_TAG}a_full.pdf
gs -o ${FILE_TAG}a.pdf -sDEVICE=pdfwrite \
@@ -69,6 +70,7 @@ pdftoppm ${FILE_TAG}a.pdf ${FILE_TAG}a -png -singlefile -cropbox
#SiTracker Endcap layer 5 zstart = 860mm ( 90 mm thick )
dawncut 0 0 1 945 ${INPUT_FILE} ${FILE_TAG}b_temp0.prim
dawncut 0 0 -1 -865 ${FILE_TAG}b_temp0.prim ${FILE_TAG}b.prim
+../../bin/dawn_tweak --mag 14
dawn -d ${FILE_TAG}b.prim
ps2pdf ${FILE_TAG}b.eps ${FILE_TAG}b_full.pdf
gs -o ${FILE_TAG}b.pdf -sDEVICE=pdfwrite \
@@ -79,6 +81,7 @@ pdftoppm ${FILE_TAG}b.pdf ${FILE_TAG}b -png -singlefile -cropbox
#SiTracker Endcap layer 4 zstart = 695mm ( 90 mm thick )
dawncut 0 0 1 780 ${INPUT_FILE} ${FILE_TAG}c_temp0.prim
dawncut 0 0 -1 -700 ${FILE_TAG}c_temp0.prim ${FILE_TAG}c.prim
+../../bin/dawn_tweak --mag 14
dawn -d ${FILE_TAG}c.prim
ps2pdf ${FILE_TAG}c.eps ${FILE_TAG}c_full.pdf
gs -o ${FILE_TAG}c.pdf -sDEVICE=pdfwrite \
@@ -101,6 +104,7 @@ pdftoppm ${FILE_TAG}d.pdf ${FILE_TAG}d -png -singlefile -cropbox
# slice at z = -2m
dawncut 0 0 1 430 ${INPUT_FILE} ${FILE_TAG}e_temp0.prim
dawncut 0 0 -1 -370 ${FILE_TAG}e_temp0.prim ${FILE_TAG}e.prim
+../../bin/dawn_tweak --mag 14
dawn -d ${FILE_TAG}e.prim
ps2pdf ${FILE_TAG}e.eps ${FILE_TAG}e_full.pdf
gs -o ${FILE_TAG}e.pdf -sDEVICE=pdfwrite \
@@ -111,6 +115,7 @@ pdftoppm ${FILE_TAG}e.pdf ${FILE_TAG}e -png -singlefile -cropbox
#SiTracker Endcap layer 1 zstart = 200mm ( 30 mm thick )
dawncut 0 0 1 225 ${INPUT_FILE} ${FILE_TAG}f_temp0.prim
dawncut 0 0 -1 205 ${FILE_TAG}f_temp0.prim ${FILE_TAG}f.prim
+../../bin/dawn_tweak --mag 14
dawn -d ${FILE_TAG}f.prim
ps2pdf ${FILE_TAG}f.eps ${FILE_TAG}f_full.pdf
gs -o ${FILE_TAG}f.pdf -sDEVICE=pdfwrite \