diff -u -r1.3 -r1.4
--- CheatGenReconParticleDriver.java	21 Feb 2007 00:54:24 -0000	1.3
+++ CheatGenReconParticleDriver.java	2 Mar 2007 16:41:19 -0000	1.4
@@ -6,7 +6,7 @@

 import org.lcsim.util.Driver;
 import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
 import org.lcsim.recon.tracking.cheat.CheatTrackDriver;

-import org.lcsim.recon.particle.cheat.CheatParticleDriver;

+import org.lcsim.recon.particle.CheatParticleDriver;

 import org.lcsim.event.util.CreateFinalStateMCParticleList;
 
 /**

diff -u -r1.3 -r1.4
--- PPRReconDriver.java	20 Feb 2007 20:42:32 -0000	1.3
+++ PPRReconDriver.java	2 Mar 2007 16:41:19 -0000	1.4
@@ -1,58 +1,28 @@

 package org.lcsim.contrib.Cassell.recon.Cheat;

-
-import hep.aida.*;
-import org.lcsim.util.aida.AIDA;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collection;
-import java.util.Map;
-import java.util.HashMap;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.Track;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.MCReconstructedParticle;
-import org.lcsim.event.SimCalorimeterHit;

 import org.lcsim.util.Driver;

-import org.lcsim.event.util.*;
-import org.lcsim.recon.cluster.cheat.*;
-import org.lcsim.recon.cluster.util.*;
-import org.lcsim.recon.tracking.cheat.*;
-import org.lcsim.recon.particle.cheat.*;

+

 /**
  *
  * @author cassell
  */
 public class PPRReconDriver extends Driver
 {

-   private AIDA aida = AIDA.defaultInstance();

     String Rname = "CheatGenReconstructedParticles";

-    PPRReconParticleConstructor crpc;

     String outName;

-    String defName = "PPRReconParticles";
-    public PPRReconDriver()

+    public PPRReconDriver(String out)

     {

-        outName = defName;

+        outName = out;

         add(new CheatGenReconParticleDriver(Rname));

-        crpc = new PPRReconParticleConstructor();

+        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
+        add(d);

     }

-    public void setOutputName(String s)

+    public PPRReconDriver(String out,int minT, int minC)

     {

-        outName = s;
-    }
-    protected void process(EventHeader event)
-    {
-        super.process(event);
-        List<MCReconstructedParticle> rl = event.get(MCReconstructedParticle.class,Rname);
-        List<ReconstructedParticle>outrl = new ArrayList<ReconstructedParticle>();
-        for(MCReconstructedParticle p:rl)
-        {
-           ReconstructedParticle rp = crpc.makeReconParticle(p.getMCParticle(),p.getClusters(),p.getTracks());
-           if(rp.getEnergy() > 0.)outrl.add(rp);
-        }
-        event.put(outName,outrl,ReconstructedParticle.class,0);

+        outName = out;
+        add(new CheatGenReconParticleDriver(Rname));
+        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
+        d.setMinTrackerHits(minT);
+        d.setMinCalorimeterHits(minC);
+        add(d);

     }
 }

diff -u -r1.2 -r1.3
--- PPRReconParticleConstructor.java	20 Feb 2007 20:42:32 -0000	1.2
+++ PPRReconParticleConstructor.java	2 Mar 2007 16:41:19 -0000	1.3
@@ -32,6 +32,7 @@

     PhotonClusterEnergyCalculator scalc;
     DetailedNeutralHadronClusterEnergyCalculator calc;
     int minTrkhits = 3;

+    int minCalhits = 3;

     double cmass = .1395679;
     double nmass = .497671;
     double[] cov = {0.,0.,0.,0.,0.,0.};

@@ -42,6 +43,14 @@

         calc = null;
         clusterer = new NearestNeighborClusterer(4,4,2,0,0.);
     }

+    public void setMinTrackerHits(int n)
+    {
+        minTrkhits = n;
+    }
+    public void setMinCalorimeterHits(int n)
+    {
+        minCalhits = n;
+    }

     public ReconstructedParticle makeReconParticle(
         MCParticle p,List<Cluster> lc,List<Track> lt)
     {

@@ -91,15 +100,18 @@

         if(lc.size() > 0)
         {
            for(Cluster c:lc)cc.addCluster(c);

-           if(p.getPDGID() == 22)
-           {
-              E = scalc.getEnergy(cc);
-           }
-           else

+           if(cc.getCalorimeterHits().size() >= minCalhits)

            {

-               E = calc.getEnergy(cc);
-               mass = nmass;
-              pid = new CheatParticleID(130);

+                if(p.getPDGID() == 22)
+                {
+                    E = scalc.getEnergy(cc);
+                }
+                else
+                {
+                    E = calc.getEnergy(cc);
+                    mass = nmass;
+                    pid = new CheatParticleID(130);
+                }

            }
         }
         if(E > 0.)

diff -u -r1.3 -r1.4
--- PerfectReconParticleDriver.java	20 Feb 2007 20:42:32 -0000	1.3
+++ PerfectReconParticleDriver.java	2 Mar 2007 16:41:20 -0000	1.4
@@ -6,7 +6,7 @@

 import org.lcsim.util.Driver;
 import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
 import org.lcsim.recon.tracking.cheat.CheatTrackDriver;

-import org.lcsim.recon.particle.cheat.CheatParticleDriver;

+import org.lcsim.recon.particle.CheatParticleDriver;

 /**
  * Make a list of ReconstructedParticles perfectly by cheating at each step
  *

diff -u -r1.2 -r1.3
--- example2JetAnalysis.java	20 Feb 2007 20:42:32 -0000	1.2
+++ example2JetAnalysis.java	2 Mar 2007 16:41:20 -0000	1.3
@@ -25,8 +25,7 @@

 // 
 //  Create a List of perfect pattern recognition reconstructed particles
 //

-      PPRReconDriver rd = new PPRReconDriver();
-      rd.setOutputName(reconname);

+      PPRReconDriver rd = new PPRReconDriver(reconname);

       add(rd);
 //
 //  Ask the jet finder to find 2 jets