lcsim/src/org/lcsim/util/heprep

diff -u -r1.5 -r1.5.2.1
--- MCParticleConverter.java	22 Aug 2005 18:42:59 -0000	1.5
+++ MCParticleConverter.java	29 Sep 2005 00:47:11 -0000	1.5.2.1
@@ -20,7 +20,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: MCParticleConverter.java,v 1.5 2005/08/22 18:42:59 tonyj Exp $

+ * @version $Id: MCParticleConverter.java,v 1.5.2.1 2005/09/29 00:47:11 jeremy Exp $

  */
 class MCParticleConverter implements HepRepCollectionConverter
 {

@@ -42,8 +42,15 @@

       
       double ptMinCut = 0.05;
       double rCut = 1.0;

-      double[] field = detector.getFieldMap().getField(IP);
-      HelixSwimmer helix = new HelixSwimmer(field[2]);

+      
+      double field2 = 0;
+      if ( detector.getFieldMap() != null )
+      {
+          field2 = detector.getFieldMap().getField(IP)[2];
+      }
+//      double[] field = detector.getFieldMap().getField(IP);
+//      HelixSwimmer helix = new HelixSwimmer(field[2]);
+      HelixSwimmer helix = new HelixSwimmer(field2);

       
       HepRepType typeX = factory.createHepRepType(typeTree, name);
       typeX.addAttValue("layer",LCSimHepRepConverter.PARTICLES_LAYER);

@@ -91,7 +98,7 @@

                    stop = new BasicHep3Vector();
                }
             }

-            if (charge == 0 || field[2] == 0)

+            if (charge == 0 || field2 == 0)

             {
                HepRepInstance instanceX = factory.createHepRepInstance(charge == 0 ? neutral : charged, charge == 0 ? neutralType : chargedType);
                factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());