GeomConverter/test/org/lcsim/geometry

diff -u -r1.8 -r1.8.2.1
--- GeometryReaderTest.java	24 Aug 2005 06:10:59 -0000	1.8
+++ GeometryReaderTest.java	28 Sep 2005 00:12:03 -0000	1.8.2.1
@@ -1,13 +1,13 @@

 package org.lcsim.geometry;
 

+import org.lcsim.geometry.Layered;

 import org.lcsim.geometry.compact.Segmentation;
 import org.lcsim.geometry.layer.*;
 
 import junit.framework.*;
 import java.io.InputStream;
 import org.lcsim.geometry.compact.Header;

-import org.lcsim.geometry.CalorimeterIDDecoder;
-import org.lcsim.geometry.TrackerIDDecoder;

+

 
 /**
  *

@@ -101,7 +101,7 @@

             subdetector = detector.getSubdetector(sn);
             assert(sn != null);
             

-            Layering layers = subdetector.getLayering();

+            Layering layers = ((Layered)subdetector).getLayering();

             assert(layers != null);
             
             //System.out.println("layer count: " + layers.getLayerCount() );

@@ -203,7 +203,7 @@

             
             if ( sn.equals("EMBarrel") || sn.equals("EMEndcap") )
             {

-                double totThick = subdetector.getLayering().getLayerStack().getTotalThickness();

+                double totThick = ((Layered)subdetector).getLayering().getLayerStack().getTotalThickness();

                 
                 /* test thickness */
                 assertEquals( totThick, EMThick, tol );

@@ -231,10 +231,10 @@

                 /* test whether manually adding up slice thicknesses = total thickness */
                 double compThick = 0;
                 int lnum = 0;

-                int nlay = subdetector.getLayering().getLayerStack().getNumberOfLayers();

+                int nlay = ((Layered)subdetector).getLayering().getLayerStack().getNumberOfLayers();

                 for ( int i = 0; i < nlay; i++ )
                 {

-                    Layer l = subdetector.getLayering().getLayerStack().getLayer(i);

+                    Layer l = ((Layered)subdetector).getLayering().getLayerStack().getLayer(i);

                     
                     assert(l != null);