Commit 48e1cf7d authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fixed the compound detector which needs to be first.

- The compound subdetector  assembly needs to be defined before the
  named detectors.
parent 8ab32df9
......@@ -134,6 +134,17 @@
<detectors>
<detector id="SiTrackerSubAssembly_ID"
name="SiTrackerSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SiTrackerSubAssemblyVis">
<!--<shape name="SiTrackerVolume" type="Tube" rmin="SiliconTrackerMinR1" rmax="SiliconTrackerOuterRadius" dz="SiliconTrackerOuterBarrelLength/2.0 + 6*SiliconTrackerEndMod3RingDz" material="Air"/>
-->
<composite name="SiTrackerEndcapN"/>
<composite name="SiTrackerBarrel"/>
<composite name="SiTrackerEndcapP"/>
</detector>
<comment>
Si Tracker Barrel
Thiks barrel type was modified to have large modules.
......@@ -846,16 +857,6 @@
</layer>
</detector>
<detector id="SiTrackerSubAssembly_ID"
name="SiTrackerSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SiTrackerSubAssemblyVis">
<!--<shape name="SiTrackerVolume" type="Tube" rmin="SiliconTrackerMinR1" rmax="SiliconTrackerOuterRadius" dz="SiliconTrackerOuterBarrelLength/2.0 + 6*SiliconTrackerEndMod3RingDz" material="Air"/>
-->
<composite name="SiTrackerEndcapN"/>
<composite name="SiTrackerBarrel"/>
<composite name="SiTrackerEndcapP"/>
</detector>
</detectors>
<readouts>
......
......@@ -35,6 +35,17 @@
</detector>
-->
<detector id="SiVertexSubAssembly_ID"
name="SiVertexSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SiTrackerSubAssemblyVis">
<!--<shape name="SiTrackerVolume" type="Tube" rmin="SiliconTrackerMinR1" rmax="SiliconTrackerOuterRadius" dz="SiliconTrackerOuterBarrelLength/2.0 + 6*SiliconTrackerEndMod3RingDz" material="Air"/>
<composite name="SiTrackerEndcapN"/>
<composite name="SiTrackerEndcapP"/>
-->
<composite name="SiVertexBarrel"/>
</detector>
<detector
id="SiVertexBarrel_ID"
name="SiVertexBarrel"
......@@ -139,17 +150,6 @@
-->
</detector>
<detector id="SiVertexSubAssembly_ID"
name="SiVertexSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SiTrackerSubAssemblyVis">
<!--<shape name="SiTrackerVolume" type="Tube" rmin="SiliconTrackerMinR1" rmax="SiliconTrackerOuterRadius" dz="SiliconTrackerOuterBarrelLength/2.0 + 6*SiliconTrackerEndMod3RingDz" material="Air"/>
<composite name="SiTrackerEndcapN"/>
<composite name="SiTrackerEndcapP"/>
-->
<composite name="SiVertexBarrel"/>
</detector>
</detectors>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment