diff -N XtrapPositionDSort.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ XtrapPositionDSort.java	6 Oct 2010 19:40:42 -0000	1.1
@@ -0,0 +1,21 @@

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.recon.cluster.mipfinder.trackxtrap;
+import java.util.*;
+
+/**
+ *
+ * @author cassell
+ */
+public class XtrapPositionDSort implements Comparator<XtrapPosition>
+{
+    public int compare(XtrapPosition x1, XtrapPosition x2)
+    {
+        if( x1.getPosition().magnitudeSquared() - x2.getPosition().magnitudeSquared() > 0 ) return 1;
+        return -1;
+    }
+
+}

diff -N TrackXtrapCalPositions.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TrackXtrapCalPositions.java	6 Oct 2010 19:40:42 -0000	1.1
@@ -0,0 +1,35 @@

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.recon.cluster.mipfinder.trackxtrap;
+import java.util.*;
+import org.lcsim.event.Track;
+import org.lcsim.geometry.Calorimeter;
+import hep.physics.vec.*;
+/**
+ *
+ * @author cassell
+ */
+public class TrackXtrapCalPositions
+{
+    static TrackXtrapCalPositions theTrackXtrapCalPositions;
+    Map<Track,Map<Calorimeter.CalorimeterType,List<Hep3Vector>>> tpmap;
+    public TrackXtrapCalPositions()
+    {
+        theTrackXtrapCalPositions = this;
+    }
+    public static TrackXtrapCalPositions instance()
+    {
+        return theTrackXtrapCalPositions;
+    }
+    public void setMap(Map<Track,Map<Calorimeter.CalorimeterType,List<Hep3Vector>>> tmap)
+    {
+        tpmap = tmap;
+    }
+    public Hep3Vector getPosition(Track t,Calorimeter.CalorimeterType ct, int layer)
+    {
+        return tpmap.get(t).get(ct).get(layer);
+    }
+}

diff -N AttachCalorimeterHitsDriver.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ AttachCalorimeterHitsDriver.java	6 Oct 2010 19:40:42 -0000	1.1
@@ -0,0 +1,83 @@

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.recon.cluster.mipfinder.trackxtrap;
+import org.lcsim.recon.util.*;
+import org.lcsim.util.Driver;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.Track;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.geometry.Calorimeter;
+import java.util.*;
+import hep.physics.vec.*;
+import org.lcsim.util.hitmap.HitMap;
+import org.lcsim.geometry.IDDecoder;
+
+/**
+ *
+ * @author cassell
+ */
+public class AttachCalorimeterHitsDriver extends Driver
+{
+    String inputHitMapName;
+    double ncsq;
+    String trackListName;
+    String xtrName;
+    CalorimeterInformation ci;
+    Map<Calorimeter.CalorimeterType,Double> cellsizemap;
+    public AttachCalorimeterHitsDriver(String tracklistname,String hitmapname,String xtname, double ncellcut)
+    {
+        inputHitMapName = hitmapname;
+        ncsq = ncellcut*ncellcut;
+        trackListName = tracklistname;
+        xtrName = xtname;
+    }
+    protected void process(EventHeader event)
+    {
+        if(ci == null)
+        {
+            ci = CalorimeterInformation.instance();
+            cellsizemap = new HashMap<Calorimeter.CalorimeterType,Double>();
+            cellsizemap.put(Calorimeter.CalorimeterType.EM_BARREL, 3.5*3.5);
+            cellsizemap.put(Calorimeter.CalorimeterType.EM_ENDCAP, 3.5*3.5);
+            cellsizemap.put(Calorimeter.CalorimeterType.HAD_BARREL, 10.*10.);
+            cellsizemap.put(Calorimeter.CalorimeterType.HAD_ENDCAP, 10.*10.);
+        }
+        List<TrackXtrapInfo> txil = event.get(TrackXtrapInfo.class,xtrName);
+        TrackXtrapCalPositions txcp = TrackXtrapCalPositions.instance();
+        List<Track> tl = event.get(Track.class,trackListName);
+        HitMap hm = (HitMap) (event.get(inputHitMapName));
+        for(long id:hm.keySet())
+        {
+            IDDecoder idd = hm.get(id).getIDDecoder();
+            Hep3Vector hp = new BasicHep3Vector(hm.get(id).getPosition());
+            idd.setID(id);
+            int lay = idd.getVLayer();
+            Calorimeter.CalorimeterType ct = ((Calorimeter)(idd.getSubdetector())).getCalorimeterType();
+            if(cellsizemap.get(ct) != null)
+            {
+                double dsqcut = ncsq*cellsizemap.get(ct);
+                for(TrackXtrapInfo txi:txil)
+                {
+                    Track t = txi.getTrack();
+                    if(tl.contains(t))
+                    {
+                        Hep3Vector xp = txcp.getPosition(t, ct, lay);
+                        if(xp != null)
+                        {
+                            double dsq = (hp.x()-xp.x())*(hp.x()-xp.x()) +
+                                     (hp.y()-xp.y())*(hp.y()-xp.y()) +
+                                     (hp.z()-xp.z())*(hp.z()-xp.z());
+                            if(dsq < dsqcut)
+                            {
+                                txi.addHit(hm.get(id),ct,lay);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

diff -N TrackXtrapInfo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TrackXtrapInfo.java	6 Oct 2010 19:40:42 -0000	1.1
@@ -0,0 +1,75 @@

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.recon.cluster.mipfinder.trackxtrap;
+import java.util.*;
+import org.lcsim.event.Track;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.util.swim.HelixSwimmer;
+import org.lcsim.geometry.Calorimeter;
+
+/**
+ *
+ * @author cassell
+ */
+public class TrackXtrapInfo
+{
+    protected HelixSwimmer hs;
+    protected Track t;
+    protected List<XtrapPosition> xpl;
+    protected Map<XtrapPosition,List<CalorimeterHit>> posToHitsMap;
+    public TrackXtrapInfo()
+    {
+        xpl = new ArrayList<XtrapPosition>();
+    }
+    public TrackXtrapInfo(Track x)
+    {
+        t = x;
+        xpl = new ArrayList<XtrapPosition>();
+    }
+    public TrackXtrapInfo(Track x, HelixSwimmer y)
+    {
+        t = x;
+        hs = y;
+        xpl = new ArrayList<XtrapPosition>();
+    }
+    public void setTrack(Track x){t = x;}
+    public void setSwimmer(HelixSwimmer x){hs = x;}
+    public Track getTrack(){return t;}
+    public HelixSwimmer getSwimmer(){return hs;}
+    public void addPosition(XtrapPosition x){xpl.add(x);}
+    public List<XtrapPosition> getPositions(){return xpl;}
+    public XtrapPosition getPosition(int i)
+    {
+        if(i < xpl.size())return xpl.get(i);
+        return null;
+    }
+    public void sortPositions()
+    {
+        Collections.sort(xpl, new XtrapPositionDSort());
+        posToHitsMap = new HashMap<XtrapPosition,List<CalorimeterHit>>();
+        for(XtrapPosition xp:xpl)
+        {
+            posToHitsMap.put(xp, new ArrayList<CalorimeterHit>());
+        }
+    }
+    public void addHit(CalorimeterHit h, Calorimeter.CalorimeterType ct, int lay)
+    {
+        for(XtrapPosition xp:xpl)
+        {
+            if(xp.getCalorimeterType() == ct)
+            {
+                if(xp.getLayer() == lay)
+                {
+                    posToHitsMap.get(xp).add(h);
+                }
+            }
+        }
+    }
+    public List<CalorimeterHit> getHits(XtrapPosition x)
+    {
+        return posToHitsMap.get(x);
+    }
+}