Print

Print


Commit in LCDetectors/detectors/sid01_polyhedra on MAIN
compact.xml+14-261.8 -> 1.9
sid01_polyhedra.lcdd+7544-148421.11 -> 1.12
+7558-14868
2 modified files
JM: New ID scheme.

LCDetectors/detectors/sid01_polyhedra
compact.xml 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- compact.xml	26 Jan 2007 22:07:48 -0000	1.8
+++ compact.xml	15 May 2007 20:25:53 -0000	1.9
@@ -8,7 +8,7 @@
 	author="Jeremy McCormick"
 	url="http://confluence.slac.stanford.edu/display/ilc/sid01"
 	status="development"
-	version="$Id: compact.xml,v 1.8 2007/01/26 22:07:48 jeremy Exp $">
+	version="$Id: compact.xml,v 1.9 2007/05/15 20:25:53 jeremy Exp $">
     <comment>Preliminary version of Sid01 with polyhedra calorimeters.  NOTE:  Needs thorough overlap check.</comment>
   </info>
 
@@ -53,14 +53,14 @@
   </materials>
 
   <display>
-    <vis name="EMVis" r="0.42" g="0.137" b="0.55" alpha="1.0" showDaughters="true" drawingStyle="wireframe" visible="true"/>
-    <vis name="HADVis" r="0.44" g="0.86" b="0.86" alpha="1.0" showDaughters="true" drawingStyle="wireframe" visible="true"/>
-    <vis name="MuonVis" r="0.666666666667" g="0.666666666667" b="1.0" alpha="1.0" showDaughters="true" drawingStyle="wireframe" visible="true"/>
-    <vis name="CoilVis" r="0.713725490196" g="0.686274509804" b="0.662745098039" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
-    <vis name="VertexVis" r="1.0" g="1.0" b="0.0" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
-    <vis name="TrackerVis" r="0.803921568627" g="0.678431372549" b="0.0" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true" />
-    <vis name="FwdDeadVis" r="0.709803921569" g="0.313725490196" b="0.611764705882" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
-    <vis name="FwdVis" r="0.890196078431" g="0.658823529412" b="0.411764705882" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="EMVis" r="0.42" g="0.137" b="0.55" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
+    <vis name="HADVis" r="0.44" g="0.86" b="0.86" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
+    <vis name="MuonVis" r="0.666666666667" g="0.666666666667" b="1.0" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
+    <vis name="CoilVis" r="0.713725490196" g="0.686274509804" b="0.662745098039" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
+    <vis name="VertexVis" r="1.0" g="1.0" b="0.0" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="true"/>
+    <vis name="TrackerVis" r="0.803921568627" g="0.678431372549" b="0.0" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="true" />
+    <vis name="FwdDeadVis" r="0.709803921569" g="0.313725490196" b="0.611764705882" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
+    <vis name="FwdVis" r="0.890196078431" g="0.658823529412" b="0.411764705882" alpha="1.0" showDaughters="true" drawingStyle="solid" visible="false"/>
   </display>
 
   <detectors>
@@ -127,22 +127,22 @@
       </layer>
     </detector>
 
-<!--
     <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false" vis="CoilVis">
       <layer id="1" inner_r="250.0*cm + SolenoidBarrel_gap" outer_z="(271.0) * cm">
 	<slice material="Steel235" thickness="6.0*cm" />
 	<slice material="Air" thickness="8.5*cm" />
       </layer>
-      <layer id="2" inner_r="264.5*cm" outer_z="262.5*cm">
+      <layer id="2" inner_r="264.5*cm + SolenoidBarrel_gap" outer_z="262.5*cm">
 	<slice material="Aluminum" thickness="39.3*cm" />
 	<slice material="Steel235" thickness="6.0*cm" />
       </layer>
-      <layer id="3" inner_r="309.8*cm" outer_z="271.0*cm">
+      <layer id="3" inner_r="309.8*cm + SolenoidBarrel_gap" outer_z="271.0*cm">
 	<slice material="Air" thickness="20.0*cm" />
 	<slice material="Steel235" thickness="3.0*cm" />
       </layer>
     </detector>
 
+<!--
     <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false" vis="CoilVis">
       <layer id="1" inner_r="250.0*cm + SolenoidCoilEnd_gap" inner_z="271.0*cm" outer_r="332.8*cm">
 	<slice material="Steel235" thickness="6.0*cm" />
