diff -u -r1.2 -r1.3
--- AxialBarrelTrackFinder.java	18 Jan 2006 00:37:22 -0000	1.2
+++ AxialBarrelTrackFinder.java	15 Feb 2006 00:28:01 -0000	1.3
@@ -7,23 +7,27 @@

 
 package org.lcsim.contrib.tracking;
 

+import hep.aida.IHistogramFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+

 import org.lcsim.event.EventHeader;

-import org.lcsim.event.SimTrackerHit;

 import org.lcsim.event.MCParticle;

+import org.lcsim.event.SimTrackerHit;

 import org.lcsim.event.Track;

-import org.lcsim.util.Driver;

+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.fit.circle.CircleFit;
 import org.lcsim.fit.circle.CircleFitter;

-

 import org.lcsim.geometry.Detector;

+import org.lcsim.geometry.IDDecoder;

 import org.lcsim.geometry.subdetector.MultiLayerTracker;

-import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.util.TrackerIDDecoder;

+import org.lcsim.util.Driver;

 import org.lcsim.util.aida.AIDA;

-import hep.aida.*;
-
-import java.util.*;
-import java.lang.Math;

 
 /**
  * AxialBarrelTrackFinder is a Driver that performs track pattern recognition 

@@ -72,7 +76,7 @@

     private HashMap<SimTrackerHit,Double> _hit_separation = new HashMap<SimTrackerHit,Double>();
     
     private LCMetaData _metadata = null; //event.getMetaData(hits);

-    private TrackerIDDecoder _decoder = null; //(TrackerIDDecoder) metadata.getIDDecoder();

+    private IDDecoder _decoder = null; //(TrackerIDDecoder) metadata.getIDDecoder();

     
     private AIDA _aida = AIDA.defaultInstance();
     

@@ -118,7 +122,7 @@

         // Get the SimTrackerHits and metadata
         _hits = event.getSimTrackerHits(_input_hit_collection);
         _metadata = event.getMetaData(_hits);

-        _decoder = (TrackerIDDecoder) _metadata.getIDDecoder();

+        _decoder = _metadata.getIDDecoder();

         
         // Print out number of hits
         if (_make_histograms) _aida.cloud1D("nHitsTotal").fill(_hits.size());