diff -u -r1.2 -r1.3
--- SimpleAnalysis.java	2 Oct 2009 01:44:14 -0000	1.2
+++ SimpleAnalysis.java	3 Oct 2009 00:06:36 -0000	1.3
@@ -2,10 +2,15 @@

 
 import java.io.IOException;
 

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.MCParticle;

 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.event.Track;

+import org.lcsim.event.base.BaseTrackMC;
+import org.lcsim.event.util.ParticleTypeClassifier;
+import org.lcsim.recon.cluster.cheat.CheatCluster;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 

@@ -16,6 +21,14 @@

 	AIDA aida = AIDA.defaultInstance();
 	int nevents = 0;
 	double avgE = 0.;

+	double mcpETotal = 0;
+	double allMcpETotal = 0;
+	double eventEnergy = 500; // 500 GeV default event E
+	
+	public void setEventEnergy(double eventEnergy)
+	{
+		this.eventEnergy = eventEnergy;
+	}

 	
 	public SimpleAnalysis()
 	{}

@@ -32,14 +45,72 @@

 	
 	public void process(EventHeader event)
 	{

+		double allMcpESum = 0;
+		for (MCParticle mcp : event.get(MCParticle.class, EventHeader.MC_PARTICLES))
+		{
+			if (mcp.getGeneratorStatus() == mcp.FINAL_STATE)
+			{
+				allMcpESum += mcp.getEnergy();
+				allMcpETotal += mcp.getEnergy();
+			}
+		}

 		double energySum = 0.;
 		int nparticles = 0;
 		int nclusters = 0;
 		int ntracks = 0;
 		int ntrackHits = 0;
 		int nhits = 0;

+		double photonESum = 0;
+		int nphoton = 0;
+		double chargedHadronESum = 0;
+		int nchargedHadron = 0;
+		double neutralHadronESum = 0;
+		int nneutralHadron = 0;
+		double calHitESum = 0;
+		int nTracksLowHits = 0;
+		int nTracksLowHits2 =0;
+		int nTracksLowPt = 0;
+		int nTracksLowPt2 = 0;
+		double muonESum = 0;
+		int nmuon = 0;
+		double electronESum = 0;
+		int nelectron = 0;
+		double mcparticleESum = 0;
+		double mcparticleMassSum = 0;
+		int nclustersLowHits = 0;
+		int nclustersLowHits2 = 0;
+		int nneutrino = 0;
+		int neutrinoESum = 0;
+		double positronESum = 0;
+		int npositron = 0;

 		for (ReconstructedParticle p : event.get(ReconstructedParticle.class, particleCollection))
 		{

+			int pdgid = 0;
+			MCParticle mcp = null;
+			// MCParticle from BaseTrackMC.
+			if (p.getTracks().size() != 0)
+			{
+				mcp = ((BaseTrackMC)p.getTracks().get(0)).getMCParticle();
+			}
+			// MCParticle from CheatCluster.
+			else if (p.getClusters().size() != 0)
+			{
+				mcp = ((CheatCluster)p.getClusters().get(0)).getMCParticle();
+			}
+			// No tracks or clusters.  This should never happen!
+			else
+			{
+				System.out.println("Skipping particle without tracks or clusters!");
+				continue;
+			}
+			// Set PDG id.
+			pdgid = mcp.getPDGID();
+			
+			mcparticleESum += mcp.getEnergy();
+			mcpETotal += mcp.getEnergy();
+			mcparticleMassSum += mcp.getMass();
+			
+			double charge = p.getCharge();

 			energySum += p.getEnergy();
 			++nparticles;
 			nclusters += p.getClusters().size();

@@ -48,26 +119,143 @@

 			for (Cluster c : p.getClusters())
 			{
 				nhits += c.getCalorimeterHits().size();

+				if (c.getCalorimeterHits().size() < 3)
+				{
+					++nclustersLowHits;
+				}
+				else if (c.getCalorimeterHits().size() < 10)
+				{
+					++nclustersLowHits2;
+				}

 				nhitsP += c.getCalorimeterHits().size();

+				for (CalorimeterHit calhit : c.getCalorimeterHits())
+				{
+					calHitESum += calhit.getCorrectedEnergy();
+				}

 			}
 			int ntrackHitsP = 0;
 			for (Track t : p.getTracks())
 			{
 				ntrackHits += t.getTrackerHits().size();
 				ntrackHitsP += t.getTrackerHits().size();