lcsim-contrib/src/main/java/org/lcsim/contrib/jeremym/pfa/cheat

diff -u -r1.1 -r1.2
--- CalorimeterHitCollectionDriver.java	2 Oct 2009 01:10:02 -0000	1.1
+++ CalorimeterHitCollectionDriver.java	7 Oct 2009 07:42:15 -0000	1.2
@@ -69,4 +69,4 @@

 		// Add combined collection to event.
 		event.put(outputCollection, combinedCollection, CalorimeterHit.class, flags, null);
 	}

-}

\ No newline at end of file

+}

lcsim-contrib/src/main/java/org/lcsim/contrib/jeremym/pfa/cheat

diff -u -r1.3 -r1.4
--- PerfectClusteringDriver.java	7 Oct 2009 06:51:34 -0000	1.3
+++ PerfectClusteringDriver.java	7 Oct 2009 07:42:16 -0000	1.4
@@ -154,6 +154,9 @@

 						if (contrib == particle)
 						{
 							// Add contributing hit to list.

+                                                        if (contribHits.contains(simhit))
+                                                       	{throw new RuntimeException("oops!");}
+    

 							contribHits.add(simhit);
 						}
 					}

lcsim-contrib/src/main/java/org/lcsim/contrib/jeremym/pfa/cheat

diff -u -r1.4 -r1.5
--- SimpleAnalysis.java	7 Oct 2009 06:51:34 -0000	1.4
+++ SimpleAnalysis.java	7 Oct 2009 07:42:16 -0000	1.5
@@ -17,7 +17,6 @@

 public class SimpleAnalysis extends Driver
 {
 	String particleCollection = "CheatReconParticles";

-	//String filename = "SimpleAnalysis.aida";

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

@@ -37,15 +36,15 @@

 	{
 		this.particleCollection = particleCollection;
 	}

-/*	
-	public void setFileName(String filename)
-	{
-		this.filename = filename;
-	}
-*/	

+ 
+        public void startOfData()
+        {
+            AIDA.defaultInstance().tree().mkdir("/CheatRecon");
+        }
+

 	public void process(EventHeader event)
 	{

-		AIDA.defaultInstance().tree().cd("/");

+		AIDA.defaultInstance().tree().cd("/CheatRecon");

 		double allMcpESum = 0;
 		for (MCParticle mcp : event.get(MCParticle.class, EventHeader.MC_PARTICLES))
 		{

@@ -67,7 +66,7 @@

 		int nchargedHadron = 0;
 		double neutralHadronESum = 0;
 		int nneutralHadron = 0;

-		double calHitESum = 0;

+		//double calHitESum = 0;

 		int nTracksLowHits = 0;
 		int nTracksLowHits2 =0;
 		int nTracksLowPt = 0;

@@ -129,10 +128,10 @@

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

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

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

 			}
 			int ntrackHitsP = 0;
 			for (Track t : p.getTracks())

@@ -214,8 +213,8 @@

 		aida.cloud1D("Clusters with < 3 CalHits per Event").fill(nclustersLowHits);
 		aida.cloud1D("Clusters with < 10 CalHits per Event").fill(nclustersLowHits2);
 		aida.cloud1D("Tracks per Event").fill(ntracks);

-		aida.cloud1D("CalHits per Event").fill(nhits);
-		aida.cloud1D("CalHit Energy per Event").fill(calHitESum);

+		//aida.cloud1D("CalHits per Event").fill(nhits);
+		//aida.cloud1D("CalHit Energy per Event").fill(calHitESum);

 		aida.cloud1D("Tracker Hits per Event").fill(ntrackHits);
 		aida.cloud1D("Tracks with < 7 TrackerHits per Event").fill(nTracksLowHits);
 		aida.cloud1D("Tracks with < 3 TrackerHits per Event").fill(nTracksLowHits2);

@@ -263,6 +262,7 @@

 	
 	public void endOfData()
 	{

+                System.out.println("SimpleAnalysis - endOfData"); 

 		avgE = avgE / nevents;
 		aida.cloud1D("Total Events Processed").fill(nevents);
 		aida.cloud1D("Average Energy for " + nevents + " Events").fill(avgE);