Commit in GeomConverter/test/org/lcsim/geometry/subdetector on MAIN
CylindricalCalorimeterTest.xml+2-21.3 -> 1.4
EcalBarrelTest.xml+1-11.3 -> 1.4
LayeredSubdetectorTest.xml+2-21.1 -> 1.2
PolyhedraBarrelCalorimeterTest.xml+2-21.4 -> 1.5
PolyhedraEndcapCalorimeterTest.xml+2-21.1 -> 1.2
TPCTest.xml+2-21.2 -> 1.3
TestBeamCalorimeterTest.xml+1-11.1 -> 1.2
TestBeamTrackerTest.xml+1-11.1 -> 1.2
+13-13
8 modified files
JM: change test compact files to use non-zero system ID for sensitive elements
GeomConverter/test/org/lcsim/geometry/subdetector
CylindricalCalorimeterTest.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- CylindricalCalorimeterTest.xml	1 Jul 2005 00:13:30 -0000	1.3
+++ CylindricalCalorimeterTest.xml	7 Feb 2006 18:58:33 -0000	1.4
@@ -41,7 +41,7 @@

 
 <!-- Electromagnetic calorimeter -->
 

-    <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">

+    <detector id="1" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">

          <dimensions inner_r = "127.0*cm" outer_z = "179.5*cm" />
          <layer repeat="30">
            <slice material = "Tungsten" thickness = "0.25*cm" />

@@ -51,7 +51,7 @@

          </layer>
     </detector>
 

-    <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">

+    <detector id="2" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">

         <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
         <layer repeat="30" >
           <slice material = "Tungsten" thickness = "0.25*cm" />
GeomConverter/test/org/lcsim/geometry/subdetector
EcalBarrelTest.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- EcalBarrelTest.xml	24 Jan 2006 18:58:49 -0000	1.3
+++ EcalBarrelTest.xml	7 Feb 2006 18:58:33 -0000	1.4
@@ -28,7 +28,7 @@

   <detectors>
 
     <!-- Example EcalBarrel -->

-    <detector id="2" name="EcalBarrelTest" type="EcalBarrel" readout="EcalBarrHits">

+    <detector id="1" name="EcalBarrelTest" type="EcalBarrel" readout="EcalBarrHits">

 
       <dimensions nsides="8" inner_radius="1700.0" z="546.0 * 2" />
GeomConverter/test/org/lcsim/geometry/subdetector
LayeredSubdetectorTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- LayeredSubdetectorTest.xml	20 Aug 2005 19:56:01 -0000	1.1
+++ LayeredSubdetectorTest.xml	7 Feb 2006 18:58:33 -0000	1.2
@@ -78,7 +78,7 @@

         </layer>       
     </detector>
     

-    <detector id="2" name="CalorimeterBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">  

+    <detector id="3" name="CalorimeterBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">  

          <dimensions inner_r = "100.0" outer_z = "200.0" />
          <layer repeat="2" >
           <slice material = "G10" thickness = "3.0" />

@@ -86,7 +86,7 @@

         </layer>
     </detector>  
 

-        <detector id="6" name="CalorimeterEndcapTest" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">

+        <detector id="4" name="CalorimeterEndcapTest" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">

         <dimensions inner_r = "20.0" inner_z = "200.0" outer_r = "125.0" />
         <layer repeat="2" >
           <slice material = "G10" thickness = "3.0" />
GeomConverter/test/org/lcsim/geometry/subdetector
PolyhedraBarrelCalorimeterTest.xml 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- PolyhedraBarrelCalorimeterTest.xml	26 Aug 2005 02:37:05 -0000	1.4
+++ PolyhedraBarrelCalorimeterTest.xml	7 Feb 2006 18:58:33 -0000	1.5
@@ -30,7 +30,7 @@

   </materials>
 
   <detectors>

-    <detector id="0" 

+    <detector id="1" 

               name="PolyhedraBarrelCalorimeterTest" 
               type="PolyhedraBarrelCalorimeter" 
               readout="CalHits">

@@ -55,4 +55,4 @@

               zmax="1000"
               outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Oxygen gap + half coil-->
    </fields>

-</lccdd>

\ No newline at end of file

+</lccdd>
GeomConverter/test/org/lcsim/geometry/subdetector
PolyhedraEndcapCalorimeterTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- PolyhedraEndcapCalorimeterTest.xml	26 Aug 2005 02:37:05 -0000	1.1
+++ PolyhedraEndcapCalorimeterTest.xml	7 Feb 2006 18:58:33 -0000	1.2
@@ -30,7 +30,7 @@

   </materials>
 
   <detectors>

-    <detector id="0" 

+    <detector id="1" 

               name="PolyhedraEndcapCalorimeterTest" 
               type="PolyhedraEndcapCalorimeter" 
               readout="CalHits"

@@ -56,4 +56,4 @@

               zmax="1000"
               outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Oxygen gap + half coil-->
    </fields>

-</lccdd>

\ No newline at end of file

+</lccdd>
GeomConverter/test/org/lcsim/geometry/subdetector
TPCTest.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- TPCTest.xml	25 Aug 2005 08:00:21 -0000	1.2
+++ TPCTest.xml	7 Feb 2006 18:58:34 -0000	1.3
@@ -29,7 +29,7 @@

   </materials>
 
   <detectors>

-    <detector id="0" name="TPCTest" type="TPC" readout="TPCHits">

+    <detector id="1" name="TPCTest" type="TPC" readout="TPCHits">

          <dimensions inner_r = "100.0*cm" outer_z = "150.0*cm" />
          <layer repeat="10">
            <slice material="Nitrogen" thickness="1.0*cm" sensitive="true" />

@@ -50,4 +50,4 @@

               zmax="1000"
               outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Oxygen gap + half coil-->
    </fields>

-</lccdd>

\ No newline at end of file

+</lccdd>
GeomConverter/test/org/lcsim/geometry/subdetector
TestBeamCalorimeterTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TestBeamCalorimeterTest.xml	3 Sep 2005 01:37:21 -0000	1.1
+++ TestBeamCalorimeterTest.xml	7 Feb 2006 18:58:34 -0000	1.2
@@ -31,7 +31,7 @@

 
   <detectors>
 

-    <detector id="0" 

+    <detector id="1" 

               name="TestBeamCalorimeterTest" 
               type="TestBeamCalorimeter" 
               readout="CalHits"
GeomConverter/test/org/lcsim/geometry/subdetector
TestBeamTrackerTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TestBeamTrackerTest.xml	26 Sep 2005 18:14:52 -0000	1.1
+++ TestBeamTrackerTest.xml	7 Feb 2006 18:58:34 -0000	1.2
@@ -31,7 +31,7 @@

 
   <detectors>
     

-    <detector id="0" 

+    <detector id="1" 

               name="TestBeamTrackerTest" 
               type="TestBeamTracker" 
               readout="TrackerHits"
CVSspam 0.2.8