lcsim/src/org/lcsim/contrib/seedtracker

diff -u -r1.7 -r1.8
--- HitManager.java	22 Jun 2008 23:19:34 -0000	1.7
+++ HitManager.java	2 Jul 2008 23:55:05 -0000	1.8
@@ -28,7 +28,6 @@

  * @version 1.0
  */
 public class HitManager {

-    private HitIdentifier ID = new HitIdentifier();

     private HashMap<String, List<HelicalTrackHit>> _hitlist;
     private HashMap<String, Double> _rmin;
     private HashMap<String, Double> _rmax;

@@ -52,9 +51,7 @@

         _zmax = new HashMap<String, Double>();
         List<HelicalTrackHit> hitcol = (List<HelicalTrackHit>) event.get("HelicalTrackHits");
         for (HelicalTrackHit hit : hitcol) {

-            String identifier = ID.Identifier(hit);
-            //  Save identifier in the hit
-            hit.setLayerIdentifier(identifier);

+            String identifier = hit.getLayerIdentifier();

             if (!_hitlist.containsKey(identifier)) {
                 _hitlist.put(identifier, new ArrayList<HelicalTrackHit>());
                 _rmin.put(identifier,9999999.);

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

     public List<HelicalTrackHit> getTrackerHits(String detname, int layer, BarrelEndcapFlag beflag) {
 //        return new ArrayList<HelicalTrackHit>(_hitlist.get(Identifier(detname, layer, beflag)));
         //  Get the identifier for this layer and return the appropriate hit list (if any)

-        String id = ID.Identifier(detname, layer, beflag);

+        String id = MakeIdentifier(detname, layer, beflag);

         List<HelicalTrackHit> hitlist;
         if (_hitlist.containsKey(id)) {
             hitlist = _hitlist.get(id);

@@ -122,7 +119,7 @@

      */
     public double getRMin(SeedLayer seedlayer) {
         double rmin = 9999999.;

-        String identifier = ID.Identifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

+        String identifier = MakeIdentifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

         if (_rmin.containsKey(identifier)) rmin = Math.min(rmin, _rmin.get(identifier));
         return rmin;
     }

@@ -134,7 +131,7 @@

      */
     public double getRMax(SeedLayer seedlayer) {
         double rmax = 0.;

-        String identifier = ID.Identifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

+        String identifier = MakeIdentifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

         if (_rmax.containsKey(identifier)) rmax = Math.max(rmax, _rmax.get(identifier));
         return rmax;
     }

@@ -146,7 +143,7 @@

      */
     public double getZMin(SeedLayer seedlayer) {
         double zmin = 9999999.;

-        String identifier = ID.Identifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

+        String identifier = MakeIdentifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

         if (_zmin.containsKey(identifier)) zmin = Math.min(zmin, _zmin.get(identifier));
         return zmin;
     }

@@ -158,7 +155,7 @@

      */
     public double getZMax(SeedLayer seedlayer) {
         double zmax = -9999999.;

-        String identifier = ID.Identifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

+        String identifier = MakeIdentifier(seedlayer.getDetName(), seedlayer.getLayer(), seedlayer.getBarrelEndcapFlag());

         if (_zmax.containsKey(identifier)) zmax = Math.max(zmax, _zmax.get(identifier));
         return zmax;
     }

@@ -183,27 +180,13 @@

             return simhit.getIDDecoder().getBarrelEndcapFlag();
         } else return BarrelEndcapFlag.UNKNOWN;
     }

-    
-//    private boolean isPixel(TrackerHit hit) {
-//        if (hit instanceof BaseTrackerHitMC) {
-//            return getName(hit).contains("vtx");
-//        } else return true;
-//    }
-    
-//    private double getZMin(TrackerHit hit) {
-//        return -9999.;
-//    }
-    

+
+    private String MakeIdentifier(String detname, int layer, BarrelEndcapFlag beflag) {
+        return detname+layer+beflag;
+    }
+ 

     private double getZMax(TrackerHit hit) {
         return 9999.;
     }
     

-    private String LyrIdentifier(TrackerHit hit) {
-        return ID.Identifier(getName(hit), getLayer(hit), getBarrelEndcapFlag(hit));
-    }
-    
-//    private String Identifier(String detname, int layer, BarrelEndcapFlag beflag) {
-//        return new String(detname+layer+beflag.toString());
-//    }
-    

 }