diff -u -r1.1 -r1.2
--- MaterialManagerNew.java	9 Feb 2011 01:31:38 -0000	1.1
+++ MaterialManagerNew.java	9 Feb 2011 18:11:51 -0000	1.2
@@ -4,7 +4,6 @@

 
 import java.util.ArrayList;
 import java.util.HashMap;

-import java.util.LinkedList;

 import java.util.List;
 import java.util.Map;
 

@@ -32,65 +31,44 @@

 import org.lcsim.geometry.subdetector.SiTrackerEndcap2;
 
 /**

- * Rewrite and refactor of Rich's {@link MaterialManager} class to handle Subdetector types.
- * This class should now group together SiTrackerEndcap2 layers correctly. 
- *

+ * Rewrite and refactor of Rich's {@link MaterialManager} class to handle Subdetector types. 
+ * This class should now group together SiTrackerEndcap2 layers correctly.
+ * 

  * @author Jeremy McCormick

- * @version $Id: MaterialManagerNew.java,v 1.1 2011/02/09 01:31:38 jeremy Exp $

+ * @version $Id: MaterialManagerNew.java,v 1.2 2011/02/09 18:11:51 jeremy Exp $

  */

-// FIXME Bracket style is mixed.  Eclipse formatting tool borked atm.
-public class MaterialManagerNew 

+public class MaterialManagerNew

 {
     // Variables from original MaterialManager class.

-    private static final boolean DEBUG = true; //enable debug output
-    private static final boolean TUBE_ONLY = false; //only use Tube elements for calculating volume.

+    private static final boolean DEBUG = true; // enable debug output
+    private static final boolean TUBE_ONLY = false; // only use Tube elements
+    // for calculating volume.

     private List<MaterialPolyconeSegment> _matpc = new ArrayList<MaterialPolyconeSegment>();
     private List<MaterialCylinder> _matcyl = new ArrayList<MaterialCylinder>();
     private List<MaterialDisk> _matdsk = new ArrayList<MaterialDisk>();
     private HashMap<ISolid, Double> solid_vol_map = new HashMap<ISolid, Double>(400);
     private static double _rmax;
     private static double _zmax = 1800.;

-    
-    /** 
-     * VolumeGroup handlers for Subdetector types. 

+
+    /**
+     * VolumeGroup handlers for Subdetector types.

      */
     private Map<Class, SubdetectorVolumeGrouper> subdetGroups = new HashMap<Class, SubdetectorVolumeGrouper>();

-    
-    /** 
-     * Creates a new instance of MaterialManager 
-     */
-    public MaterialManagerNew() 
-    {
-        // Barrel VolumeGrouper.       
-        SubdetectorVolumeGrouper barrelGroup = new BarrelLayerVolumeGroup();
-                
-        // Add VolumeGrouper for tracker barrel types.
-        subdetGroups.put(SiTrackerBarrel.class, barrelGroup);
-        subdetGroups.put(MultiLayerTracker.class, barrelGroup);
-        
-        // Add VolumeGrouper for SiTrackerEndcap2.
-        subdetGroups.put(SiTrackerEndcap2.class, new SiTrackerEndap2VolumeGrouper());
-        
-        // Add VolumeGrouper for PolyconeSupport.
-        subdetGroups.put(PolyconeSupport.class, new PolyconeSupportVolumeGrouper());
-        
-        // FIXME Need VolumeGrouper for SiTrackerEndcap.
-    }         
-    
-    /** 
-     * Interface for getting the path groupings for different Subdetector types. 

+
+    /**
+     * Interface for getting the path groupings for different Subdetector types.

      */
     private interface SubdetectorVolumeGrouper
     {
         List<List<String>> getPathGroups(Subdetector subdet, IPhysicalVolume topVol);
     }

-    
-    /** 
-     * Get the path groupings for barrel Subdetectors with physical layers one level below top. 
-     * This will handle SiTrackerBarrel and MultiLayerTracker Subdetector types.

+
+    /**
+     * Get the path groupings for barrel Subdetectors with physical layers one level below top. This will handle
+     * SiTrackerBarrel and MultiLayerTracker Subdetector types.

      */
     static private class BarrelLayerVolumeGroup implements SubdetectorVolumeGrouper

-    {        

+    {

         public List<List<String>> getPathGroups(Subdetector subdet, IPhysicalVolume topVol)
         {
             List<List<String>> pathGroups = new ArrayList<List<String>>();

@@ -104,7 +82,7 @@

             return pathGroups;
         }
     }

-    

+

     /**
      * Get the path groups for a PolyconeSupport, which is a single path.
      */

@@ -115,19 +93,19 @@

             List<List<String>> pathGroups = new ArrayList<List<String>>();
             String path = "";
             List<String> supportPath = new ArrayList<String>();

-            IPhysicalVolume supportPV = subdet.getDetectorElement().getChildren().get(0).getGeometry().getPhysicalVolume();

+            IPhysicalVolume supportPV =
+                    subdet.getDetectorElement().getChildren().get(0).getGeometry().getPhysicalVolume();

             PhysicalVolumeNavigator.getLeafPaths(supportPath, supportPV, path);
             pathGroups.add(supportPath);
             return pathGroups;
         }
     }

-    

+

     /**

-     * Get the path groups for SiTrackerEndcap2, which has modules placed directly 
-     * in the tracking volume.

+     * Get the path groups for SiTrackerEndcap2, which has modules placed directly in the tracking volume.

      */
     static private class SiTrackerEndap2VolumeGrouper implements SubdetectorVolumeGrouper

-    {        

+    {

         public List<List<String>> getPathGroups(Subdetector subdet, IPhysicalVolume topVol)
         {
             List<List<String>> pathGroups = new ArrayList<List<String>>();

@@ -138,13 +116,14 @@

                 for (IDetectorElement layer : endcaps.getChildren())
                 {
                     List<String> modulePaths = new ArrayList<String>();

-                    //System.out.println(layer.getName());
-                    
-                    // Module loop.                    

+                    // System.out.println(layer.getName());
+
+                    // Module loop.

                     for (IDetectorElement module : layer.getChildren())

-                    {                                     

+                    {

                         String path = "";

-                        PhysicalVolumeNavigator.getLeafPaths(modulePaths, module.getGeometry().getPhysicalVolume(), path);

+                        PhysicalVolumeNavigator.getLeafPaths(modulePaths, module.getGeometry().getPhysicalVolume(),
+                                path);

                         modulePaths.add(path);
                     }
                     // Add module.

@@ -153,41 +132,67 @@

             }
             return pathGroups;
         }

-    }       

+    }

     
     /**