diff -u -r1.1 -r1.2
--- MCParticleFlag.java	9 Feb 2006 01:13:19 -0000	1.1
+++ MCParticleFlag.java	10 Nov 2006 22:29:15 -0000	1.2
@@ -4,7 +4,7 @@

  * Combined set of flags for MCParticle statuses, including error conditions.
  * 
  * @author jeremym

- * @version $Id: MCParticleFlag.java,v 1.1 2006/02/09 01:13:19 jeremy Exp $

+ * @version $Id: MCParticleFlag.java,v 1.2 2006/11/10 22:29:15 jeremy Exp $

  */
 enum MCParticleFlag
 {

@@ -33,7 +33,8 @@

     BAD_STAT_DECAYED_CALORIMETER_AND_LEFT("Bad: Decayed in Calorimeter and Left", 22),
     BAD_STAT_DECAYED_CALORIMETER_AND_STOPPED("Bad: Decayed in Calorimeter and Stopped", 23),
     BAD_STAT_LEFT_AND_STOPPED("Bad: Left and Stopped", 24),

-    BAD_STAT_SIM_NO_SIM_STATUS("Bad: Sim Particle with no Simulator Status", 25);   

+    BAD_STAT_SIM_NO_SIM_STATUS("Bad: Sim Particle with no Simulator Status", 25), 
+    BAD_STAT_CHARGE_NAN("Bad: Charge is NaN", 26);

 
     String _descr;
     int _flag;

diff -u -r1.2 -r1.3
--- MCParticleFlags.java	13 Feb 2006 22:05:51 -0000	1.2
+++ MCParticleFlags.java	10 Nov 2006 22:29:15 -0000	1.3
@@ -12,7 +12,7 @@

  * an individual MCParticle.
  * 
  * @author jeremym

- * @version $Id: MCParticleFlags.java,v 1.2 2006/02/13 22:05:51 jeremy Exp $

+ * @version $Id: MCParticleFlags.java,v 1.3 2006/11/10 22:29:15 jeremy Exp $

  */
 public class MCParticleFlags
 {

@@ -202,7 +202,13 @@

         if (gstat == 0 && !sstat.isCreatedInSimulation())
         {
             add(MCParticleFlag.BAD_STAT_SIM_NO_SIM_STATUS);

-        }

+        }        
+        
+        // Bad status: Charge is NaN.
+        if (particle.getCharge() == Double.NaN)
+        {
+            add(MCParticleFlag.BAD_STAT_CHARGE_NAN);
+        }        

     }
 
     /** Check if a particle has an end disposition */