LCDetectors/detectors/sidloi2

diff -u -r1.3 -r1.4
--- compact.xml	18 Sep 2009 18:54:05 -0000	1.3
+++ compact.xml	21 Sep 2009 21:20:17 -0000	1.4
@@ -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.3 2009/09/18 18:54:05 jeremy Exp $">

+        version="$Id: compact.xml,v 1.4 2009/09/21 21:20:17 jeremy Exp $">

         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>

@@ -125,7 +125,7 @@

         <vis name="EcalEndcapVis" alpha="1.0" r="0.77" g="0.74" b="0.86" showDaughters="false" visible="true"/>
     
         <vis name="HcalBarrelVis" showDaughters="true" visible="false"/>

-        <vis name="HcalBarrelStavesVis" r="0.296875" g="0.48828125" b="0.4921875" showDaughters="false" visible="false"/>

+        <vis name="HcalBarrelStavesVis" r="0.296875" g="0.48828125" b="0.4921875" showDaughters="false" visible="true"/>

 
         <vis name="HcalEndcapVis" r="0.296875" g="0.48828125" b="0.4921875" showDaughters="false" visible="true"/>
         

@@ -526,7 +526,6 @@

                 <ring r="142.0" zstart="834" nmodules="16" dz="0.011" module="SiTrackerForwardModule3"/>
             </layer>
         </detector>

-

         <comment>Calorimeters</comment>
 
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis">

@@ -556,7 +555,6 @@

                 <slice material = "Air"     thickness = "0.033*cm" />
             </layer>
         </detector>

-

         <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" />

@@ -1189,24 +1187,24 @@

             <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
         </readout>        
         <readout name="EcalEndcapHits">

-            <segmentation type="CartesianGridXY" gridSizeX="3.5" gridSizeY="3.5" />
-            <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>

+            <segmentation type="CartesianGridXZ" gridSizeX="3.5" gridSizeZ="3.5" />
+            <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,z:-16</id>

         </readout>
         <readout name="HcalBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />
             <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
         </readout>
         <readout name="HcalEndcapHits">

-            <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />
-            <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

+            <segmentation type="CartesianGridXZ" gridSizeX="1.0*cm" gridSizeZ="1.0*cm" />
+            <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,z:-16</id>

         </readout>
         <readout name="MuonBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />
             <id>system:8,barrel:3,module:4,layer:8,slice:4,x:32:-16,y:-16</id>
         </readout>
         <readout name="MuonEndcapHits">

-            <segmentation type="CartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

+            <segmentation type="CartesianGridXZ" gridSizeX="3.0*cm" gridSizeZ="3.0*cm" />
+            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,z:-16</id>

         </readout>
         <readout name="SiTrackerForwardHits">
             <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>