Commit 36268359 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Revert "Fixed the compound detector which needs to be first."

This reverts commit 48e1cf7d.
parent cf9d9693
......@@ -193,12 +193,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
++ring_num;
}
}
// hack to get around the way ACTS defines pos/neg endcaps based on zposition
Position final_pos(0,0,0);
if(reflect) {
final_pos = Position(0,0,-1.0e-9);
}
pv = motherVol.placeVolume(assembly,final_pos);
pv = motherVol.placeVolume(assembly);
pv.addPhysVolID("system",det_id);
sdet.setPlacement(pv);
return sdet;
......
......@@ -134,17 +134,6 @@
<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.
......@@ -857,6 +846,16 @@
</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,17 +35,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>
<detector
id="SiVertexBarrel_ID"
name="SiVertexBarrel"
......@@ -150,6 +139,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>
</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