Commit in lcsim/src/org/lcsim/recon/tracking/gtrdetector on MAIN
GtrDetector.java+5-51.5 -> 1.6
GeomConverter is updated, so put patches back in.

lcsim/src/org/lcsim/recon/tracking/gtrdetector
GtrDetector.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- GtrDetector.java	6 Apr 2006 15:58:49 -0000	1.5
+++ GtrDetector.java	6 Apr 2006 18:12:54 -0000	1.6
@@ -3,7 +3,7 @@
  *
  * Created on July 30, 2005, 3:30 PM
  *
- * $Id: GtrDetector.java,v 1.5 2006/04/06 15:58:49 ngraf Exp $
+ * $Id: GtrDetector.java,v 1.6 2006/04/06 18:12:54 ngraf Exp $
  */
 
 package org.lcsim.recon.tracking.gtrdetector;
@@ -89,7 +89,7 @@
         {
             Layer layer       = ls.getLayer(i);
             double thickness  = layer.getThickness();
-            boolean sensitive = layer.findIndexOfFirstSensitiveSlice() != -1;
+            boolean sensitive = layer.indexOfFirstSensor() != -1;
             if (rname == null) sensitive = false;
             double layerX0   = calculateLayerX0(layer);
             String detname = name;
@@ -105,7 +105,7 @@
              */
             if (sensitive)
             {
-                int sensSliceIndex = layer.findIndexOfFirstSensitiveSlice();
+                int sensSliceIndex = layer.indexOfFirstSensor();
                 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.findIndexOfFirstSensitiveSlice() != -1;
+            boolean sensitive = layer.indexOfFirstSensor() != -1;
             if (rname == null) sensitive = false;
             double layerX0   = calculateLayerX0(layer);
             String detname = name;
@@ -206,7 +206,7 @@
             if (sensitive)
             {
                 //
-                int sensSliceIndex = layer.findIndexOfFirstSensitiveSlice();
+                int sensSliceIndex = layer.indexOfFirstSensor();
                 LayerSlice sensSlice = layer.getSlice(sensSliceIndex);
                 double rSense = innerR[i]+layer.getThicknessToSensitive();
                 rSense+=sensSlice.getThickness();
CVSspam 0.2.8