diff -u -r1.2 -r1.3
--- MCParticleConverter.java	1 Jul 2005 22:56:22 -0000	1.2
+++ MCParticleConverter.java	15 Jul 2005 21:50:35 -0000	1.3
@@ -17,7 +17,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: MCParticleConverter.java,v 1.2 2005/07/01 22:56:22 tonyj Exp $

+ * @version $Id: MCParticleConverter.java,v 1.3 2005/07/15 21:50:35 ngraf Exp $

  */
 class MCParticleConverter implements HepRepCollectionConverter
 {

@@ -71,13 +71,20 @@

             // Workaround for simdet
             if (stop[0] == 0 && stop[1] == 0 && stop[2] == 0)
             {

-               stop = helix.swimBy(trackingRMax);

+                if(p.getGeneratorStatus()==MCParticle.FINAL_STATE) stop = helix.swimBy(trackingRMax);

             }
          }
          catch (RuntimeException x)
          {
             // Use the helix swimmer to swim to end of tracking region

-            stop = helix.swimBy(trackingRMax);

+            if(p.getGeneratorStatus()==MCParticle.FINAL_STATE)
+            {
+                stop = helix.swimBy(trackingRMax);
+            }
+            else
+            {
+                stop = new double[3];
+            }

          }
          if (charge == 0 || field[2] == 0)
          {