diff -u -r1.1 -r1.2
--- sidloi3_scint.lcdd	9 Feb 2012 08:54:14 -0000	1.1
+++ sidloi3_scint.lcdd	17 Apr 2012 13:01:35 -0000	1.2
@@ -2,9 +2,9 @@

 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="sidloi3_scint" />

-    <generator name="GeomConverter" version="1.0" file="compact.xml" checksum="2868980323" />
-    <author name="Norman Graf, Jeremy McCormick" />
-    <comment>The compact format for the Silicon Detector as described in the LOI 090204. Includes global XY segmentation in cal endcaps.</comment>

+    <generator name="GeomConverter" version="1.0" file="compact.xml" checksum="3905344912" />
+    <author name="Norman Graf, Jeremy McCormick, Jan Strube" />
+    <comment>The compact format for the Silicon Detector as described in the LOI 090204, with a scintillator hcal instead of RPC. Includes global XY segmentation in cal endcaps.</comment>

   </header>
   <iddict>
     <idspec name="SiVertexEndcapHits" length="58">

@@ -6493,9 +6493,9 @@

       <position name="MuonBarrel_stave0_module7_position" x="-4419.839683533997" y="1830.7575404345866" z="0.0" unit="mm" />
       <rotation name="MuonBarrel_stave0_module7_rotation" x="1.5707963267948966" y="-5.105088062083413" z="0.0" unit="radian" />
       <position name="ForwardLowZ_subtraction1_tube_pos" x="20.19532985813189" y="0.0" z="0.0" unit="mm" />

-      <rotation name="ForwardLowZ_subtraction1_tube_rot" x="0.0" y="0.0070" z="0.0" unit="radian" />

+      <rotation name="ForwardLowZ_subtraction1_tube_rot" x="0.0" y="0.007" z="0.0" unit="radian" />

       <position name="ForwardLowZ_subtraction2_tube_pos" x="-20.19532985813189" y="0.0" z="0.0" unit="mm" />

-      <rotation name="ForwardLowZ_subtraction2_tube_rot" x="0.0" y="-0.0070" z="0.0" unit="radian" />

+      <rotation name="ForwardLowZ_subtraction2_tube_rot" x="0.0" y="-0.007" z="0.0" unit="radian" />

       <position name="ForwardLowZ_layer0_subtraction1_pos" x="20.19532985813189" y="0.0" z="0.0" unit="mm" />
       <position name="ForwardLowZ_layer0_subtraction2_pos" x="-20.19532985813189" y="0.0" z="0.0" unit="mm" />
       <position name="ForwardLowZ_layer0_slice0_subtraction1_pos" x="20.19532985813189" y="0.0" z="0.0" unit="mm" />

@@ -6752,9 +6752,9 @@

       <rotation name="HcalEndcap_positive" x="0.0" y="0.0" z="0.2617993877991494" unit="radian" />
       <rotation name="HcalEndcap_negative" x="3.141592653589793" y="0.0" z="0.2617993877991494" unit="radian" />
       <position name="NorthOutgoingBeampipe_position" x="21.299999999999997" y="0.0" z="3042.7" />

-      <rotation name="NorthOutgoingBeampipe_rotation" x="0.0" y="-0.0070" z="0.0" />

+      <rotation name="NorthOutgoingBeampipe_rotation" x="0.0" y="-0.007" z="0.0" />

       <position name="NorthIncomingBeampipe_position" x="-21.299999999999997" y="0.0" z="3042.7" />

-      <rotation name="NorthIncomingBeampipe_rotation" x="0.0" y="0.0070" z="0.0" />

+      <rotation name="NorthIncomingBeampipe_rotation" x="0.0" y="0.007" z="0.0" />

       <position name="SiTrackerBarrel_SiTrackerModule_Layer1_component0_position" x="0.0" y="0.0" z="-1.4000000000000001" unit="mm" />
       <position name="SiTrackerBarrel_SiTrackerModule_Layer1_component1_position" x="0.0" y="0.0" z="-1.22" unit="mm" />
       <position name="SiTrackerBarrel_SiTrackerModule_Layer1_component2_position" x="0.0" y="0.0" z="-0.24" unit="mm" />

@@ -23061,7 +23061,7 @@

       <position name="SiTrackerBarrel_layer5_phi101_z34_position" x="1220.1648547832451" y="-53.90513126579148" z="1476.496999999999" unit="mm" />
       <rotation name="SiTrackerBarrel_layer5_phi101_z34_rotation" x="1.5707963267948966" y="4.782909124431939" z="0.0" unit="radian" />
       <position name="SouthIncomingBeampipe_position" x="-21.299999999999997" y="0.0" z="-3042.7" />

