GeomConverter/test/org/lcsim/detector/converter/compact

diff -u -r1.7 -r1.8
--- DiskTrackerTest.java	28 Aug 2007 22:26:35 -0000	1.7
+++ DiskTrackerTest.java	8 Dec 2007 01:55:51 -0000	1.8
@@ -114,29 +114,13 @@

         
         String[] deAnswerKey = new String[] {
                 "DiskTrackerTest",

-                "DiskTracker_positive_sensor1",
-                "DiskTracker_positive_sensor0",

+                "DiskTracker_positive_layer1",
+                "DiskTracker_positive_layer0",

                 "DiskTrackerTest",

-                "DiskTracker_negative_sensor0",
-                "DiskTracker_negative_sensor1",

+                "DiskTracker_negative_layer0",
+                "DiskTracker_negative_layer1",

                 "DiskTrackerTest"

-        };
-             
-        /*
-        for (IDetectorElement de : DetectorElementStore.getInstance())
-        {
-            System.out.println("isDescendant of detector <" + de.getName() + "> - " + detector.getDetectorElement().isDescendant(de));
-            
-            if ( de.hasGeometryInfo() )
-            {
-                System.out.println(de.getName());
-                if ( de.getParent() != null )
-                {
-                    System.out.println("    " + de.getParent().getName());
-                }
-            }
-        }
-        */

+        };             

                 
         for ( int i=0; i<zpoints.length; i++ )
         {           

@@ -144,8 +128,6 @@

             
             IPhysicalVolumePath path = navigator.getPath(zpoint);
 

-            //System.out.println(zpoint + " " + path.toString());
-

             assertTrue(
                     "Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ".  Expected <" + pathAnswerKey[i] + ">.",
                     path.toString().equals(pathAnswerKey[i])