diff -u -r1.4 -r1.5
--- GtrDetector.java	5 Apr 2006 18:42:57 -0000	1.4
+++ GtrDetector.java	6 Apr 2006 15:58:49 -0000	1.5
@@ -3,9 +3,9 @@

  *
  * Created on July 30, 2005, 3:30 PM
  *

- * $Id: GtrDetector.java,v 1.4 2006/04/05 18:42:57 jeremy Exp $
- */
-

+ * $Id: GtrDetector.java,v 1.5 2006/04/06 15:58:49 ngraf Exp $
+ */
+

 package org.lcsim.recon.tracking.gtrdetector;
 import java.util.Collection;
 import java.util.Map;

@@ -89,7 +89,7 @@

         {
             Layer layer       = ls.getLayer(i);
             double thickness  = layer.getThickness();

-            boolean sensitive = layer.indexOfFirstSensor() != -1;

+            boolean sensitive = layer.findIndexOfFirstSensitiveSlice() != -1;

             if (rname == null) sensitive = false;
             double layerX0   = calculateLayerX0(layer);
             String detname = name;

@@ -105,7 +105,7 @@

              */
             if (sensitive)
             {

-                int sensSliceIndex = layer.indexOfFirstSensor();

+                int sensSliceIndex = layer.findIndexOfFirstSensitiveSlice();

                 LayerSlice sensSlice = layer.getSlice(sensSliceIndex);
                 double zSense = innerZ[i]+layer.getThicknessToSensitive();
                 zSense+=sensSlice.getThickness();

@@ -189,7 +189,7 @@

         {
             Layer layer       = ls.getLayer(i);
             double thickness  = layer.getThickness();

-            boolean sensitive = layer.indexOfFirstSensor() != -1;

+            boolean sensitive = layer.findIndexOfFirstSensitiveSlice() != -1;

             if (rname == null) sensitive = false;
             double layerX0   = calculateLayerX0(layer);
             String detname = name;

@@ -206,7 +206,7 @@

             if (sensitive)
             {
                 //

-                int sensSliceIndex = layer.indexOfFirstSensor();

+                int sensSliceIndex = layer.findIndexOfFirstSensitiveSlice();

                 LayerSlice sensSlice = layer.getSlice(sensSliceIndex);
                 double rSense = innerR[i]+layer.getThicknessToSensitive();
                 rSense+=sensSlice.getThickness();