diff -u -r1.1 -r1.2
--- SidloiCalorimeterHitTest.java	15 Sep 2009 23:48:13 -0000	1.1
+++ SidloiCalorimeterHitTest.java	18 Sep 2009 21:10:15 -0000	1.2
@@ -13,6 +13,8 @@

 import org.lcsim.util.Driver;
 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.loop.LCSimLoop;

+import org.lcsim.geometry.Detector;
+import org.lcsim.detector.*;

 
 /**
  * Tests that IDDecoder's computed position matches the position

@@ -24,14 +26,12 @@

 // TODO: Add in EcalBarrel once java version is implemented.
 public class SidloiCalorimeterHitTest extends TestCase
 {

-    //private static final String[] colls =
-    //{ "EcalBarrelHits" };

     private static final String[] colls =

-    { "HcalEndcapHits", "EcalEndcapHits", "HcalBarrelHits" };
-       

+    { "EcalBarrelHits", "HcalEndcapHits", "EcalEndcapHits", "HcalBarrelHits" };
+    

     public void testHitPosition() throws Exception
     {

-        runTestFile("http://www.lcsim.org/test/lcio/gamma_Theta1-179_10GeV-0-2000_SLIC-v2r6p1_geant4-v9r2p2_LCPhys_sidloi2-0-10.slcio");

+        runTestFile("http://www.lcsim.org/test/lcio/dev/gamma_Theta1-179_10GeV-0-2000_SLIC-v2r6p1_geant4-v9r2p2_LCPhys_sidloi2.slcio");

     }
 
     private void runTestFile(String s) throws Exception

@@ -50,10 +50,28 @@

     static final double tolerance = 1.0; 
     
     private class HitPositionDriver extends Driver

-    {    	        

+    {    
+        /*	
+        public void detectorChanged(Detector detector)
+        {
+            for (IDetectorElement de : DetectorElementStore.getInstance())
+            {
+                if (de.getName().contains("EcalBarrel"))
+                {
+                    System.out.println(de.getName());
+                    try 
+                    {
+                        System.out.println("    " + de.getExpandedIdentifier().toString());
+                    }
+                    catch (Exception x)
+                    {}
+                }
+            }
+        }
+        */
+        

         public void process(EventHeader event)
         {

-        	//System.out.println("event: " + event.getEventNumber());

             for (String s : colls)
             {
                 List<SimCalorimeterHit> hits = event.get(SimCalorimeterHit.class, s);

@@ -71,29 +89,11 @@

                     double[] pos = hit.getPosition();
                     
                     // Debug stuff for testing new detector components.

-                    

                     //System.out.println("-------------------------------");

-                    

                     //System.out.println("hit id: " + hit.getExpandedIdentifier().toString());
                     //System.out.println("hit pos: " + pos[0] + ", " + pos[1] + ", " + pos[2]);
                     //System.out.println("decoder pos: " + decoder.getX() + ", " + decoder.getY() + ", " + decoder.getZ());
                                         

-                    //IExpandedIdentifier expId = hit.getDetectorElement().getIdentifierHelper().unpack(hit.getIdentifier());
-                    //IIdentifierDictionary iddict = hit.getDetectorElement().getIdentifierHelper().getIdentifierDictionary();
-                    //IIdentifierHelper helper = hit.getDetectorElement().getIdentifierHelper();
-                    //System.out.println("hit id: " + helper.unpack(hit.getIdentifier()));
-                    
-                    //System.out.println("sensor pos: " + hit.getDetectorElement().getGeometry().getPosition());
-                    
-                    //System.out.println("localToGlobal check: " + hit.getDetectorElement().getGeometry().transformLocalToGlobal(new BasicHep3Vector(0,0,0)));
-                    //System.out.println("localToGlobal check X: " + hit.getDetectorElement().getGeometry().transformLocalToGlobal(new BasicHep3Vector(10.0,0,0)));
-                    //System.out.println("localToGlobal check Y: " + hit.getDetectorElement().getGeometry().transformLocalToGlobal(new BasicHep3Vector(0,10.0,0)));
-                    //System.out.println("localToGlobal check Z: " + hit.getDetectorElement().getGeometry().transformLocalToGlobal(new BasicHep3Vector(0,0,10.0)));
-                    
-                    //System.out.println("hit DE: " + hit.getDetectorElement().getName());
-                    //System.out.println("hit DE id: " + hit.getDetectorElement().getExpandedIdentifier().toString());
-                    //System.out.println("-----------------");
-                    

                     assertEquals("X coordinate off by > " + tolerance, decoder.getX(), pos[0], tolerance);
                     assertEquals("Y coordinate off by > " + tolerance, decoder.getY(), pos[1], tolerance);
                     assertEquals("Z coordinate off by > " + tolerance, decoder.getZ(), pos[2], tolerance);