diff -u -r1.7 -r1.8
--- BarrelCalSegmentFinder.java	31 Oct 2005 22:31:14 -0000	1.7
+++ BarrelCalSegmentFinder.java	6 Dec 2005 16:11:21 -0000	1.8
@@ -1,15 +1,10 @@

 package org.lcsim.recon.muon;
 

-//import hep.analysis.*; // C.M.-27Jan03- Folder
-//import org.lcsim.geometry.*;
-//import org.lcsim.geometry.component.*;
-//import org.lcsim.recon.tracking.*;

 import org.lcsim.event.*;
 import java.util.*;
 import org.lcsim.util.step.TrackStepper;  //  C.M. Stepper

-import org.lcsim.material.*;
-//import org.lcsim.material.RadLengths;
-import org.lcsim.recon.muon.*;

+import org.lcsim.util.step.DeDx;
+

 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.FieldMap;
 import org.lcsim.geometry.subdetector.CylindricalBarrelCalorimeter;

@@ -19,9 +14,7 @@

 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.digisim.CalHitMapMgr;

-
-// import hep.lcd.util.material.DeDx;
-import org.lcsim.util.step.DeDx;

+import org.lcsim.recon.cluster.density.MyTools;

 
 // Muon Segment Finder for barrel calorimeter
 // Modified to include the EM Calorimeter- C.Milstene

@@ -30,15 +23,16 @@

 // elements as well- C. Milstene-January-02-04
 public class BarrelCalSegmentFinder extends SegmentFinder
 {

-    public BarrelCalSegmentFinder(Detector aDet, String name)

+    public BarrelCalSegmentFinder(Detector aDet, String subdetectorName)

     {
         
 	if(dedx==null) dedx = DeDx.instance();

+	subdetName = subdetectorName;

 
         // Get the parameters that describe this detector component
         det = aDet;

-        CylindricalBarrelCalorimeter calsub = (CylindricalBarrelCalorimeter)det.getSubdetectors().get(name);
-	

+        CylindricalBarrelCalorimeter calsub = (CylindricalBarrelCalorimeter)det.getSubdetectors().get(subdetName);
+

         /** 
          * Get materials (of 1st layer only) from LayeredCalorimeter class. 
          *

@@ -49,9 +43,18 @@

         for ( Object o : calsub.getLayering().getLayers().getLayer(0).getSlices() )
         {
             LayerSlice ls = (LayerSlice) o;

-            materials.put(ls.getMaterial().getName(), ls.getThickness() );
-        }                
-        //calsub.getMaterials();

+	    String sublayerMat = ls.getMaterial().getName();
+	    if( materials.containsKey(sublayerMat) ) {
+		// if material exists, just add to thickness
+		double thickness = materials.get( sublayerMat );
+		thickness += ls.getThickness();
+		materials.put( sublayerMat, thickness );
+	    }
+	    else {
+		// a new material in this cal component
+		materials.put(ls.getMaterial().getName(), ls.getThickness() );
+	    }
+        }

 
         rmin = calsub.getInnerRadius();
         rmax = calsub.getOuterRadius();

@@ -67,25 +70,26 @@

 	  nTheta = projCal.getThetaBins();
 	  phiBinSize = 2*Math.PI/nPhi;
 	  thetaBinSize = Math.PI/nTheta;

-	  aname = name;                   //  C.M.-June-03
-	  System.out.println("MY NAME IS "+aname+" rin="+rmin+" rout="+rmax+" zmax="+zmax);

+	  System.out.println("MY NAME IS "+subdetName+" rin="+rmin+" rout="+rmax+" zmax="+zmax+", phiBinSize="+phiBinSize+", thetaBinSize="+thetaBinSize);

 	  // Set the nearest neighbor cuts to default values

-	  if(aname.equals(EcalName))

+	  if(subdetName.equals(ecalSubdetName))

 	  {
             phiNNCut =2;
             thetaNNCut = 2;
 	  }

-	  else if(aname.equals(HcalName))

+	  else if(subdetName.equals(hcalSubdetName))

 	  {
 	    phiNNCut =3;
 	    thetaNNCut = 3;
 	  }
 	}
 

-      // FIXME: This code is specific to SDJan03 - it would be nice to code
-      // this up independent of detector geometry - to be read from
-      // compact.xml or .lcdd
-	String description = "layer:7,system:3,barrel:3,theta:32:11,phi:11";