Print

Print


Commit in lcsim/src/org/lcsim/recon/tracking/seedtracker on MAIN
MaterialManager.java+14-141.10 -> 1.11
minor correction and cleanup of volume grouper defs; add missing authors

lcsim/src/org/lcsim/recon/tracking/seedtracker
MaterialManager.java 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- MaterialManager.java	11 Apr 2011 17:21:07 -0000	1.10
+++ MaterialManager.java	12 Apr 2011 18:00:16 -0000	1.11
@@ -37,8 +37,11 @@
  * Rewrite and refactor of Rich's {@link MaterialManager} class to handle Subdetector types. 
  * This class should now group together SiTrackerEndcap2 layers correctly.
  * 
+ * @author Rich Partridge
  * @author Jeremy McCormick
- * @version $Id: MaterialManager.java,v 1.10 2011/04/11 17:21:07 mgraham Exp $
+ * @author Matt Graham
+ *
+ * @version $Id: MaterialManager.java,v 1.11 2011/04/12 18:00:16 jeremy Exp $
  */
 public class MaterialManager
 {
@@ -200,27 +203,24 @@
      */
     public MaterialManager()
     {
-        // Barrel VolumeGrouper.
-        SubdetectorVolumeGrouper barrelGrouper = new BarrelLayerVolumeGroup();
-
-        // Add VolumeGrouper for tracker barrel types.
+        // Barrels.
+        SubdetectorVolumeGrouper barrelGrouper = new BarrelLayerVolumeGroup();       
         subdetGroups.put(SiTrackerBarrel.class, barrelGrouper);
         subdetGroups.put(MultiLayerTracker.class, barrelGrouper);
         
-        // Add default endcap VolumeGrouper.
+        // Endcaps.
         SubdetectorVolumeGrouper endcapGrouper = new EndcapVolumeGrouper();
         subdetGroups.put(SiTrackerEndcap.class, endcapGrouper);
         subdetGroups.put(DiskTracker.class, endcapGrouper);
 
-        // Add VolumeGrouper for SiTrackerEndcap2 and SiTrackerFixedTarget2.
-        SubdetectorVolumeGrouper endcapGrouper2 = new SiTrackerEndap2VolumeGrouper();
-        subdetGroups.put(SiTrackerEndcap2.class, endcapGrouper2);
-        subdetGroups.put(SiTrackerFixedTarget2.class, endcapGrouper2);
-        SubdetectorVolumeGrouper fixedtargetGrouper = new SiTrackerFixedTarget2VolumeGrouper();
-        subdetGroups.put(SiTrackerFixedTarget2.class, fixedtargetGrouper);
+        // SiTrackerEndcap2.
+        subdetGroups.put(SiTrackerEndcap2.class, new SiTrackerEndap2VolumeGrouper());
+        
+        // SiTrackerFixedTarget2.
+        subdetGroups.put(SiTrackerFixedTarget2.class, new SiTrackerFixedTarget2VolumeGrouper());
 
-        // Add VolumeGrouper for PolyconeSupport.
-        subdetGroups.put(PolyconeSupport.class, new PolyconeSupportVolumeGrouper());        
+        // PolyconeSupport.
+        subdetGroups.put(PolyconeSupport.class, new PolyconeSupportVolumeGrouper());
     }
     
     /**
CVSspam 0.2.8