GeomConverter/testResources/org/lcsim/geometry/subdetector

diff -u -r1.3 -r1.4
--- PolyhedraEndcapCalorimeter3Test.xml	28 Sep 2010 22:18:05 -0000	1.3
+++ PolyhedraEndcapCalorimeter3Test.xml	29 Sep 2010 22:33:42 -0000	1.4
@@ -1,68 +1,41 @@

-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
-       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
-
-  <info name="PolyhedraEndcapCalorimeterTest">
-    <comment>Test of org.lcsim.geometry.subdetector.PolyhedraEndcapCalorimeter class.</comment>
-  </info>
-
-  <!-- Constants -->
-  <define>
-    <constant name="cm" value="10"/>
-
-    <!-- world -->
-    <constant name="world_side" value="30000" />
-    <constant name="world_x" value="world_side" />
-    <constant name="world_y" value="world_side" />
-    <constant name="world_z" value="world_side" />
-
-    <!-- tracking region -->
-    <constant name="tracking_region_radius" value="499.0"/>
-    <constant name="tracking_region_zmax" value="999.0"/>
-  </define>
-
-  <materials>
-  </materials>
-
-  <display>   
-  </display>
-
-  <detectors>
-    <detector id="1" 
-              name="PolyhedraEndcapCalorimeterTest" 
-              type="PolyhedraEndcapCalorimeter3" 
-              readout="CalHits"
-              reflect="true">
-         <dimensions numsides="12" zmin="50.0" rmin="500.0" rmax="1000.0" angle="10.*deg" />
-         <layer repeat="10" vis="LayerVis">
-           <slice material="Silicon" thickness="10.0" sensitive="yes" />
-           <slice material="Tungsten" thickness="50.0" sensitive="no" />
-         </layer>
-    </detector>
-  </detectors>
-
-  <readouts>
-<!--
-    <readout name="CalHits">
-      <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />
-      <id>system:6,barrel:3,layer:8,slice:5,x:32:-16,y:-16</id>
-    </readout>
--->
-
-    <readout name="CalHits">
-      <segmentation type="GlobalGridXY" gridSizeX="3.5" gridSizeY="3.5" />
-      <id>system:6,barrel:3,layer:8,x:32:-16,y:-16</id>
-    </readout>
-
-  </readouts>
-  
-  <fields>
-<!--
-    <field type="Solenoid" name="GlobalSolenoid"
-              inner_field="5.0"
-              outer_field="-0.6"
-              zmax="1000"
-              outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  
--->
-   </fields>
-</lccdd>

+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+  <info name="PolyhedraEndcapCalorimeter3Test"/>
+
+  <define>
+    <constant name="cm" value="10"/>
+
+    <constant name="world_side" value="30000" />
+    <constant name="world_x" value="world_side" />
+    <constant name="world_y" value="world_side" />
+    <constant name="world_z" value="world_side" />
+
+    <constant name="tracking_region_radius" value="499.0"/>
+    <constant name="tracking_region_zmax" value="999.0"/>
+  </define>
+
+  <materials/>
+
+  <detectors>
+    <detector id="1" 
+              name="PolyhedraEndcapCalorimeterTest" 
+              type="PolyhedraEndcapCalorimeter3" 
+              readout="CalHits"
+              reflect="true">
+         <dimensions numsides="4" zmin="50.0" rmin="500.0" rmax="1000.0" angle="10.*deg" />
+         <layer repeat="30">
+           <slice material="Silicon" thickness="10.0" sensitive="yes" />
+           <slice material="Tungsten" thickness="40.0" sensitive="no" vis="AbsorberVis" />
+         </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="CalHits">
+      <segmentation type="GlobalGridXY" gridSizeX="1.0" gridSizeY="1.0" />
+      <id>layer:8,system:6,barrel:3,slice:4,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+</lccdd>