diff -u -r1.1 -r1.2
--- GarfieldHitConverter.java	4 Oct 2005 21:52:24 -0000	1.1
+++ GarfieldHitConverter.java	10 Feb 2006 21:42:59 -0000	1.2
@@ -1,9 +1,13 @@

 package org.lcsim.contrib.garfield;
 

-import java.util.*;
-import org.lcsim.event.*;
-import org.lcsim.util.Driver;
-import org.lcsim.geometry.TrackerIDDecoder;

+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+import org.lcsim.geometry.IDDecoder;

 
 /**
  * This processor converts tracker hits into GarfieldHit objects.

@@ -100,7 +104,7 @@

       EventHeader.LCMetaData meta = event.getMetaData(collection);
       String collectionName = meta.getName();
       if (inputCollectionNames.isEmpty() || inputCollectionNames.contains(collectionName)) {

-        TrackerIDDecoder decoder = (TrackerIDDecoder) meta.getIDDecoder();

+        IDDecoder decoder = meta.getIDDecoder();

         for (SimTrackerHit hit: collection){
           listHits.add(new SimTrackerHitBasic(hit, decoder));
         }

diff -u -r1.1 -r1.2
--- GarfieldTrackFinder.java	4 Oct 2005 21:52:24 -0000	1.1
+++ GarfieldTrackFinder.java	10 Feb 2006 21:42:59 -0000	1.2
@@ -3,7 +3,6 @@

 import java.util.*;
 import org.lcsim.event.*;
 import org.lcsim.util.Driver;

-import org.lcsim.geometry.TrackerIDDecoder;

 import org.lcsim.util.aida.AIDA;
 
 /**

diff -u -r1.1 -r1.2
--- SimTrackerHitBasic.java	4 Oct 2005 21:52:25 -0000	1.1
+++ SimTrackerHitBasic.java	10 Feb 2006 21:42:59 -0000	1.2
@@ -1,8 +1,9 @@

 package org.lcsim.contrib.garfield;
 

-import org.lcsim.event.*;

+import org.lcsim.event.MCParticle;
+import org.lcsim.event.SimTrackerHit;

 import org.lcsim.event.EventHeader.LCMetaData;

-import org.lcsim.geometry.TrackerIDDecoder;

+import org.lcsim.geometry.IDDecoder;

 
 /**
  *

@@ -14,18 +15,18 @@

   // -- Private fields :  ------------------------------------------------------
   
   private SimTrackerHit hit;

-  private TrackerIDDecoder decoder;

+  private IDDecoder decoder;

   
   // -- Constructors :  --------------------------------------------------------
   

-  public SimTrackerHitBasic(SimTrackerHit hit, TrackerIDDecoder decoder) {

+  public SimTrackerHitBasic(SimTrackerHit hit, IDDecoder decoder) {

     this.hit = hit;
     this.decoder = decoder;
   }
   
   public SimTrackerHitBasic(SimTrackerHit hit, LCMetaData meta) {
     this.hit = hit;

-    this.decoder = (TrackerIDDecoder) meta.getIDDecoder();

+    this.decoder = meta.getIDDecoder();

   }
 
   // -- Getters :  -------------------------------------------------------------

@@ -44,7 +45,7 @@

   
   public SimTrackerHit getSimTrackerHit() {return hit;}
   

-  public TrackerIDDecoder getDecoder() {

+  public IDDecoder getDecoder() {

     decoder.setID(hit.getCellID());
     return decoder;
   }

@@ -55,7 +56,7 @@

 
   public double getZ() {return (hit.getPoint())[2];}
 

-  public int getSystemNumber() {return getDecoder().getSystemNumber();}

+  public int getSystemNumber() {return getDecoder().getSystemID();}

 
   public int getLayer() {return getDecoder().getLayer();}
 

@@ -63,16 +64,16 @@

 
   public double getTheta() {return getDecoder().getTheta();}
 

-  public boolean isBarrel() {return getDecoder().isBarrel();}

+  public boolean isBarrel() {return getDecoder().getBarrelEndcapFlag().isBarrel();}

-  public boolean isEndcap() {return getDecoder().isEndcap();}

+  public boolean isEndcap() {return getDecoder().getBarrelEndcapFlag().isEndcap();}

-  public boolean isEndcapNorth() {return getDecoder().isEndcapNorth();}

+  public boolean isEndcapNorth() {return getDecoder().getBarrelEndcapFlag().isEndcapNorth();}

-  public boolean isEndcapSouth() {return getDecoder().isEndcapSouth();}

+  public boolean isEndcapSouth() {return getDecoder().getBarrelEndcapFlag().isEndcapSouth();}

   
   public boolean isVXD() {

-    int sys = getDecoder().getSystemNumber();

+    int sys = getDecoder().getSystemID();

     return (sys == Const.codeVXDBarrel || sys == Const.codeVXDEndcap);
   }