diff --git a/examples/ILDExDet/compact/ILDEx.xml b/examples/ILDExDet/compact/ILDEx.xml
index 091add419d938f28118f341b3555bd4a7c90772a..ab3e2a11e33781c7e4e9679e0c6ff4ee88f0e6f9 100644
--- a/examples/ILDExDet/compact/ILDEx.xml
+++ b/examples/ILDExDet/compact/ILDEx.xml
@@ -142,104 +142,104 @@
</layer>
</detector>
- <!-- <detector name="SIT" type="ILDExSIT" vis="SITVis" id="2" limits="Tracker_limits" readout="SITCollection" insideTrackingVolume="true"> -->
- <!-- <tubs rmin="SIT_inner_radius" rmax="SIT_outer_radius" zhalf="SIT_zhalf"/> -->
- <!-- <layer id="0" vis="SITLayerVis"> -->
- <!-- <support thickness="1.0*mm" material="Carbon" vis="SITSupportVis"/> -->
- <!-- <ladder thickness="0.1*mm" zhalf="370*mm" radius="155*mm" material="Silicon" number="10" /> -->
- <!-- </layer> -->
- <!-- <layer id="1" vis="SITLayerVis"> -->
- <!-- <support thickness="1.0*mm" material="Carbon" vis="SITSupportVis"/> -->
- <!-- <ladder thickness="0.1*mm" zhalf="650*mm" radius="300*mm" material="Silicon" number="19" /> -->
- <!-- </layer> -->
- <!-- </detector> -->
+ <detector name="SIT" type="ILDExSIT" vis="SITVis" id="2" limits="Tracker_limits" readout="SITCollection" insideTrackingVolume="true">
+ <tubs rmin="SIT_inner_radius" rmax="SIT_outer_radius" zhalf="SIT_zhalf"/>
+ <layer id="0" vis="SITLayerVis">
+ <support thickness="1.0*mm" material="Carbon" vis="SITSupportVis"/>
+ <ladder thickness="0.1*mm" zhalf="370*mm" radius="155*mm" material="Silicon" number="10" />
+ </layer>
+ <layer id="1" vis="SITLayerVis">
+ <support thickness="1.0*mm" material="Carbon" vis="SITSupportVis"/>
+ <ladder thickness="0.1*mm" zhalf="650*mm" radius="300*mm" material="Silicon" number="19" />
+ </layer>
+ </detector>
- <!-- <detector name="TPC" type="ILDExTPC" vis="TPCVis" id="3" limits="TPC_limits" readout="TPCCollection" insideTrackingVolume="true"> -->
+ <detector name="TPC" type="ILDExTPC" vis="TPCVis" id="3" limits="TPC_limits" readout="TPCCollection" insideTrackingVolume="true">
- <!-- <tubs rmin="TPC_inner_radius" rmax="TPC_outer_radius" zhalf="TPC_zhalf"/> -->
+ <tubs rmin="TPC_inner_radius" rmax="TPC_outer_radius" zhalf="TPC_zhalf"/>
- <!-- <global driftLength="TPC_zhalf-TPC_endcap_thickness" padWidth="1.0*mm"/> -->
+ <global driftLength="TPC_zhalf-TPC_endcap_thickness" padWidth="1.0*mm"/>
- <!-- <\!-- <material name="Air"/> -\-> -->
+ <!-- <material name="Air"/> -->
- <!-- <detector name="TPC_InnerWall" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="2"> -->
- <!-- <material name="Carbon"/> -->
- <!-- <tubs rmin="TPC_inner_radius" rmax="TPC_inner_radius+TPC_inner_thickness" zhalf="TPC_zhalf"/> -->
- <!-- <position x="0" y="0" z="0"/> -->
- <!-- <rotation x="0" y="0" z="0"/> -->
- <!-- </detector> -->
+ <detector name="TPC_InnerWall" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="2">
+ <material name="Carbon"/>
+ <tubs rmin="TPC_inner_radius" rmax="TPC_inner_radius+TPC_inner_thickness" zhalf="TPC_zhalf"/>
+ <position x="0" y="0" z="0"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
- <!-- <detector name="TPC_OuterWall" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="3"> -->
- <!-- <material name="Carbon" /> -->
- <!-- <tubs rmin="TPC_outer_radius - TPC_outer_thickness" rmax="TPC_outer_radius" zhalf="TPC_zhalf"/> -->
- <!-- <position x="0" y="0" z="0"/> -->
- <!-- <rotation x="0" y="0" z="0"/> -->
- <!-- </detector> -->
+ <detector name="TPC_OuterWall" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="3">
+ <material name="Carbon" />
+ <tubs rmin="TPC_outer_radius - TPC_outer_thickness" rmax="TPC_outer_radius" zhalf="TPC_zhalf"/>
+ <position x="0" y="0" z="0"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
- <!-- <detector name="TPC_EndPlate" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="0"> -->
- <!-- <material name="Carbon" /> -->
- <!-- <tubs rmin="TPC_inner_radius+TPC_inner_thickness" rmax="TPC_outer_radius-TPC_outer_thickness" zhalf="0.5*TPC_endcap_thickness"/> -->
- <!-- <position x="0" y="0" z="TPC_zhalf-0.5*TPC_endcap_thickness"/> -->
- <!-- <rotation x="0" y="0" z="0"/> -->
- <!-- </detector> -->
+ <detector name="TPC_EndPlate" type="TubeSegment" reflect="true" vis="TPCSupportVis" id="0">
+ <material name="Carbon" />
+ <tubs rmin="TPC_inner_radius+TPC_inner_thickness" rmax="TPC_outer_radius-TPC_outer_thickness" zhalf="0.5*TPC_endcap_thickness"/>
+ <position x="0" y="0" z="TPC_zhalf-0.5*TPC_endcap_thickness"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
- <!-- <detector name="TPC_GasVolume" type="TubeSegment" reflect="true" vis="TPCGasVis" id="4"> -->
- <!-- <material name="Argon"/> -->
- <!-- <tubs rmin="TPC_inner_radius+TPC_inner_thickness" rmax="TPC_outer_radius-TPC_outer_thickness" zhalf="TPC_zhalf-TPC_endcap_thickness"/> -->
- <!-- <layer number="220" ecut="0.0"/> -->
- <!-- <position x="0" y="0" z="0"/> -->
- <!-- <rotation x="0" y="0" z="0"/> -->
- <!-- </detector> -->
-
- <!-- </detector> -->
-
- <!-- <comment>Calorimeters</comment> -->
- <!-- <detector id="7" name="HcalBarrel" type="AhcalBarrelCalorimeter" readout="HcalBarrelRegCollection" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="10.*mm"> -->
- <!-- <comment>Hadron Calorimeter Barrel</comment> -->
-
- <!-- <material name="Steel235"/> -->
-
- <!-- <dimensions numsides="(int) HcalBarrel_staves" rmin="HcalBarrel_rmin" z="HcalBarrel_zmax"/> -->
- <!-- <layer repeat="(int) HcalBarrel_layers"> -->
- <!-- <slice material = "Polystyrene" thickness = "3.0*mm" sensitive = "yes" limits="cal_limits" vis="HcalBarrelSensorVis"/> -->
- <!-- <slice material = "FR4" thickness = "0.7*mm" /> -->
- <!-- <slice material = "Cu" thickness = "0.1*mm" /> -->
- <!-- <slice material = "Air" thickness = "2.7*mm" vis="HcalBarrelAirVis" /> -->
- <!-- </layer> -->
- <!-- </detector> -->
- <!-- <detector id="8" name="HcalEndcap" type="AhcalEndcapCalorimeter" readout="HcalEndcapHits" calorimeterType="HAD_ENDCAP" gap="15.*mm"> -->
- <!-- <comment>Hadron Calorimeter Endcap</comment> -->
-
- <!-- <material name="Steel235"/> -->
-
- <!-- <layer repeat="(int) Hcal_endcap_layers"> -->
- <!-- <slice material = "Polystyrene" thickness = "3.0*mm" sensitive = "yes" limits="cal_limits" vis="HcalEndcapSensorVis"/> -->
- <!-- <slice material = "FR4" thickness = "0.7*mm" /> -->
- <!-- <slice material = "Cu" thickness = "0.1*mm" /> -->
- <!-- <slice material = "Air" thickness = "2.7*mm" vis="HcalEndcapAirVis" /> -->
- <!-- </layer> -->
-
- <!-- <dimensions numsides="(int) Hcal_endcap_modules" rmin="362.0*mm" z="Hcal_endcap_zmin"> -->
- <!-- <dimensions id="1" y_offset= "543.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1087.0*mm"/> -->
- <!-- <dimensions id="2" y_offset= "905.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1811.0*mm"/> -->
- <!-- <dimensions id="3" y_offset="1086.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2173.0*mm"/> -->
- <!-- <dimensions id="4" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="5" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="6" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/> -->
- <!-- <dimensions id="7" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/> -->
- <!-- <dimensions id="8" y_offset="1630.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="9" y_offset="1630.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="10" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/> -->
- <!-- <dimensions id="11" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/> -->
- <!-- <dimensions id="12" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="13" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/> -->
- <!-- <dimensions id="14" y_offset="1086.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2173.0*mm"/> -->
- <!-- <dimensions id="15" y_offset= "905.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1811.0*mm"/> -->
- <!-- <dimensions id="16" y_offset= "543.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1087.0*mm"/> -->
- <!-- </dimensions> -->
- <!-- </detector> -->
+ <detector name="TPC_GasVolume" type="TubeSegment" reflect="true" vis="TPCGasVis" id="4">
+ <material name="Argon"/>
+ <tubs rmin="TPC_inner_radius+TPC_inner_thickness" rmax="TPC_outer_radius-TPC_outer_thickness" zhalf="TPC_zhalf-TPC_endcap_thickness"/>
+ <layer number="220" ecut="0.0"/>
+ <position x="0" y="0" z="0"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
+
+ </detector>
+
+ <comment>Calorimeters</comment>
+ <detector id="7" name="HcalBarrel" type="AhcalBarrelCalorimeter" readout="HcalBarrelRegCollection" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="10.*mm">
+ <comment>Hadron Calorimeter Barrel</comment>
+
+ <material name="Steel235"/>
+
+ <dimensions numsides="(int) HcalBarrel_staves" rmin="HcalBarrel_rmin" z="HcalBarrel_zmax"/>
+ <layer repeat="(int) HcalBarrel_layers">
+ <slice material = "Polystyrene" thickness = "3.0*mm" sensitive = "yes" limits="cal_limits" vis="HcalBarrelSensorVis"/>
+ <slice material = "FR4" thickness = "0.7*mm" />
+ <slice material = "Cu" thickness = "0.1*mm" />
+ <slice material = "Air" thickness = "2.7*mm" vis="HcalBarrelAirVis" />
+ </layer>
+ </detector>
+ <detector id="8" name="HcalEndcap" type="AhcalEndcapCalorimeter" readout="HcalEndcapHits" calorimeterType="HAD_ENDCAP" gap="15.*mm">
+ <comment>Hadron Calorimeter Endcap</comment>
+
+ <material name="Steel235"/>
+
+ <layer repeat="(int) Hcal_endcap_layers">
+ <slice material = "Polystyrene" thickness = "3.0*mm" sensitive = "yes" limits="cal_limits" vis="HcalEndcapSensorVis"/>
+ <slice material = "FR4" thickness = "0.7*mm" />
+ <slice material = "Cu" thickness = "0.1*mm" />
+ <slice material = "Air" thickness = "2.7*mm" vis="HcalEndcapAirVis" />
+ </layer>
+
+ <dimensions numsides="(int) Hcal_endcap_modules" rmin="362.0*mm" z="Hcal_endcap_zmin">
+ <dimensions id="1" y_offset= "543.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1087.0*mm"/>
+ <dimensions id="2" y_offset= "905.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1811.0*mm"/>
+ <dimensions id="3" y_offset="1086.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2173.0*mm"/>
+ <dimensions id="4" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="5" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="6" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/>
+ <dimensions id="7" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/>
+ <dimensions id="8" y_offset="1630.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="9" y_offset="1630.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="10" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/>
+ <dimensions id="11" y_offset="1449.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2898.0*mm"/>
+ <dimensions id="12" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="13" y_offset="1268.0*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2536.0*mm"/>
+ <dimensions id="14" y_offset="1086.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="2173.0*mm"/>
+ <dimensions id="15" y_offset= "905.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1811.0*mm"/>
+ <dimensions id="16" y_offset= "543.5*mm" dim_x="375.0*mm" dim_y="1287.0*mm" dim_z="1087.0*mm"/>
+ </dimensions>
+ </detector>
</detectors>