--- projects/lcsim/trunk/detector-data/detectors/sidloi3/sidloi3.lcdd	2014-04-01 20:47:38 UTC (rev 3070)
+++ projects/lcsim/trunk/detector-data/detectors/sidloi3/sidloi3.lcdd	2014-04-01 20:48:35 UTC (rev 3071)
@@ -2,7 +2,7 @@

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

-    <generator name="GeomConverter" version="1.0" file="./detectors/sidloi3/compact.xml" checksum="2152839912" />

+    <generator name="GeomConverter" version="1.0" file="./compact.xml" checksum="2080707671" />

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

@@ -106,6 +106,13 @@

       <idfield signed="true" label="side" length="2" start="32" />
       <idfield signed="false" label="strip" length="20" start="34" />
     </idspec>

+    <idspec name="BeamCalHits" length="64">
+      <idfield signed="false" label="system" length="8" start="0" />
+      <idfield signed="false" label="layer" length="8" start="8" />
+      <idfield signed="false" label="barrel" length="3" start="16" />
+      <idfield signed="true" label="x" length="16" start="32" />
+      <idfield signed="true" label="y" length="16" start="48" />
+    </idspec>

     <idspec name="EcalEndcapHits" length="64">
       <idfield signed="false" label="system" length="6" start="0" />
       <idfield signed="false" label="barrel" length="3" start="6" />

@@ -115,13 +122,6 @@

       <idfield signed="true" label="x" length="16" start="32" />
       <idfield signed="true" label="y" length="16" start="48" />
     </idspec>

-    <idspec name="BeamCalHits" length="64">
-      <idfield signed="false" label="system" length="8" start="0" />
-      <idfield signed="false" label="layer" length="8" start="8" />
-      <idfield signed="false" label="barrel" length="3" start="16" />
-      <idfield signed="true" label="x" length="16" start="32" />
-      <idfield signed="true" label="y" length="16" start="48" />
-    </idspec>

   </iddict>
   <sensitive_detectors>
     <tracker name="SiTrackerEndcap" ecut="0.0" eunit="MeV" verbose="0" hits_collection="SiTrackerEndcapHits">

@@ -178,7 +178,7 @@

     </limitset>
   </limits>
   <regions>

-    <region name="TrackingRegion" store_secondaries="true" cut="10.0" lunit="mm" threshold="1.0" eunit="MeV" />

+    <region name="TrackingRegion" store_secondaries="true" kill_tracks="false" cut="10.0" lunit="mm" threshold="1.0" eunit="MeV" />

   </regions>
   <display>
     <vis name="MuonBarrelVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

@@ -212,7 +212,7 @@

       <color R="0.77" G="0.74" B="0.86" alpha="1.0" />
     </vis>
     <vis name="SiTrackerBarrelVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

-      <color R="0.8" G="1.0" B="0.1" alpha="1.0" />

+      <color R="0.9" G="0.71" B="0.35" alpha="1.0" />

     </vis>
     <vis name="LumiCalVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">
       <color R="0.5" G="0.5" B="0.5" alpha="1.0" />

@@ -245,30 +245,30 @@

       <rotation name="reflect_rot" x="3.141592653589793" y="0.0" z="0.0" unit="radian" />
       <position name="identity_pos" x="0.0" y="0.0" z="0.0" unit="mm" />
       <constant name="world_side" value="30000.0" />

-      <constant name="tracking_region_radius" value="1264.0" />
-      <constant name="SolenoidBarrelInnerAirgapThickness" value="110.0" />
-      <constant name="EcalBarrel_rmin" value="1265.0" />
-      <constant name="SolenoidBarrelInnerRadius" value="2591.0" />
-      <constant name="SolenoidCoilOuterZ" value="2693.0" />
-      <constant name="SolenoidBarrelOuterCryostatThickness" value="40.0" />
-      <constant name="VXD_CF_support" value="0.5" />
-      <constant name="SolenoidBarrelConductorInnerRadius" value="2731.0" />
-      <constant name="SolenoidEndcapCryostatThickness" value="50.0" />

+      <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="3165.0" />

       <constant name="SolenoidEndcapAirgapThickness" value="190.0" />

-      <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="3165.0" />

       <constant name="SolenoidBarrelOuterRadius" value="3392.0" />
       <constant name="EcalEndcap_zmin" value="1657.0" />

+      <constant name="SolenoidBarrelInnerAirgapThickness" value="110.0" />
+      <constant name="tracking_region_radius" value="1264.0" />

       <constant name="bp_cone_slope" value="0.04341258741258742" />
       <constant name="world_y" value="30000.0" />
       <constant name="world_z" value="30000.0" />
       <constant name="SolenoidBarrelQuenchbackThickness" value="50.0" />

+      <constant name="world_x" value="30000.0" />

       <constant name="VXD_CF_sensor" value="0.26" />

-      <constant name="world_x" value="30000.0" />

+      <constant name="EcalBarrel_rmin" value="1265.0" />
+      <constant name="SolenoidBarrelInnerRadius" value="2591.0" />
+      <constant name="SolenoidCoilOuterZ" value="2693.0" />
+      <constant name="SolenoidBarrelOuterAirgapThickness" value="187.0" />
+      <constant name="SolenoidBarrelInnerCryostatThickness" value="30.0" />

       <constant name="SolenoidBarrelOuterZ" value="2933.0" />

-      <constant name="SolenoidBarrelInnerCryostatThickness" value="30.0" />
-      <constant name="SolenoidBarrelOuterAirgapThickness" value="187.0" />

+      <constant name="SolenoidBarrelOuterCryostatThickness" value="40.0" />

       <constant name="SolenoidalFieldRadius" value="2923.0" />

+      <constant name="SolenoidBarrelConductorInnerRadius" value="2731.0" />
+      <constant name="VXD_CF_support" value="0.5" />

       <constant name="tracking_region_zmax" value="1656.0" />

+      <constant name="SolenoidEndcapCryostatThickness" value="50.0" />

       <constant name="SolenoidBarrelAlConductorThickness" value="384.0" />
       <position name="Module1Volume_component0_position" x="0.0" y="-1.5058999999999998" z="0.0" unit="mm" />
       <rotation name="Module1Volume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />

@@ -6573,9 +6573,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" />

@@ -6834,9 +6834,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" />

@@ -23143,7 +23143,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" />

@@ -23890,9 +23890,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" />

@@ -24494,35 +24494,35 @@

       <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 name="W" formula="W" Z="74.0">
-        <atom type="A" unit="g/mol" value="183.84" />

+      <element Z="74" formula="W" name="W">
+        <atom type="A" unit="g/mol" value="183.842" />

       </element>

-      <element name="Ni" formula="Ni" Z="28.0">
-        <atom type="A" unit="g/mol" value="58.6934" />

+      <element Z="28" formula="Ni" name="Ni">
+        <atom type="A" unit="g/mol" value="58.6933" />

       </element>

-      <element name="Fe" formula="Fe" Z="26.0">
-        <atom type="A" unit="g/mol" value="55.845" />

+      <element Z="26" formula="Fe" name="Fe">
+        <atom type="A" unit="g/mol" value="55.8451" />

       </element>

-      <element name="C" formula="C" Z="6.0">

+      <element Z="6" formula="C" name="C">

         <atom type="A" unit="g/mol" value="12.0107" />
       </element>

-      <element name="H" formula="H" Z="1.0">

+      <element Z="1" formula="H" name="H">

         <atom type="A" unit="g/mol" value="1.00794" />
       </element>

-      <element name="O" formula="O" Z="8.0">

+      <element Z="8" formula="O" name="O">

         <atom type="A" unit="g/mol" value="15.9994" />
       </element>

-      <element name="N" formula="N" Z="7.0">
-        <atom type="A" unit="g/mol" value="14.00674" />

+      <element Z="7" formula="N" name="N">
+        <atom type="A" unit="g/mol" value="14.0068" />

       </element>

-      <element name="B" formula="B" Z="5.0">

+      <element Z="5" formula="B" name="B">

         <atom type="A" unit="g/mol" value="10.811" />
       </element>

-      <element name="Si" formula="Si" Z="14.0">
-        <atom type="A" unit="g/mol" value="28.0855" />

+      <element Z="14" formula="Si" name="Si">
+        <atom type="A" unit="g/mol" value="28.0854" />

       </element>
       <material name="TungstenDens23">
         <D value="17.7" unit="g/cm3" type="density" />

@@ -24592,11 +24592,13 @@

         <D value="0.186" unit="g/cm3" type="density" />
         <fraction n="1.0" ref="SiliconCarbide" />
       </material>

-      <element name="Cu" formula="Cu" Z="29.0">
-        <atom type="A" unit="g/mol" value="63.546" />

+      <element name="Cu" formula="Cu" Z="29">
+        <atom type="A" unit="g/mol" value="63.5456" />

       </element>
       <material name="Copper">

-        <D type="density" unit="g/cm3" value="8.933" />

+        <RL type="X0" unit="cm" value="1.43558" />
+        <NIL type="lambda" unit="cm" value="15.5141" />
+        <D type="density" unit="g/cm3" value="8.96" />

         <composite n="1" ref="Cu" />
       </material>
       <material name="Vacuum">

@@ -24611,7 +24613,9 @@

         <composite n="5" ref="O" />
       </material>
       <material name="Silicon">

-        <D type="density" unit="g/cm3" value="2.3296" />

+        <RL type="X0" unit="cm" value="9.36607" />
+        <NIL type="lambda" unit="cm" value="45.7531" />
+        <D type="density" unit="g/cm3" value="2.33" />

         <composite n="1" ref="Si" />
       </material>
       <material name="CarbonFiber_50D">

@@ -24626,8 +24630,8 @@

         <composite n="2" ref="O" />
         <composite n="1" ref="N" />
       </material>

-      <element name="Ar" formula="Ar" Z="18.0">
-        <atom type="A" unit="g/mol" value="39.948" />

+      <element name="Ar" formula="Ar" Z="18">
+        <atom type="A" unit="g/mol" value="39.9477" />

       </element>
       <material name="Air">
         <D type="density" unit="g/cm3" value="0.0012" />

@@ -24650,16 +24654,16 @@

         <composite n="2" ref="B" />
         <composite n="3" ref="O" />
       </material>

-      <element name="Na" formula="Na" Z="11.0">
-        <atom type="A" unit="g/mol" value="22.98977" />

+      <element name="Na" formula="Na" Z="11">
+        <atom type="A" unit="g/mol" value="22.9898" />

       </element>
       <material name="SodiumOxide">
         <D type="density" value="2.65" unit="g/cm3" />
         <composite n="2" ref="Na" />
         <composite n="1" ref="O" />
       </material>

-      <element name="Al" formula="Al" Z="13.0">
-        <atom type="A" unit="g/mol" value="26.981538" />

+      <element name="Al" formula="Al" Z="13">
+        <atom type="A" unit="g/mol" value="26.9815" />

       </element>
       <material name="AluminumOxide">
         <D type="density" value="3.89" unit="g/cm3" />

@@ -24673,8 +24677,8 @@

         <fraction n="0.040" ref="SodiumOxide" />
         <fraction n="0.023" ref="AluminumOxide" />
       </material>

-      <element name="F" formula="F" Z="9.0">
-        <atom type="A" unit="g/mol" value="18.9984032" />

+      <element name="F" formula="F" Z="9">
+        <atom type="A" unit="g/mol" value="18.9984" />

       </element>
       <material name="RPCGasDefault">
         <D type="density" value="0.0037" unit="g/cm3" />

@@ -24682,8 +24686,8 @@

         <composite n="239" ref="H" />
         <composite n="381" ref="F" />
       </material>

-      <element name="Cl" formula="Cl" Z="17.0">
-        <atom type="A" unit="g/mol" value="35.4527" />

+      <element name="Cl" formula="Cl" Z="17">
+        <atom type="A" unit="g/mol" value="35.4526" />

       </element>
       <material name="Quartz">
         <D type="density" value="2.2" unit="g/cm3" />

@@ -24696,19 +24700,25 @@

         <fraction n="0.773" ref="Quartz" />
         <fraction n="0.147" ref="Epoxy" />
       </material>

-      <element name="Be" formula="Be" Z="4.0">
-        <atom type="A" unit="g/mol" value="9.012182" />

+      <element name="Be" formula="Be" Z="4">
+        <atom type="A" unit="g/mol" value="9.01218" />

       </element>
       <material name="Beryllium">

-        <D type="density" unit="g/cm3" value="1.85" />

+        <RL type="X0" unit="cm" value="35.276" />
+        <NIL type="lambda" unit="cm" value="39.4488" />
+        <D type="density" unit="g/cm3" value="1.848" />

         <composite n="1" ref="Be" />
       </material>
       <material name="Aluminum">

-        <D type="density" unit="g/cm3" value="2.7" />

+        <RL type="X0" unit="cm" value="8.89632" />
+        <NIL type="lambda" unit="cm" value="38.8766" />
+        <D type="density" unit="g/cm3" value="2.699" />

         <composite n="1" ref="Al" />
       </material>
       <material name="Iron">

-        <D type="density" unit="g/cm3" value="7.875" />

+        <RL type="X0" unit="cm" value="1.75749" />
+        <NIL type="lambda" unit="cm" value="16.959" />
+        <D type="density" unit="g/cm3" value="7.874" />

         <composite n="1" ref="Fe" />
       </material>
       <material name="PEEK">

@@ -24717,11 +24727,13 @@

         <composite n="12" ref="H" />
         <composite n="3" ref="O" />
       </material>

-      <element name="Ti" formula="Ti" Z="22.0">
-        <atom type="A" unit="g/mol" value="47.867" />

+      <element name="Ti" formula="Ti" Z="22">
+        <atom type="A" unit="g/mol" value="47.8667" />

       </element>
       <material name="Titanium">

-        <D type="density" unit="g/cm3" value="4.5" />

+        <RL type="X0" unit="cm" value="3.5602" />
+        <NIL type="lambda" unit="cm" value="27.9395" />
+        <D type="density" unit="g/cm3" value="4.54" />

         <composite n="1" ref="Ti" />
       </material>
     </materials>

@@ -25399,8 +25411,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" />

@@ -36842,7 +36854,7 @@

           <rotationref ref="identity_rot" />
           <physvolid field_name="sensor" value="0" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiVertexBarrelVis" />

       </volume>
       <volume name="SiVertexBarrel_VtxBarrelModuleOuter_component0">
         <materialref ref="CarbonFiber_25percent" />

@@ -36889,7 +36901,7 @@

           <rotationref ref="identity_rot" />
           <physvolid field_name="sensor" value="0" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiVertexBarrelVis" />

       </volume>
       <volume name="SiVertexBarrel_layer1">
         <materialref ref="Air" />

@@ -36966,7 +36978,6 @@

           <rotationref ref="SiVertexBarrel_layer1_phi11_z0_rotation" />
           <physvolid field_name="module" value="11" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiVertexBarrel_layer2">
         <materialref ref="Air" />

@@ -37043,7 +37054,6 @@

           <rotationref ref="SiVertexBarrel_layer2_phi11_z0_rotation" />
           <physvolid field_name="module" value="11" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiVertexBarrel_layer3">
         <materialref ref="Air" />

@@ -37156,7 +37166,6 @@

           <rotationref ref="SiVertexBarrel_layer3_phi17_z0_rotation" />
           <physvolid field_name="module" value="17" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiVertexBarrel_layer4">
         <materialref ref="Air" />

@@ -37305,7 +37314,6 @@

           <rotationref ref="SiVertexBarrel_layer4_phi23_z0_rotation" />
           <physvolid field_name="module" value="23" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiVertexBarrel_layer5">
         <materialref ref="Air" />

@@ -37490,7 +37498,6 @@

           <rotationref ref="SiVertexBarrel_layer5_phi29_z0_rotation" />
           <physvolid field_name="module" value="29" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="HcalEndcap_layer0_slice0_volume">
         <materialref ref="Steel235" />

@@ -39821,7 +39828,7 @@

           <positionref ref="SiTrackerBarrel_SiTrackerModule_Layer1_component8_position" />
           <rotationref ref="identity_rot" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiTrackerBarrelVis" />

       </volume>
       <volume name="SiTrackerBarrel_SiTrackerModule_Layer2_component0">
         <materialref ref="PEEK" />

@@ -39918,7 +39925,7 @@

           <positionref ref="SiTrackerBarrel_SiTrackerModule_Layer2_component8_position" />
           <rotationref ref="identity_rot" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiTrackerBarrelVis" />

       </volume>
       <volume name="SiTrackerBarrel_SiTrackerModule_Layer3_component0">
         <materialref ref="PEEK" />

@@ -40015,7 +40022,7 @@

           <positionref ref="SiTrackerBarrel_SiTrackerModule_Layer3_component8_position" />
           <rotationref ref="identity_rot" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiTrackerBarrelVis" />

       </volume>
       <volume name="SiTrackerBarrel_SiTrackerModule_Layer4_component0">
         <materialref ref="PEEK" />

@@ -40112,7 +40119,7 @@

           <positionref ref="SiTrackerBarrel_SiTrackerModule_Layer4_component8_position" />
           <rotationref ref="identity_rot" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiTrackerBarrelVis" />

       </volume>
       <volume name="SiTrackerBarrel_SiTrackerModule_Layer5_component0">
         <materialref ref="PEEK" />

@@ -40209,7 +40216,7 @@

           <positionref ref="SiTrackerBarrel_SiTrackerModule_Layer5_component8_position" />
           <rotationref ref="identity_rot" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

+        <visref ref="SiTrackerBarrelVis" />

       </volume>
       <volume name="SiTrackerBarrel_layer1">
         <materialref ref="Air" />

@@ -41774,7 +41781,6 @@

           <rotationref ref="SiTrackerBarrel_layer1_phi19_z12_rotation" />
           <physvolid field_name="module" value="259" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiTrackerBarrel_layer2">
         <materialref ref="Air" />

@@ -45655,7 +45661,6 @@

           <rotationref ref="SiTrackerBarrel_layer2_phi37_z16_rotation" />
           <physvolid field_name="module" value="645" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiTrackerBarrel_layer3">
         <materialref ref="Air" />

@@ -53664,7 +53669,6 @@

           <rotationref ref="SiTrackerBarrel_layer3_phi57_z22_rotation" />
           <physvolid field_name="module" value="1333" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiTrackerBarrel_layer4">
         <materialref ref="Air" />

@@ -67589,7 +67593,6 @@

           <rotationref ref="SiTrackerBarrel_layer4_phi79_z28_rotation" />
           <physvolid field_name="module" value="2319" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="SiTrackerBarrel_layer5">
         <materialref ref="Air" />

@@ -89014,7 +89017,6 @@

           <rotationref ref="SiTrackerBarrel_layer5_phi101_z34_rotation" />
           <physvolid field_name="module" value="3569" />
         </physvol>

-        <visref ref="InvisibleWithDaughters" />

       </volume>
       <volume name="BackwardM1_envelope_volume">
         <materialref ref="TungstenDens24" />