Commit in GeomConverter/testResources/org/lcsim/geometry on MAIN
GeometryReaderTest.xml+10-101.1 -> 1.2
sidloi3_compact.xml+14-141.1 -> 1.2
subdetector/PolyhedraBarrelCalorimeter2Test.xml+1-201.3 -> 1.4
+25-44
3 modified files
corrections to test case geometry ids
GeomConverter/testResources/org/lcsim/geometry
GeometryReaderTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- GeometryReaderTest.xml	12 Sep 2007 18:24:31 -0000	1.1
+++ GeometryReaderTest.xml	17 Nov 2010 00:01:28 -0000	1.2
@@ -174,40 +174,40 @@

   <readouts>
          <readout name="MuonBarrHits"> 
              <segmentation type="ProjectiveCylinder" thetaBins="150" phiBins="300"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="MuonEndcapHits"> 
              <segmentation type="ProjectiveZPlane" thetaBins="150" phiBins="300"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="LumEndcapHits"> 
              <segmentation type="ProjectiveZPlane" thetaBins="600" phiBins="1200"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="HcalEndcapHits"> 
              <segmentation type="ProjectiveZPlane" thetaBins="600" phiBins="1200"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="HcalBarrHits"> 
              <segmentation type="ProjectiveCylinder" thetaBins="600" phiBins="1200"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="EcalEndcapHits"> 
            <segmentation type="ProjectiveZPlane" thetaBins="840" phiBins="1680"/>

-           <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+           <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

         </readout>
          <readout name="EcalBarrHits"> 
              <segmentation type="ProjectiveCylinder" thetaBins="840" phiBins="1680"/>

-             <id>layer:7,system:3,barrel:3,theta:32:11,phi:11</id>

+             <id>layer:7,system:4,barrel:3,theta:32:11,phi:11</id>

          </readout>
          <readout name="TkrBarrHits"> 

-             <id>layer:10,system:3,barrel:3</id>

+             <id>layer:10,system:4,barrel:3</id>

          </readout>
          <readout name="TkrEndcapHits"> 

-             <id>layer:10,system:3,barrel:3</id>

+             <id>layer:10,system:4,barrel:3</id>

          </readout>
          <readout name="VtxBarrHits"> 

-             <id>layer:10,system:3,barrel:3</id>

+             <id>layer:10,system:4,barrel:3</id>

          </readout>
    </readouts>
    <fields>
GeomConverter/testResources/org/lcsim/geometry
sidloi3_compact.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- sidloi3_compact.xml	9 Dec 2009 01:24:28 -0000	1.1
+++ sidloi3_compact.xml	17 Nov 2010 00:01:28 -0000	1.2
@@ -6,7 +6,7 @@

         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"

-        version="$Id: sidloi3_compact.xml,v 1.1 2009/12/09 01:24:28 jeremy Exp $">

+        version="$Id: sidloi3_compact.xml,v 1.2 2010/11/17 00:01:28 jeremy Exp $">

         <comment>The compact format for the Silicon Detector as described in the LOI 090204.  Includes global XY segmentation in cal endcaps.  -JM</comment>        
     </info>
     <define>

@@ -1115,51 +1115,51 @@

     </detectors>
     <readouts>
         <readout name="SiTrackerEndcapHits">

-            <id>system:6,barrel:3,layer:4,module:16,sensor:1,side:32:-2,strip:20</id>

+            <id>system:4,barrel:2,layer:4,module:16,sensor:2,side:32:-2,strip:20</id>

         </readout>        
         <readout name="SiTrackerBarrelHits">

-            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:20</id>

+            <id>system:4,barrel:2,layer:4,module:16,sensor:2,side:32:-2,strip:20</id>

         </readout>
         <readout name="SiVertexBarrelHits">

-            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:24</id>

+            <id>system:4,barrel:2,layer:4,module:16,sensor:2,side:32:-2,strip:24</id>

         </readout>
         <readout name="SiVertexEndcapHits">

