LCDetectors/detectors/sidloi
diff -u -r1.32 -r1.33
--- compact.xml 17 Apr 2009 22:32:50 -0000 1.32
+++ compact.xml 1 Sep 2009 21:48:39 -0000 1.33
@@ -6,7 +6,7 @@
author="Norman Graf, Jeremy McCormick"
url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
status="development"
- version="$Id: compact.xml,v 1.32 2009/04/17 22:32:50 jeremy Exp $">
+ version="$Id: compact.xml,v 1.33 2009/09/01 21:48:39 jeremy Exp $">
<comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>
</info>
<define>
@@ -151,7 +151,6 @@
</display>
<detectors>
-
<comment>Trackers</comment>
<detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
@@ -558,8 +557,8 @@
<slice material = "Air" thickness = "0.033*cm" />
</layer>
</detector>
-
- <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis">
+
+ <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis">
<comment>EM Calorimeter Endcaps</comment>
<dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="200.0" rmax="1264.5" />
<layer repeat="1">
@@ -585,7 +584,6 @@
<slice material = "Air" thickness = "0.033*cm" />
</layer>
</detector>
-
<detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis">
<comment>Hadron Calorimeter Barrel</comment>
<dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
@@ -600,7 +598,7 @@
</layer>
</detector>
- <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis">
+ <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter" readout="HcalEndcapHits" vis="HcalEndcapVis">
<comment>Hadron Calorimeter Endcaps</comment>
<dimensions numsides="12" zmin="1805.0" rmin="200.0" rmax="1469.0" />
<layer repeat="45">
@@ -612,7 +610,6 @@
<slice material = "Air" thickness = "0.16*cm" />
</layer>
</detector>
-
<detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits" vis="MuonBarrelVis">
<comment>Muon Calorimeter Barrel</comment>
<dimensions numsides="8" rmin="3464.0" z="3018.0 * 2"/>
@@ -637,7 +634,7 @@
</layer>
</detector>
- <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis">
+ <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis">
<comment>Muon Calorimeter Endcaps</comment>
<dimensions numsides="8" zmin="3028.0" rmin="200.0" rmax="6082.0" />
<layer repeat="11" vis="MuonEndcapLayerVis">
@@ -1174,7 +1171,7 @@
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
</detector>
-
+
</detectors>
<readouts>
<readout name="SiTrackerEndcapHits">
@@ -1191,7 +1188,7 @@
</readout>
<readout name="EcalBarrelHits">
<segmentation type="GridXYZ" gridSizeX="3.5" gridSizeY="3.5" />
- <id>layer:8,system:6,barrel:3,module:4,slice:6,x:32:-15,y:-15</id>
+ <id>layer:8,system:6,barrel:3,module:4,slice:6,x:32:-16,y:-16</id>
</readout>
<readout name="EcalEndcapHits">
<segmentation type="GridXYZ" gridSizeX="3.5" gridSizeY="3.5" />
@@ -1199,7 +1196,7 @@
</readout>
<readout name="HcalBarrelHits">
<segmentation type="GridXYZ" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />
- <id>layer:8,system:6,barrel:3,x:32:-10,y:-10</id>
+ <id>layer:8,system:6,barrel:3,module:4,x:32:-16,y:-16</id>
</readout>
<readout name="HcalEndcapHits">
<segmentation type="GridXYZ" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />