diff --git a/SiD/slic/sieic3/sieic3_compact.xml b/SiD/slic/sieic3/sieic3_compact.xml
index e43a65b81fbe6c4212abb60607eec8af47e3ed51..0e928ec5c00d91c625c236bbd19c631de2a9f694 100755
--- a/SiD/slic/sieic3/sieic3_compact.xml
+++ b/SiD/slic/sieic3/sieic3_compact.xml
@@ -404,7 +404,7 @@
</layer>
</detector>
<comment>Vertex Detector Endcaps</comment>
- <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap2" readout="SiVertexEndcapHits" vis="SiVertexEndcapVis">
+ <detector id="2" name="SiVertexEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiVertexEndcapHits" vis="SiVertexEndcapVis">
<module name="SiVertexEndcapModule1">
<trd x1="3.034" x2="14.682" z="29.280" />
<module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
@@ -616,7 +616,7 @@
<z_layout dr="4.0" z0="1476.497" nz="35"/>
</layer>
</detector>
- <detector id="4" name="SiTrackerEndcap" type="SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true" vis="SiTrackerEndcapVis">
+ <detector id="4" name="SiTrackerEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true" vis="SiTrackerEndcapVis">
<comment>Outer Tracker Endcaps</comment>
<module name="Module1">
<trd x1="36.112" x2="46.635" z="100.114/2" />
@@ -688,7 +688,7 @@
</layer>
</detector>
- <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap2" readout="SiTrackerForwardHits" vis="SiTrackerForwardVis">
+ <detector id="15" name="SiTrackerForward" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerForwardHits" vis="SiTrackerForwardVis">
<comment>Forward Tracker inside Vertex Support Barrel</comment>
<module name="SiTrackerForwardModule1">
<trd x1="5.620" x2="32.435" z="67.405" />
@@ -716,7 +716,7 @@
</layer>
</detector>
<comment>Calorimeters</comment>
- <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
+ <detector id="5" name="EcalBarrel" type="DD4hep_EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
<comment>EM Calorimeter Barrel</comment>
<dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
<staves />
@@ -743,7 +743,7 @@
<slice material = "Air" thickness = "0.033*cm" />
</layer>
</detector>
- <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
+ <detector id="6" name="EcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
<comment>EM Calorimeter Endcaps</comment>
<dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="200.0*mm" rmax="1314.0*mm" />
<layer repeat="1">
@@ -769,7 +769,7 @@
<slice material = "Air" thickness = "0.033*cm" />
</layer>
</detector>
- <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="7" name="HcalBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
<comment>Hadron Calorimeter Barrel</comment>
<dimensions numsides="12" rmin="1350.0*mm" z="2668.0 * 2"/>
<staves />
@@ -782,7 +782,7 @@
<slice material = "Air" thickness = "0.16*cm" />
</layer>
</detector>
- <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP" reflect="true">
+ <detector id="8" name="HcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP" reflect="true">
<comment>Hadron Calorimeter Endcaps</comment>
<dimensions numsides="12" zmin="1800.0*mm" rmin="200.0*mm" rmax="1395.0*mm" />
<layer repeat="30">
@@ -794,7 +794,7 @@
<slice material = "Air" thickness = "0.16*cm" />
</layer>
</detector>
- <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="9" name="MuonBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
<comment>Muon Calorimeter Barrel</comment>
<dimensions numsides="8" rmin="2550*mm" z="2633.0 * 2"/>
<staves />
@@ -817,7 +817,7 @@
<slice material="Iron" thickness="20.0*cm" />
</layer>
</detector>
- <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
+ <detector id="10" name="MuonEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
<comment>Muon Calorimeter Endcaps</comment>
<dimensions numsides="8" zmin="2680.0*mm" rmin="200.0*mm" rmax="4080*mm" />
<layer repeat="5">
@@ -840,7 +840,7 @@
</layer>
</detector>
<!--
- <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
+ <detector id="11" name="LumiCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
<comment>Luminosity Calorimeter</comment>
<dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "18.0*cm" />
<layer repeat="15" >
@@ -859,7 +859,7 @@
</layer>
</detector>
- <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits" vis="BeamCalVis" calorimeterType="BEAM">
+ <detector id="12" name="BeamCal" reflect="true" type="DD4hep_ForwardDetector" readout="BeamCalHits" vis="BeamCalVis" calorimeterType="BEAM">
<comment>Beam Calorimeter</comment>
<dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
<beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
@@ -874,7 +874,7 @@
-->
<comment>Dead material and supports</comment>
<comment>Beampipe</comment>
- <detector name="Beampipe" type="PolyconeSupport" insideTrackingVolume="true" vis="BeampipeVis">
+ <detector name="Beampipe" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeampipeVis">
<comment>Central Be Beampipe</comment>
<material name="Beryllium"/>
<zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm" rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="-37.5*cm" />
@@ -886,42 +886,42 @@
rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="37.5*cm" />
</detector>
<comment>Steel beampipe cones</comment>
- <detector name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="ForwardSupportTube" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Steel235"/>
<zplane rmin = "15.5*cm" rmax="19.5*cm" z="182.0*cm" />
<zplane rmin="15.5*cm" rmax="19.5*cm" z="323.5*cm"/>
</detector>
- <detector name="BackwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="BackwardSupportTube" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Steel235"/>
<zplane rmin="15.5*cm" rmax="19.5*cm" z="-323.5*cm"/>
<zplane rmin = "15.5*cm" rmax="19.5*cm" z="-182.0*cm" />
</detector>
<comment>Incoming and outgoing beampipes in far forward region</comment>
- <detector name="NorthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+ <detector name="NorthIncomingBeampipe" type="DD4hep_TubeSegment" vis="InvisibleNoDaughters">
<material name="Iron" />
<tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
<position x="-2.13*cm" y="0" z="304.27*cm" />
<rotation x="0.0" y="0.0070" z="0.0" />
</detector>
- <detector name="SouthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+ <detector name="SouthIncomingBeampipe" type="DD4hep_TubeSegment" vis="InvisibleNoDaughters">
<material name="Iron" />
<tubs rmin="1.0*cm" rmax="1.04*cm" zhalf="9.27*cm" />
<position x="-2.13*cm" y="0" z="-304.27*cm" />
<rotation x="0.0" y="-0.0070" z="0.0" />
</detector>
- <detector name="NorthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+ <detector name="NorthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="InvisibleNoDaughters">
<material name="Iron" />
<tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
<position x="2.13*cm" y="0" z="304.27*cm" />
<rotation x="0.0" y="-0.0070" z="0.0" />
</detector>
- <detector name="SouthOutgoingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
+ <detector name="SouthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="InvisibleNoDaughters">
<material name="Iron" />
<tubs rmin="1.50*cm" rmax="1.54*cm" zhalf="9.27*cm" />
<position x="2.13*cm" y="0" z="-304.27*cm" />
<rotation x="0.0" y="0.0070" z="0.0" />
</detector>
- <detector name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeLiner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>BeamPipe Liner to shield bremsstrahlung photons</comment>
<material name="Titanium"/>
<zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="-tracking_region_zmax" />
@@ -931,7 +931,7 @@
<zplane rmin="1.1925*cm" rmax="1.2*cm" z="6.251*cm" />
<zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="tracking_region_zmax" />
</detector>
- <detector name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>Vacuum inside beampipe</comment>
<material name="Vacuum"/>
<zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
@@ -941,20 +941,20 @@
<zplane rmin="0.*cm" rmax="1.1925*cm" z="6.251*cm" />
<zplane rmin = "0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="tracking_region_zmax" />
</detector>
- <detector name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="ForwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm" rmax="6.0*cm" z="tracking_region_zmax" />
<zplane rmin="0.*cm" rmax="6.0*cm" z="182*cm" />
<zplane rmin="0.*cm" rmax="12.4*cm" z="282*cm"/>
</detector>
- <detector name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="BackwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm" rmax="12.4*cm" z="-282*cm"/>
<zplane rmin="0.*cm" rmax="6.0*cm" z="-182*cm" />
<zplane rmin="0.*cm" rmax="6.0*cm" z="-tracking_region_zmax" />
</detector>
<comment>Vertex Detector Supports and Readout</comment>
- <detector name="VertexBarrelSupports" type="MultiLayerTracker" vis="InvisibleNoDaughters">
+ <detector name="VertexBarrelSupports" type="DD4hep_MultiLayerTracker" vis="InvisibleNoDaughters">
<comment>Double-walled Carbon Fiber support tube</comment>
<layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
@@ -963,7 +963,7 @@
<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
</layer>
</detector>
- <detector name="VertexEndSupports" type="DiskTracker" reflect="true" vis="InvisibleNoDaughters">
+ <detector name="VertexEndSupports" type="DD4hep_DiskTracker" reflect="true" vis="InvisibleNoDaughters">
<layer id="7" inner_r = "4.80*cm" inner_z = "86.88*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
@@ -971,7 +971,7 @@
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
</detector>
- <detector name="VertexReadout" type="DiskTracker" reflect="true" vis="InvisibleNoDaughters">
+ <detector name="VertexReadout" type="DD4hep_DiskTracker" reflect="true" vis="InvisibleNoDaughters">
<comment>Readout and Cabling</comment>
<layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm" inner_z= "6.4*cm">
<slice material = "G10" thickness ="0.5*cm"/>
@@ -1025,42 +1025,42 @@
<slice material = "G10" thickness = "0.2*cm" />
</layer>
</detector>
- <detector name="VXDcableZbackwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDcableZbackwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)"
rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)"
z="-tracking_region_zmax" />
<zplane rmin="1.542*cm" rmax="1.552*cm" z="-12.01*cm"/>
</detector>
- <detector name="VXDcableZbackwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDcableZbackwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Copper"/>
<zplane rmin="1.455*cm" rmax="1.467*cm" z="-9.99*cm"/>
<zplane rmin="1.32*cm" rmax="1.332*cm" z="-6.91*cm"/>
</detector>
- <detector name="VXDcableZforwardOuter" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDcableZforwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.4*cm)"
rmax = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.404*cm)"
z="tracking_region_zmax" />
<zplane rmin="1.542*cm" rmax="1.552*cm" z="12.01*cm"/>
</detector>
- <detector name="VXDcableZforwardInner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDcableZforwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Copper"/>
<zplane rmin="1.455*cm" rmax="1.467*cm" z="9.99*cm"/>
<zplane rmin="1.32*cm" rmax="1.332*cm" z="6.91*cm"/>
</detector>
- <detector name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDserviceZbackward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="G10"/>
<zplane rmin = "1.542*cm" rmax="1.842*cm" z="-12.0*cm"/>
<zplane rmin = "1.455*cm" rmax="1.755*cm" z="-10.0*cm"/>
</detector>
- <detector name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="VXDserviceZforward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="G10"/>
<zplane rmin = "1.455*cm" rmax="1.755*cm" z="10.0*cm"/>
<zplane rmin = "1.542*cm" rmax="1.842*cm" z="12.0*cm"/>
</detector>
<comment>Outer Tracker Supports and Readout</comment>
- <detector name="TrackerBarrelSupports" type="MultiLayerTracker" vis="InvisibleNoDaughters">
+ <detector name="TrackerBarrelSupports" type="DD4hep_MultiLayerTracker" vis="InvisibleNoDaughters">
<comment>Barrels</comment>
<layer id="1" inner_r="206.0" outer_z="577.328">
<slice material="CarbonFiber" thickness="0.05*cm" />
@@ -1089,175 +1089,175 @@
</layer>
</detector>
<comment>Dished endcap disks</comment>
- <detector name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport1" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="510.448" rmax="510.448" z="750.417-0.001" />
<zplane rmin="504.711" rmax="510.448" z="750.919-0.001" />
<zplane rmin="206.234" rmax="211.970" z="777.034-0.001" />
<zplane rmin="206.234" rmax="206.234" z="777.535-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport2" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport2" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="510.448" rmax="510.448" z="750.919" />
<zplane rmin="438.449" rmax="510.448" z="757.218" />
<zplane rmin="206.234" rmax="278.187" z="777.535" />
<zplane rmin="206.234" rmax="206.234" z="783.834" />
</detector>
- <detector name="SiTrackerEndcapSupport3" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport3" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="510.448" rmax="510.448" z="757.218+0.001" />
<zplane rmin="504.711" rmax="510.448" z="757.720+0.001" />
<zplane rmin="206.234" rmax="211.970" z="783.834+0.001" />
<zplane rmin="206.234" rmax="206.234" z="784.336+0.001 " />
</detector>
- <detector name="SiTrackerEndcapSupport4" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport4" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="763.796" rmax="763.796" z="1014.437-0.001" />
<zplane rmin="758.059" rmax="763.796" z="1014.939-0.001" />
<zplane rmin="206.234" rmax="211.970" z="1063.219-0.001" />
<zplane rmin="206.234" rmax="206.234" z="1063.721-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport5" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport5" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="763.796" rmax="763.796" z="1014.939" />
<zplane rmin="691.797" rmax="763.796" z="1021.238" />
<zplane rmin="206.234" rmax="278.187" z="1063.721" />
<zplane rmin="206.234" rmax="206.234" z="1070.020" />
</detector>
- <detector name="SiTrackerEndcapSupport6" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport6" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="763.796" rmax="763.796" z="1021.238+0.001" />
<zplane rmin="758.059" rmax="763.796" z="1021.740+0.001" />
<zplane rmin="206.234" rmax="211.970" z="1070.020+0.001" />
<zplane rmin="206.234" rmax="206.234" z="1070.522+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport7" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport7" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1015.748" rmax="1015.748" z="1272.885-0.001" />
<zplane rmin="1010.011" rmax="1015.748" z="1273.387-0.001" />
<zplane rmin="206.234" rmax="211.970" z="1343.711-0.001" />
<zplane rmin="206.234" rmax="206.234" z="1344.213-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport8" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport8" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="1015.748" rmax="1015.748" z="1273.387" />
<zplane rmin="943.753" rmax="1015.748" z="1279.686" />
<zplane rmin="206.234" rmax="278.187" z="1344.213" />
<zplane rmin="206.234" rmax="206.234" z="1350.512" />
</detector>
- <detector name="SiTrackerEndcapSupport9" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport9" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1015.748" rmax="1015.748" z="1279.686+0.001" />
<zplane rmin="1010.011" rmax="1015.748" z="1280.188+0.001" />
<zplane rmin="206.234" rmax="211.970" z="1350.512+0.001" />
<zplane rmin="206.234" rmax="206.234" z="1351.014+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport10" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport10" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1263.808" rmax="1263.808" z="1536.560-0.001" />
<zplane rmin="1258.071" rmax="1263.808" z="1537.062-0.001" />
<zplane rmin="206.234" rmax="211.970" z="1629.089-0.001" />
<zplane rmin="206.234" rmax="206.234" z="1629.591-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport11" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport11" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="1263.808" rmax="1263.808" z="1537.062" />
<zplane rmin="1191.810" rmax="1263.808" z="1543.361" />
<zplane rmin="206.234" rmax="278.187" z="1629.591" />
<zplane rmin="206.234" rmax="206.234" z="1635.890" />
</detector>
- <detector name="SiTrackerEndcapSupport12" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport12" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1263.808" rmax="1263.808" z="1543.361+0.001" />
<zplane rmin="1258.071" rmax="1263.808" z="1543.863+0.001" />
<zplane rmin="206.234" rmax="211.970" z="1635.890+0.001" />
<zplane rmin="206.234" rmax="206.234" z="1636.392+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport1Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport1Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="510.448" rmax="510.448" z="-750.417+0.001" />
<zplane rmin="504.711" rmax="510.448" z="-750.919+0.001" />
<zplane rmin="206.234" rmax="211.970" z="-777.034+0.001" />
<zplane rmin="206.234" rmax="206.234" z="-777.535+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport2Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport2Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="510.448" rmax="510.448" z="-750.919" />
<zplane rmin="438.449" rmax="510.448" z="-757.218" />
<zplane rmin="206.234" rmax="278.187" z="-777.535" />
<zplane rmin="206.234" rmax="206.234" z="-783.834" />
</detector>
- <detector name="SiTrackerEndcapSupport3Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport3Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="510.448" rmax="510.448" z="-757.218-0.001" />
<zplane rmin="504.711" rmax="510.448" z="-757.720-0.001" />
<zplane rmin="206.234" rmax="211.970" z="-783.834-0.001" />
<zplane rmin="206.234" rmax="206.234" z="-784.336-0.001 " />
</detector>
- <detector name="SiTrackerEndcapSupport4Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport4Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="763.796" rmax="763.796" z="-1014.437+0.001" />
<zplane rmin="758.059" rmax="763.796" z="-1014.939+0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1063.219+0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1063.721+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport5Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport5Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="763.796" rmax="763.796" z="-1014.939" />
<zplane rmin="691.797" rmax="763.796" z="-1021.238" />
<zplane rmin="206.234" rmax="278.187" z="-1063.721" />
<zplane rmin="206.234" rmax="206.234" z="-1070.020" />
</detector>
- <detector name="SiTrackerEndcapSupport6Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport6Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="763.796" rmax="763.796" z="-1021.238-0.001" />
<zplane rmin="758.059" rmax="763.796" z="-1021.740-0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1070.020-0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1070.522-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport7Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport7Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1015.748" rmax="1015.748" z="-1272.885+0.001" />
<zplane rmin="1010.011" rmax="1015.748" z="-1273.387+0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1343.711+0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1344.213+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport8Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport8Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="1015.748" rmax="1015.748" z="-1273.387" />
<zplane rmin="943.753" rmax="1015.748" z="-1279.686" />
<zplane rmin="206.234" rmax="278.187" z="-1344.213" />
<zplane rmin="206.234" rmax="206.234" z="-1350.512" />
</detector>
- <detector name="SiTrackerEndcapSupport9Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport9Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1015.748" rmax="1015.748" z="-1279.686-0.001" />
<zplane rmin="1010.011" rmax="1015.748" z="-1280.188-0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1350.512-0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1351.014-0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport10Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport10Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1263.808" rmax="1263.808" z="-1536.560+0.001" />
<zplane rmin="1258.071" rmax="1263.808" z="-1537.062+0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1629.089+0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1629.591+0.001" />
</detector>
- <detector name="SiTrackerEndcapSupport11Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport11Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="Rohacell31"/>
<zplane rmin="1263.808" rmax="1263.808" z="-1537.062" />
<zplane rmin="1191.810" rmax="1263.808" z="-1543.361" />
<zplane rmin="206.234" rmax="278.187" z="-1629.591" />
<zplane rmin="206.234" rmax="206.234" z="-1635.890" />
</detector>
- <detector name="SiTrackerEndcapSupport12Reflect" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="SiTrackerEndcapSupport12Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<material name="CarbonFiber"/>
<zplane rmin="1263.808" rmax="1263.808" z="-1543.361-0.001" />
<zplane rmin="1258.071" rmax="1263.808" z="-1543.863-0.001" />
<zplane rmin="206.234" rmax="211.970" z="-1635.890-0.001" />
<zplane rmin="206.234" rmax="206.234" z="-1636.392-0.001" />
</detector>
- <detector name="TrackerReadout" type="DiskTracker" reflect="true" vis="InvisibleNoDaughters">
+ <detector name="TrackerReadout" type="DD4hep_DiskTracker" reflect="true" vis="InvisibleNoDaughters">
<comment>Readouts</comment>
<layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm">
<slice material="G10" thickness="0.057*cm" />
@@ -1281,19 +1281,19 @@
</layer>
</detector>
<comment>Masks</comment>
- <detector name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="ForwardM1" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="TungstenDens24"/>
<zplane rmin = "8.0*cm" rmax="15.5*cm" z="182.0*cm" />
<zplane rmin="13.78*cm" rmax="15.5*cm" z="313.5*cm"/>
</detector>
- <detector name="BackwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="BackwardM1" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="TungstenDens24"/>
<zplane rmin="13.78*cm" rmax="15.5*cm" z="-313.5*cm"/>
<zplane rmin = "8.0*cm" rmax="15.5*cm" z="-182.0*cm" />
</detector>
- <detector name="ForwardLowZ" type="ForwardDetector" reflect="true">
+ <detector name="ForwardLowZ" type="DD4hep_ForwardDetector" reflect="true">
<dimensions outer_r="12.39*cm" inner_r="0.0*cm" inner_z="282.0*cm" />
<beampipe crossing_angle="0.014" outgoing_r="1.2*cm" incoming_r="1.0*cm" />
<layer repeat="1">
@@ -1302,7 +1302,7 @@
</detector>
<!--<comment>Solenoid</comment>-->
- <detector name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false" vis="SolenoidCoilVis">
+ <detector name="SolenoidCoilBarrel" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false" vis="SolenoidCoilVis">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ">
<slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
<slice material="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
@@ -1316,7 +1316,7 @@
<slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
</layer>
</detector>
- <detector name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false" vis="SolenoidCoilVis">
+ <detector name="SolenoidCoilEnds" type="DD4hep_DiskTracker" reflect="true" insideTrackingVolume="false" vis="SolenoidCoilVis">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius">
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
@@ -1380,8 +1380,23 @@
</readout>
</readouts>
<fields>
- <field type="solenoid" name="GlobalSolenoid" inner_field="2.5*tesla"
+ <field type="solenoid" name="GlobalSolenoid" inner_field="2.5*tesla"
outer_field="-0.3*tesla" zmax="1000*mm"
outer_radius="SolenoidalFieldRadius" />
</fields>
+
+ <plugins>
+ <plugin name="DD4hep_SiTrackerEndcapSurfacePlugin">
+ <argument value="SiVertexEndcap"/>
+ <argument value="dimension=1"/>
+ </plugin>
+ </plugins>
+ <plugins>
+ <plugin name="DD4hep_SiTrackerBarrelSurfacePlugin">
+ <argument value="SiVertexBarrel"/>
+ <argument value="dimension=1"/>
+ </plugin>
+ <plugin name="InstallSurfaceManager"/>
+ </plugins>
+
</lccdd>