-            <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:24</id>

+            <id>system:4,barrel:2,layer:4,wedge:6,module:16,sensor:2,side:32:-2,strip:24</id>

         </readout>
         <readout name="EcalBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="3.5" gridSizeY="3.5" />

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

+            <id>system:4,barrel:2,module:4,layer:6,slice:5,x:32:-16,y:-16</id>

         </readout>        
         <readout name="EcalEndcapHits">
             <segmentation type="GlobalGridXY" gridSizeX="3.5" gridSizeY="3.5" />

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

+            <id>system:4,barrel:2,module:4,layer:6,slice:5,x:32:-16,y:-16</id>

         </readout>
         <readout name="HcalBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />

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

+            <id>system:4,barrel:2,module:4,layer:6,slice:5,x:32:-16,y:-16</id>

         </readout>
         <readout name="HcalEndcapHits">
             <segmentation type="GlobalGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />

-            <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

+            <id>system:4,barrel:2,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

         </readout>
         <readout name="MuonBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />

-            <id>system:8,barrel:3,module:4,layer:8,slice:4,x:32:-16,y:-16</id>

+            <id>system:4,barrel:2,module:4,layer:8,slice:4,x:32:-16,y:-16</id>

         </readout>
         <readout name="MuonEndcapHits">
             <segmentation type="GlobalGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" />

-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

+            <id>system:4,barrel:2,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

         </readout>
         <readout name="SiTrackerForwardHits">

-            <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:24</id>

+            <id>system:4,barrel:2,layer:4,wedge:6,module:16,sensor:2,side:32:-2,strip:24</id>

         </readout>
         <readout name="LumiCalHits">
             <segmentation type="GridXYZ" gridSizeX="0.35*cm" gridSizeY="0.35*cm" />

-            <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id>

+            <id>system:4,layer:8,barrel:2,x:32:-16,y:-16</id>

         </readout>
         <readout name="BeamCalHits">
             <segmentation type="GridXYZ" gridSizeX="0.35*cm" gridSizeY="0.35*cm" />

-            <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id>

+            <id>system:4,layer:8,barrel:3,x:32:-16,y:-16</id>

         </readout>
     </readouts>
     <fields>
GeomConverter/testResources/org/lcsim/geometry/subdetector
PolyhedraBarrelCalorimeter2Test.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PolyhedraBarrelCalorimeter2Test.xml	3 May 2010 18:01:40 -0000	1.3
+++ PolyhedraBarrelCalorimeter2Test.xml	17 Nov 2010 00:01:28 -0000	1.4
@@ -25,21 +25,6 @@

   </materials>
 
   <detectors>

-<!--
-    <detector id="1"
-              name="PolyhedraBarrelCalorimeterSubdet"
-              type="PolyhedraBarrelCalorimeter2"
-              readout="CalHits"
-              gap="50.0"
-              material="Silicon">
-         <dimensions numsides="8" z="1000.0" rmin="500.0"/>
-         <layer repeat="30">
-           <slice material="Silicon" thickness="5.0" sensitive="yes" />
-           <slice material="Tungsten" thickness="10.0" sensitive="yes" />
-         </layer>
-    </detector>
--->
-

     <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" calorimeterType="HAD_BARREL" gap="2.*cm" material="Steel235">
             <comment>Hadron Calorimeter Barrel</comment>
             <dimensions numsides="12" rmin="1404.0" z="3688.0 * 2"/>

@@ -55,13 +40,9 @@

   </detectors>
 
   <readouts>

-    <readout name="CalHits">
-      <segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0" />
-      <id>system:6,barrel:3,module:5,layer:8,slice:5,x:32:-10,y:-10</id>
-    </readout>

     <readout name="HcalBarrelHits">
             <segmentation type="CartesianGridXY" gridSizeX="1.0*cm" gridSizeY="1.0*cm" />

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

+            <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>

         </readout>
   </readouts>
CVSspam 0.2.8