@@ -919,12 +919,6 @@
       <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id>
     </readout>
 
-<!--
-    <readout name="TkrBarrHits">
-      <id>system:8,layer:8,barrel:3</id>
-    </readout>
--->
-
     <readout name="TkrEndcapHits">
       <id>system:8,layer:8,barrel:3</id>
     </readout>
@@ -933,22 +927,16 @@
       <id>system:8,layer:8,barrel:3</id>
     </readout>
 
-<!--
-    <readout name="VtxBarrHits">
-      <id>system:8,layer:8,barrel:3</id>
-    </readout>
--->
-
     <readout name="VtxEndcapHits">
       <id>system:8,layer:8,barrel:3</id>
     </readout>
 
     <readout name="TrackerBarrelHits">
-      <id>system:6,barrel:2,layer:4,phi:8,z:8,sensor:1</id>
+      <id>system:6,barrel:3,layer:4,module:12,sensor:1</id>
     </readout>
 
     <readout name="VtxBarrelHits">
-      <id>system:6,barrel:2,layer:4,phi:8,z:8,sensor:1</id>
+      <id>system:6,barrel:3,layer:4,module:12,sensor:1</id>
     </readout>
 
   </readouts>

LCDetectors/detectors/sid01_polyhedra
sid01_polyhedra.lcdd 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- sid01_polyhedra.lcdd	26 Jan 2007 22:07:48 -0000	1.11
+++ sid01_polyhedra.lcdd	15 May 2007 20:25:53 -0000	1.12
@@ -2,18 +2,17 @@
 <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="sid01_polyhedra" />
-    <generator name="GeomConverter" version="1.0" file="./detectors/sid01_polyhedra/compact.xml" checksum="183480954" />
+    <generator name="GeomConverter" version="1.0" file="./detectors/sid01_polyhedra/compact.xml" checksum="369411329" />
     <author name="NONE" />
     <comment>Preliminary version of Sid01 with polyhedra calorimeters. NOTE: Needs thorough overlap check.</comment>
   </header>
   <iddict>
-    <idspec name="VtxBarrelHits" length="29">
+    <idspec name="VtxBarrelHits" length="26">
       <idfield signed="false" label="system" length="6" start="0" />
-      <idfield signed="false" label="barrel" length="2" start="6" />
-      <idfield signed="false" label="layer" length="4" start="8" />
-      <idfield signed="false" label="phi" length="8" start="12" />
-      <idfield signed="false" label="z" length="8" start="20" />
-      <idfield signed="false" label="sensor" length="1" start="28" />
+      <idfield signed="false" label="barrel" length="3" start="6" />
+      <idfield signed="false" label="layer" length="4" start="9" />
+      <idfield signed="false" label="module" length="12" start="13" />
+      <idfield signed="false" label="sensor" length="1" start="25" />
     </idspec>
     <idspec name="LuminosityMonitorHits" length="64">
       <idfield signed="false" label="system" length="8" start="0" />
@@ -27,13 +26,12 @@
       <idfield signed="false" label="layer" length="8" start="8" />
       <idfield signed="false" label="barrel" length="3" start="16" />
     </idspec>
-    <idspec name="TrackerBarrelHits" length="29">
+    <idspec name="TrackerBarrelHits" length="26">
       <idfield signed="false" label="system" length="6" start="0" />
-      <idfield signed="false" label="barrel" length="2" start="6" />
-      <idfield signed="false" label="layer" length="4" start="8" />
-      <idfield signed="false" label="phi" length="8" start="12" />
-      <idfield signed="false" label="z" length="8" start="20" />
-      <idfield signed="false" label="sensor" length="1" start="28" />
+      <idfield signed="false" label="barrel" length="3" start="6" />
+      <idfield signed="false" label="layer" length="4" start="9" />
+      <idfield signed="false" label="module" length="12" start="13" />
+      <idfield signed="false" label="sensor" length="1" start="25" />
     </idspec>
     <idspec name="MuonBarrelHits" length="52">
       <idfield signed="false" label="layer" length="8" start="0" />
@@ -154,28 +152,28 @@
     <vis name="InvisibleNoDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="false" visible="false">
       <color R="1.0" G="1.0" B="1.0" alpha="1.0" />
     </vis>
-    <vis name="HADVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">
+    <vis name="HADVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.44" G="0.86" B="0.86" alpha="1.0" />
     </vis>
-    <vis name="FwdDeadVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">
+    <vis name="FwdDeadVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.709803921569" G="0.313725490196" B="0.611764705882" alpha="1.0" />
     </vis>
-    <vis name="VertexVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">
+    <vis name="VertexVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="true">
       <color R="1.0" G="1.0" B="0.0" alpha="1.0" />
     </vis>
-    <vis name="FwdVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">
+    <vis name="FwdVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.890196078431" G="0.658823529412" B="0.411764705882" alpha="1.0" />
     </vis>
-    <vis name="MuonVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">
+    <vis name="MuonVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.666666666667" G="0.666666666667" B="1.0" alpha="1.0" />
     </vis>
-    <vis name="EMVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">
+    <vis name="EMVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.42" G="0.137" B="0.55" alpha="1.0" />
     </vis>
-    <vis name="TrackerVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">
+    <vis name="TrackerVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="true">
       <color R="0.803921568627" G="0.678431372549" B="0.0" alpha="1.0" />
     </vis>
-    <vis name="CoilVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">
+    <vis name="CoilVis" line_style="unbroken" drawing_style="solid" show_daughters="true" visible="false">
       <color R="0.713725490196" G="0.686274509804" B="0.662745098039" alpha="1.0" />
     </vis>
     <vis name="WorldVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">
@@ -408,7 +406,6 @@
       <position name="EMBarrel_module10_position" x="1044.9270458984206" y="849.0584675097467" z="0.0" unit="mm" />
       <rotation name="EMBarrel_module11_rotation" x="1.5707963267948966" y="6.021385919380437" z="0.0" unit="radian" />
       <position name="EMBarrel_module11_position" x="480.40413309458665" y="1257.7697251109355" z="0.0" unit="mm" />
-      <rotation name="EMEndcap_rotation" x="0.0" y="0.0" z="0.2617993877991494" unit="radian" />
       <position name="EMEndcap_stave_layer0_position" x="0.0" y="81.39499999999994" z="0.0" unit="mm" />
       <position name="EMEndcap_stave_layer0_slice0_position" x="0.0" y="0.4999999999999998" z="0.0" unit="mm" />
       <position name="EMEndcap_stave_layer0_slice1_position" x="0.0" y="-1.0150000000000001" z="0.0" unit="mm" />
@@ -1106,7 +1103,6 @@
       <position name="ForwardLowZ_layer0_subtraction2_pos" x="-203.33221782880787" y="0.0" z="0.0" unit="mm" />
       <position name="ForwardLowZ_layer0_slice0_subtraction1_pos" x="203.33221782880787" y="0.0" z="0.0" unit="mm" />
       <position name="ForwardLowZ_layer0_slice0_subtraction2_pos" x="-203.33221782880787" y="0.0" z="0.0" unit="mm" />
-      <rotation name="MuonEndcap_rotation" x="0.0" y="0.0" z="0.39269908169872414" unit="radian" />
       <position name="MuonEndcap_stave_layer0_position" x="0.0" y="1550.4999999999948" z="0.0" unit="mm" />
       <position name="MuonEndcap_stave_layer0_slice0_position" x="0.0" y="7.5" z="0.0" unit="mm" />
       <position name="MuonEndcap_stave_layer0_slice1_position" x="0.0" y="-19.0" z="0.0" unit="mm" />
@@ -16458,7 +16454,6 @@
       <rotation name="TrackerBarrel_layer4_phi89_z35_rotation" x="1.5707963267948966" y="4.850025810304924" z="0.0" unit="radian" />
       <position name="TrackerBarrel_layer4_phi89_z36_position" x="1226.3168570664734" y="-64.27259193938356" z="1580.9999999999993" unit="mm" />
       <rotation name="TrackerBarrel_layer4_phi89_z36_rotation" x="1.5707963267948966" y="4.850025810304924" z="0.0" unit="radian" />
-      <rotation name="HADEndcap_rotation" x="0.0" y="0.0" z="0.2617993877991494" unit="radian" />
       <position name="HADEndcap_stave_layer0_position" x="0.0" y="478.0000000000011" z="0.0" unit="mm" />
       <position name="HADEndcap_stave_layer0_slice0_position" x="0.0" y="4.000000000000002" z="0.0" unit="mm" />
       <position name="HADEndcap_stave_layer0_slice1_position" x="0.0" y="-7.499999999999998" z="0.0" unit="mm" />
@@ -16757,13 +16752,13 @@
         <atom type="A" unit="g/mol" value="55.845" />
       </element>
       <material name="TungstenDens23">
-        <D value="17.7" unit="g/cm3" />
+        <D value="17.7" unit="g/cm3" type="density" />
         <fraction n="0.925" ref="W" />
         <fraction n="0.066" ref="Ni" />
         <fraction n="0.009" ref="Fe" />
       </material>
       <material name="TungstenDens25">
-        <D value="18.2" unit="g/cm3" />
+        <D value="18.2" unit="g/cm3" type="density" />
         <fraction n="0.950" ref="W" />
         <fraction n="0.044" ref="Ni" />
         <fraction n="0.006" ref="Fe" />
@@ -16920,6 +16915,10 @@
         <composite n="2" ref="O" />
         <composite n="1" ref="N" />
       </material>
+      <material name="Aluminum">
+        <D type="density" unit="g/cm3" value="2.7" />
+        <composite n="1" ref="Al" />
+      </material>
     </materials>
     <solids>
       <box name="world_box" x="world_x" y="world_y" z="world_z" />
@@ -18181,6 +18180,15 @@
         <positionref ref="ForwardLowZ_layer0_slice0_subtraction2_pos" />
         <rotationref ref="ForwardLowZ_subtraction2_tube_rot" />
       </subtraction>
+      <tube name="SolenoidCoilBarrel_layer0_slice0" deltaphi="6.283185307179586" rmin="2510.0" z="5420.0" rmax="2570.0" />
+      <tube name="SolenoidCoilBarrel_layer0_slice1" deltaphi="6.283185307179586" rmin="2570.0" z="5420.0" rmax="2655.0" />
+      <tube name="SolenoidCoilBarrel_layer0" deltaphi="6.283185307179586" rmin="2510.0" z="5420.0" rmax="2655.0" />
+      <tube name="SolenoidCoilBarrel_layer1_slice0" deltaphi="6.283185307179586" rmin="2655.0" z="5250.0" rmax="3048.0" />
+      <tube name="SolenoidCoilBarrel_layer1_slice1" deltaphi="6.283185307179586" rmin="3048.0" z="5250.0" rmax="3108.0" />
+      <tube name="SolenoidCoilBarrel_layer1" deltaphi="6.283185307179586" rmin="2655.0" z="5250.0" rmax="3108.0" />
+      <tube name="SolenoidCoilBarrel_layer2_slice0" deltaphi="6.283185307179586" rmin="3108.0" z="5420.0" rmax="3308.0" />
+      <tube name="SolenoidCoilBarrel_layer2_slice1" deltaphi="6.283185307179586" rmin="3308.0" z="5420.0" rmax="3338.0" />
+      <tube name="SolenoidCoilBarrel_layer2" deltaphi="6.283185307179586" rmin="3108.0" z="5420.0" rmax="3338.0" />
       <trd name="MuonEndcap_stave_trapezoid" y2="3167.9999999999895" y1="3167.9999999999895" z="6240.0" x1="205.39105243400942" x2="5383.060582097697" />
       <trd name="MuonEndcap_stave_layer0_trapezoid" x1="204.39105243400942" x2="5382.060582097697" y1="65.0" y2="65.0" z="6239.0" />
       <trd name="MuonEndcap_stave_layer0_slice0_trapezoid" x1="203.39105243400942" x2="5381.060582097697" y1="49.99" y2="49.99" z="6238.0" />
@@ -31346,85 +31354,73 @@
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi0_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi0_z0_rotation" />
-          <physvolid field_name="phi" value="0" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi1_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi1_z0_rotation" />
-          <physvolid field_name="phi" value="1" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi2_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi2_z0_rotation" />
-          <physvolid field_name="phi" value="2" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="2" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi3_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi3_z0_rotation" />
-          <physvolid field_name="phi" value="3" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi4_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi4_z0_rotation" />
-          <physvolid field_name="phi" value="4" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="4" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi5_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi5_z0_rotation" />
-          <physvolid field_name="phi" value="5" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="5" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi6_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi6_z0_rotation" />
-          <physvolid field_name="phi" value="6" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="6" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi7_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi7_z0_rotation" />
-          <physvolid field_name="phi" value="7" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="7" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi8_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi8_z0_rotation" />
-          <physvolid field_name="phi" value="8" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="8" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi9_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi9_z0_rotation" />
-          <physvolid field_name="phi" value="9" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="9" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi10_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi10_z0_rotation" />
-          <physvolid field_name="phi" value="10" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="10" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleInner" />
           <positionref ref="VtxBarrel_layer0_phi11_z0_position" />
           <rotationref ref="VtxBarrel_layer0_phi11_z0_rotation" />
-          <physvolid field_name="phi" value="11" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="11" />
         </physvol>
         <visref ref="InvisibleWithDaughters" />
       </volume>
@@ -31435,85 +31431,73 @@
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi0_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi0_z0_rotation" />
-          <physvolid field_name="phi" value="0" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi1_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi1_z0_rotation" />
-          <physvolid field_name="phi" value="1" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi2_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi2_z0_rotation" />
-          <physvolid field_name="phi" value="2" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="2" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi3_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi3_z0_rotation" />
-          <physvolid field_name="phi" value="3" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi4_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi4_z0_rotation" />
-          <physvolid field_name="phi" value="4" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="4" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi5_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi5_z0_rotation" />
-          <physvolid field_name="phi" value="5" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="5" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi6_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi6_z0_rotation" />
-          <physvolid field_name="phi" value="6" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="6" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi7_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi7_z0_rotation" />
-          <physvolid field_name="phi" value="7" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="7" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi8_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi8_z0_rotation" />
-          <physvolid field_name="phi" value="8" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="8" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi9_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi9_z0_rotation" />
-          <physvolid field_name="phi" value="9" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="9" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi10_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi10_z0_rotation" />
-          <physvolid field_name="phi" value="10" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="10" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer1_phi11_z0_position" />
           <rotationref ref="VtxBarrel_layer1_phi11_z0_rotation" />
-          <physvolid field_name="phi" value="11" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="11" />
         </physvol>
         <visref ref="InvisibleWithDaughters" />
       </volume>
@@ -31524,127 +31508,109 @@
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi0_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi0_z0_rotation" />
-          <physvolid field_name="phi" value="0" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi1_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi1_z0_rotation" />
-          <physvolid field_name="phi" value="1" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi2_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi2_z0_rotation" />
-          <physvolid field_name="phi" value="2" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="2" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi3_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi3_z0_rotation" />
-          <physvolid field_name="phi" value="3" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi4_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi4_z0_rotation" />
-          <physvolid field_name="phi" value="4" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="4" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi5_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi5_z0_rotation" />
-          <physvolid field_name="phi" value="5" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="5" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi6_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi6_z0_rotation" />
-          <physvolid field_name="phi" value="6" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="6" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi7_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi7_z0_rotation" />
-          <physvolid field_name="phi" value="7" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="7" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi8_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi8_z0_rotation" />
-          <physvolid field_name="phi" value="8" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="8" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi9_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi9_z0_rotation" />
-          <physvolid field_name="phi" value="9" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="9" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi10_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi10_z0_rotation" />
-          <physvolid field_name="phi" value="10" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="10" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi11_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi11_z0_rotation" />
-          <physvolid field_name="phi" value="11" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="11" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi12_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi12_z0_rotation" />
-          <physvolid field_name="phi" value="12" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="12" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi13_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi13_z0_rotation" />
-          <physvolid field_name="phi" value="13" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="13" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi14_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi14_z0_rotation" />
-          <physvolid field_name="phi" value="14" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="14" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi15_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi15_z0_rotation" />
-          <physvolid field_name="phi" value="15" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="15" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi16_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi16_z0_rotation" />
-          <physvolid field_name="phi" value="16" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="16" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer2_phi17_z0_position" />
           <rotationref ref="VtxBarrel_layer2_phi17_z0_rotation" />
-          <physvolid field_name="phi" value="17" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="17" />
         </physvol>
         <visref ref="InvisibleWithDaughters" />
       </volume>
@@ -31655,169 +31621,145 @@
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi0_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi0_z0_rotation" />
-          <physvolid field_name="phi" value="0" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi1_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi1_z0_rotation" />
-          <physvolid field_name="phi" value="1" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi2_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi2_z0_rotation" />
-          <physvolid field_name="phi" value="2" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="2" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi3_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi3_z0_rotation" />
-          <physvolid field_name="phi" value="3" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi4_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi4_z0_rotation" />
-          <physvolid field_name="phi" value="4" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="4" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi5_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi5_z0_rotation" />
-          <physvolid field_name="phi" value="5" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="5" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi6_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi6_z0_rotation" />
-          <physvolid field_name="phi" value="6" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="6" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi7_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi7_z0_rotation" />
-          <physvolid field_name="phi" value="7" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="7" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi8_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi8_z0_rotation" />
-          <physvolid field_name="phi" value="8" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="8" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi9_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi9_z0_rotation" />
-          <physvolid field_name="phi" value="9" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="9" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi10_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi10_z0_rotation" />
-          <physvolid field_name="phi" value="10" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="10" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi11_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi11_z0_rotation" />
-          <physvolid field_name="phi" value="11" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="11" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi12_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi12_z0_rotation" />
-          <physvolid field_name="phi" value="12" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="12" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi13_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi13_z0_rotation" />
-          <physvolid field_name="phi" value="13" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="13" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi14_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi14_z0_rotation" />
-          <physvolid field_name="phi" value="14" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="14" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi15_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi15_z0_rotation" />
-          <physvolid field_name="phi" value="15" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="15" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi16_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi16_z0_rotation" />
-          <physvolid field_name="phi" value="16" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="16" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi17_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi17_z0_rotation" />
-          <physvolid field_name="phi" value="17" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="17" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi18_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi18_z0_rotation" />
-          <physvolid field_name="phi" value="18" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="18" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi19_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi19_z0_rotation" />
-          <physvolid field_name="phi" value="19" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="19" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi20_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi20_z0_rotation" />
-          <physvolid field_name="phi" value="20" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="20" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi21_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi21_z0_rotation" />
-          <physvolid field_name="phi" value="21" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="21" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi22_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi22_z0_rotation" />
-          <physvolid field_name="phi" value="22" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="22" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer3_phi23_z0_position" />
           <rotationref ref="VtxBarrel_layer3_phi23_z0_rotation" />
-          <physvolid field_name="phi" value="23" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="23" />
         </physvol>
         <visref ref="InvisibleWithDaughters" />
       </volume>
@@ -31828,211 +31770,181 @@
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi0_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi0_z0_rotation" />
-          <physvolid field_name="phi" value="0" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi1_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi1_z0_rotation" />
-          <physvolid field_name="phi" value="1" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi2_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi2_z0_rotation" />
-          <physvolid field_name="phi" value="2" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="2" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi3_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi3_z0_rotation" />
-          <physvolid field_name="phi" value="3" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi4_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi4_z0_rotation" />
-          <physvolid field_name="phi" value="4" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="4" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi5_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi5_z0_rotation" />
-          <physvolid field_name="phi" value="5" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="5" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi6_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi6_z0_rotation" />
-          <physvolid field_name="phi" value="6" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="6" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi7_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi7_z0_rotation" />
-          <physvolid field_name="phi" value="7" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="7" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi8_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi8_z0_rotation" />
-          <physvolid field_name="phi" value="8" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="8" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi9_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi9_z0_rotation" />
-          <physvolid field_name="phi" value="9" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="9" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi10_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi10_z0_rotation" />
-          <physvolid field_name="phi" value="10" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="10" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi11_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi11_z0_rotation" />
-          <physvolid field_name="phi" value="11" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="11" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi12_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi12_z0_rotation" />
-          <physvolid field_name="phi" value="12" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="12" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi13_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi13_z0_rotation" />
-          <physvolid field_name="phi" value="13" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="13" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi14_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi14_z0_rotation" />
-          <physvolid field_name="phi" value="14" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="14" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi15_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi15_z0_rotation" />
-          <physvolid field_name="phi" value="15" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="15" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi16_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi16_z0_rotation" />
-          <physvolid field_name="phi" value="16" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="16" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi17_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi17_z0_rotation" />
-          <physvolid field_name="phi" value="17" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="17" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi18_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi18_z0_rotation" />
-          <physvolid field_name="phi" value="18" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="18" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi19_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi19_z0_rotation" />
-          <physvolid field_name="phi" value="19" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="19" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi20_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi20_z0_rotation" />
-          <physvolid field_name="phi" value="20" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="20" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi21_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi21_z0_rotation" />
-          <physvolid field_name="phi" value="21" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="21" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi22_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi22_z0_rotation" />
-          <physvolid field_name="phi" value="22" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="22" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi23_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi23_z0_rotation" />
-          <physvolid field_name="phi" value="23" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="23" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi24_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi24_z0_rotation" />
-          <physvolid field_name="phi" value="24" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="24" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi25_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi25_z0_rotation" />
-          <physvolid field_name="phi" value="25" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="25" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi26_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi26_z0_rotation" />
-          <physvolid field_name="phi" value="26" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="26" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi27_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi27_z0_rotation" />
-          <physvolid field_name="phi" value="27" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="27" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi28_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi28_z0_rotation" />
-          <physvolid field_name="phi" value="28" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="28" />
         </physvol>
         <physvol>
           <volumeref ref="VtxBarrel_VtxBarrelModuleOuter" />
           <positionref ref="VtxBarrel_layer4_phi29_z0_position" />
           <rotationref ref="VtxBarrel_layer4_phi29_z0_rotation" />
-          <physvolid field_name="phi" value="29" />
-          <physvolid field_name="z" value="0" />
+          <physvolid field_name="module" value="29" />
         </physvol>
         <visref ref="InvisibleWithDaughters" />
       </volume>
@@ -32638,6 +32550,87 @@
         </physvol>
         <visref ref="FwdDeadVis" />
       </volume>
+      <volume name="SolenoidCoilBarrel_layer0_slice0_volume">
+        <materialref ref="Steel235" />
+        <solidref ref="SolenoidCoilBarrel_layer0_slice0" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer0_slice1_volume">
+        <materialref ref="Air" />
+        <solidref ref="SolenoidCoilBarrel_layer0_slice1" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer0_volume">
+        <materialref ref="Air" />
+        <solidref ref="SolenoidCoilBarrel_layer0" />
+        <physvol>
+          <volumeref ref="SolenoidCoilBarrel_layer0_slice0_volume" />
+          <positionref ref="identity_pos" />
+          <rotationref ref="identity_rot" />
+          <physvolid field_name="layer" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="SolenoidCoilBarrel_layer0_slice1_volume" />
+          <positionref ref="identity_pos" />
+          <rotationref ref="identity_rot" />
+          <physvolid field_name="layer" value="0" />
+        </physvol>
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer1_slice0_volume">
+        <materialref ref="Aluminum" />
+        <solidref ref="SolenoidCoilBarrel_layer1_slice0" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer1_slice1_volume">
+        <materialref ref="Steel235" />
+        <solidref ref="SolenoidCoilBarrel_layer1_slice1" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer1_volume">
+        <materialref ref="Air" />
+        <solidref ref="SolenoidCoilBarrel_layer1" />
+        <physvol>
+          <volumeref ref="SolenoidCoilBarrel_layer1_slice0_volume" />
+          <positionref ref="identity_pos" />
+          <rotationref ref="identity_rot" />
+          <physvolid field_name="layer" value="1" />
+        </physvol>
+        <physvol>
+          <volumeref ref="SolenoidCoilBarrel_layer1_slice1_volume" />
+          <positionref ref="identity_pos" />
+          <rotationref ref="identity_rot" />
+          <physvolid field_name="layer" value="1" />
+        </physvol>
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer2_slice0_volume">
+        <materialref ref="Air" />
+        <solidref ref="SolenoidCoilBarrel_layer2_slice0" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer2_slice1_volume">
+        <materialref ref="Steel235" />
+        <solidref ref="SolenoidCoilBarrel_layer2_slice1" />
+        <visref ref="CoilVis" />
+      </volume>
+      <volume name="SolenoidCoilBarrel_layer2_volume">
+        <materialref ref="Air" />
+        <solidref ref="SolenoidCoilBarrel_layer2" />
[truncated at 1000 lines; 58551 more skipped]
CVSspam 0.2.8