GeomConverter/test/org/lcsim/geometry/subdetector

diff -u -r1.3 -r1.4
--- TestBeamCalorimeterTest.xml	16 Feb 2006 00:57:14 -0000	1.3
+++ TestBeamCalorimeterTest.xml	6 Sep 2007 10:02:18 -0000	1.4
@@ -43,7 +43,7 @@

   <readouts>
          <readout name="CalHits">
            <segmentation type="GridXYZ" gridSizeX="10.0" gridSizeY="10.0" />

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

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

         </readout>
    </readouts>
     <fields>

GeomConverter/test/org/lcsim/geometry/subdetector

diff -u -r1.3 -r1.4
--- TestBeamTrackerTest.xml	16 Feb 2006 00:57:14 -0000	1.3
+++ TestBeamTrackerTest.xml	6 Sep 2007 10:02:18 -0000	1.4
@@ -42,7 +42,7 @@

 
   <readouts>
         <readout name="TrackerHits">

-            <id>layer:7,system:3</id>

+            <id>system:3,barrel:2,layer:7</id>

         </readout>
    </readouts>
     <fields>

GeomConverter/test/org/lcsim/geometry/subdetector

diff -u -r1.2 -r1.3
--- subdetectors.xml	17 Sep 2006 01:05:44 -0000	1.2
+++ subdetectors.xml	6 Sep 2007 10:02:18 -0000	1.3
@@ -109,43 +109,43 @@

 	<readouts>
 		<readout name="CylindricalEndcapCalorimeter_RO">
 			<segmentation type="ProjectiveZPlane" thetaBins="1024" phiBins="1024"/>

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

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

 		</readout>
 		<readout name="EcalBarrel_RO">
 			<segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0"/>

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

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

 		</readout>
 		<readout name="ForwardDetector_RO">
 			<segmentation type="GridXYZ" gridSizeX="10.0" gridSizeY="10.0"/>

-			<id>layer:7,system:3,barrel:3,x:32:11,y:11</id>

+			<id>system:6,barrel:3,layer:7,x:32:11,y:11</id>

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

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

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

 		</readout>
 		<readout name="MultiLayerTracker_RO">

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

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

 		</readout>
 		<readout name="DiskTracker_RO">

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

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

 		</readout>
 		<readout name="PolyhedraBarrelCalorimeter_RO">
 			<segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0"/>

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

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

 		</readout>
 		<readout name="PolyhedraEndcapCalorimeter_RO">
 			<segmentation type="GridXYZ" gridSizeX="1.0" gridSizeZ="1.0"/>

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

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

 		</readout>
 		<readout name="TPC_RO">

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

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

 		</readout>
 		<readout name="TestBeamCalorimeter_RO">
 			<segmentation type="GridXYZ" gridSizeX="1.0" gridSizeY="1.0"/>

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

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

 		</readout>
 		<readout name="TestBeamTracker_RO">

-			<id>layer:7,system:3</id>

+			<id>system:6,barrel:3,layer:7</id>

 		</readout>
 	</readouts>
 	<fields>