GeomConverter/test/org/lcsim/geometry

diff -u -r1.9 -r1.10
--- GeometryReaderTest.java	28 Oct 2005 00:34:26 -0000	1.9
+++ GeometryReaderTest.java	7 Feb 2006 17:16:10 -0000	1.10
@@ -177,18 +177,19 @@

                 assert(dec != null);                                
                                
                 /* if tracker, test for TrackerIDDecoder */

-                if ( subdetector.isTracker() )

+//                if ( subdetector.isTracker() )
+//                {
+//                    TrackerIDDecoder tdec = ((Tracker)subdetector).getTrackerIDDecoder();
+//                    assert(tdec != null);
+//                }
+                /* test for Segmentation */
+                if (subdetector.isCalorimeter()) 

                 {

-                    TrackerIDDecoder tdec = ((Tracker)subdetector).getTrackerIDDecoder();
-                    assert(tdec != null);
-                }
-                /* test for CalorimeterIDDecoder */
-                else
-                {
-                    CalorimeterIDDecoder cdec = ((Calorimeter)subdetector).getCalorimeterIDDecoder();                    

+                    //CalorimeterIDDecoder cdec = ((Calorimeter)subdetector).getCalorimeterIDDecoder();                    

                     
                     /* test for segmentation */

-                    Segmentation seg = ((Segmentation)cdec);

+                    Segmentation seg = (Segmentation)subdetector.getIDDecoder();
+                    //((Segmentation)cdec);

                     assert(seg != null);
                 }
             }