-      <rotation name="SouthIncomingBeampipe_rotation" x="0.0" y="-0.0070" z="0.0" />

+      <rotation name="SouthIncomingBeampipe_rotation" x="0.0" y="-0.007" z="0.0" />

       <position name="MuonEndcap_layer0_slice0_position" x="0.0" y="0.0" z="-20.0" unit="mm" />
       <position name="MuonEndcap_layer0_slice1_position" x="0.0" y="0.0" z="80.5" unit="mm" />
       <position name="MuonEndcap_layer0_slice2_position" x="0.0" y="0.0" z="82.75" unit="mm" />

@@ -23808,9 +23808,9 @@

       <rotation name="EcalBarrel_module11_rotation" x="1.5707963267948966" y="-5.497787143782138" z="0.0" unit="radian" />
       <position name="EcalBarrel_module11_position" x="-845.5229336038146" y="1041.3915119924875" z="0.0" unit="mm" />
       <position name="BeamCal_subtraction1_tube_pos" x="21.299597894568738" y="0.0" z="0.0" unit="mm" />

-      <rotation name="BeamCal_subtraction1_tube_rot" x="0.0" y="0.0070" z="0.0" unit="radian" />

+      <rotation name="BeamCal_subtraction1_tube_rot" x="0.0" y="0.007" z="0.0" unit="radian" />

       <position name="BeamCal_subtraction2_tube_pos" x="-21.299597894568738" y="0.0" z="0.0" unit="mm" />

-      <rotation name="BeamCal_subtraction2_tube_rot" x="0.0" y="-0.0070" z="0.0" unit="radian" />

+      <rotation name="BeamCal_subtraction2_tube_rot" x="0.0" y="-0.007" z="0.0" unit="radian" />

       <position name="BeamCal_layer0_subtraction1_pos" x="20.66332250203671" y="0.0" z="0.0" unit="mm" />
       <position name="BeamCal_layer0_subtraction2_pos" x="-20.66332250203671" y="0.0" z="0.0" unit="mm" />
       <position name="BeamCal_layer0_slice0_subtraction1_pos" x="20.659822444868922" y="0.0" z="0.0" unit="mm" />

@@ -24412,7 +24412,7 @@

       <position name="BeamCal_layer49_slice4_subtraction1_pos" x="21.947703480327885" y="0.0" z="0.0" unit="mm" />
       <position name="BeamCal_layer49_slice4_subtraction2_pos" x="-21.947703480327885" y="0.0" z="0.0" unit="mm" />
       <position name="SouthOutgoingBeampipe_position" x="21.299999999999997" y="0.0" z="-3042.7" />

-      <rotation name="SouthOutgoingBeampipe_rotation" x="0.0" y="0.0070" z="0.0" />

+      <rotation name="SouthOutgoingBeampipe_rotation" x="0.0" y="0.007" z="0.0" />

     </define>
     <materials>
       <element Z="74" formula="W" name="W">

@@ -25254,8 +25254,8 @@

       <tube name="VertexReadout_layer6" deltaphi="6.283185307179586" rmin="22.61" z="0.031" rmax="35.4" />
       <tube name="VertexReadout_layer7_slice0" deltaphi="6.283185307179586" rmin="35.41" z="0.016" rmax="48.0" />
       <tube name="VertexReadout_layer7" deltaphi="6.283185307179586" rmin="35.41" z="0.016" rmax="48.0" />

-      <tube name="VertexReadout_layer8_slice0" deltaphi="6.283185307179586" rmin="48.010000000000005" z="0.0070" rmax="60.4" />
-      <tube name="VertexReadout_layer8" deltaphi="6.283185307179586" rmin="48.010000000000005" z="0.0070" rmax="60.4" />

+      <tube name="VertexReadout_layer8_slice0" deltaphi="6.283185307179586" rmin="48.010000000000005" z="0.007" rmax="60.4" />
+      <tube name="VertexReadout_layer8" deltaphi="6.283185307179586" rmin="48.010000000000005" z="0.007" rmax="60.4" />

       <tube name="VertexReadout_layer9_slice0" deltaphi="6.283185307179586" rmin="13.0" z="2.0" rmax="13.99" />
       <tube name="VertexReadout_layer9" deltaphi="6.283185307179586" rmin="13.0" z="2.0" rmax="13.99" />
       <tube name="VertexReadout_layer10_slice0" deltaphi="6.283185307179586" rmin="15.0" z="2.0" rmax="15.99" />