diff -u -r1.5 -r1.6
--- TrackHitMatcher.java	20 Mar 2006 20:46:24 -0000	1.5
+++ TrackHitMatcher.java	22 May 2006 18:01:10 -0000	1.6
@@ -22,7 +22,7 @@

  * A helper class for track-hit matching in a single calorimeter component
  *
  * @author Guilherme Lima

- * @version $Id: TrackHitMatcher.java,v 1.5 2006/03/20 20:46:24 lima Exp $

+ * @version $Id: TrackHitMatcher.java,v 1.6 2006/05/22 18:01:10 lima Exp $

  */
 public class TrackHitMatcher {
 

@@ -60,7 +60,14 @@

 
       // loop over tracks
       // Use recon.ztracking.cheater.TrackingCheater (MCParticle)

-      List<Track> recoTracks = event.get(Track.class, "CombinedTracks");

+      List<Track> recoTracks = null;
+      try {
+	  recoTracks = event.get(Track.class, "CombinedTracks");
+      }
+      catch(IllegalArgumentException x) {
+	  // create an empty list
+	  recoTracks = new ArrayList<Track>();
+      }

       // Use mc.fast.tracking.MCFastTracking (smearing around MCParticle)
 //       List<Track> recoTracks = event.getTracks();
 

diff -u -r1.4 -r1.5
--- TrackMatchingDriver.java	15 Mar 2006 12:27:50 -0000	1.4
+++ TrackMatchingDriver.java	22 May 2006 18:01:10 -0000	1.5
@@ -15,13 +15,11 @@

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Track;
 import org.lcsim.recon.ztracking.cheater.CheatTrack;

-import org.lcsim.geometry.util.CalorimeterIDDecoder;

 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.segmentation.BarrelCylinderSegmentationBase;
 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
 import org.lcsim.geometry.layer.Layering;
 import org.lcsim.util.swim.HelixSwimmer;

-import org.lcsim.geometry.IDDecoder;

 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.recon.cluster.util.CalHitMapMgr;
 

@@ -29,7 +27,7 @@

  * A driver for track matching using the swimmer.
  *
  * @author Guilherme Lima

- * @version $Id: TrackMatchingDriver.java,v 1.4 2006/03/15 12:27:50 lima Exp $

+ * @version $Id: TrackMatchingDriver.java,v 1.5 2006/05/22 18:01:10 lima Exp $

  */
 public class TrackMatchingDriver extends Driver {
 

@@ -61,7 +59,14 @@

       Map<Track,Vector<Hep3Vector>> hadInterceptsMap = new HashMap<Track,Vector<Hep3Vector>>();
 
       // Use recon.ztracking.cheater.TrackingCheater (MCParticle)

-      List<Track> recoTracks = event.get(Track.class, "CombinedTracks");

+      List<Track> recoTracks = null;
+      try {
+	  recoTracks = event.get(Track.class, "CombinedTracks");
+      }
+      catch(IllegalArgumentException x) {
+	  // create an empty list
+	  recoTracks = new ArrayList<Track>();
+      }

       // Use mc.fast.tracking.MCFastTracking (smearing around MCParticle)
 //       List<Track> recoTracks = event.getTracks();
       Collections.sort( recoTracks, new TrackPSort());