lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat

diff -u -r1.1 -r1.2
--- PPRDriver.java	13 Sep 2007 14:43:59 -0000	1.1
+++ PPRDriver.java	26 Mar 2008 16:34:25 -0000	1.2
@@ -10,6 +10,7 @@

 
 package org.lcsim.contrib.Cassell.recon.Cheat;
 import org.lcsim.util.Driver;

+import org.lcsim.recon.cluster.util.ClusterEnergyCalculator;

 
 /**
  *

@@ -17,11 +18,12 @@

  */
 public class PPRDriver extends Driver
 {

-    

+    PPRParticleDriver d;

     /** Creates a new instance of PPRDriver */
     public PPRDriver(String in,String out)
     {

-        add(new PPRParticleDriver(in, out));

+        d = new PPRParticleDriver(in, out);
+        add(d);

     }
     public PPRDriver(String in,String out,int mt,int mc)
     {

@@ -30,5 +32,13 @@

         d.setMinCalorimeterHits(mc);
         add(d);
     }

+    public void setPhotonClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        d.setPhotonClusterEnergyCalculator(cec);
+    }
+    public void setNeutralHadronClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        d.setNeutralHadronClusterEnergyCalculator(cec);
+    }

     
 }

lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat

diff -u -r1.7 -r1.8
--- PPRParticleDriver.java	29 Feb 2008 17:19:44 -0000	1.7
+++ PPRParticleDriver.java	26 Mar 2008 16:34:25 -0000	1.8
@@ -20,6 +20,7 @@

 import org.lcsim.event.Cluster;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.recon.cluster.util.BasicCluster;

+import org.lcsim.recon.cluster.util.ClusterEnergyCalculator;

 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.event.base.MCReconstructedParticle;
 import org.lcsim.event.base.BaseReconstructedParticle;

@@ -40,6 +41,8 @@

     int minChits = 3;
     PPRReconParticleConstructor crpc;
     String fastMC = "FastMCTracks";

+    ClusterEnergyCalculator calc;
+    ClusterEnergyCalculator scalc;

     /** Creates a new instance of PPRParticleDriver */
     public PPRParticleDriver(String in,String out)
     {

@@ -62,6 +65,14 @@

     {
         minChits = n;
     }

+    public void setPhotonClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        scalc = cec;
+    }
+    public void setNeutralHadronClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        calc = cec;
+    }

     protected void process(EventHeader event)
     {
 //        System.out.println("Making PPR list from "+inlist);

@@ -72,6 +83,8 @@

         crpc = new PPRReconParticleConstructor();
         crpc.setMinTrackerHits(minThits);
         crpc.setMinCalorimeterHits(minChits);

+        if(calc != null)crpc.setNeutralHadronClusterEnergyCalculator(calc);
+        if(scalc != null)crpc.setPhotonClusterEnergyCalculator(scalc);

         Map<MCParticle,ReconTrack> rtl = null;
         List<List<Track>> all = event.get(Track.class);
         List<Cluster> pprclusters = new ArrayList<Cluster>();

lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat

diff -u -r1.6 -r1.7
--- PPRReconParticleConstructor.java	5 Dec 2007 19:39:26 -0000	1.6
+++ PPRReconParticleConstructor.java	26 Mar 2008 16:34:25 -0000	1.7
@@ -21,6 +21,7 @@

 import org.lcsim.recon.cluster.util.Clusterer;
 import org.lcsim.recon.cluster.util.DetailedNeutralHadronClusterEnergyCalculator;
 import org.lcsim.recon.cluster.util.PhotonClusterEnergyCalculator;

+import org.lcsim.recon.cluster.util.ClusterEnergyCalculator;

 import org.lcsim.mc.fast.tracking.ReconTrack;
 
 /**

@@ -30,8 +31,8 @@

 public class PPRReconParticleConstructor
 {
     Clusterer clusterer;

-    PhotonClusterEnergyCalculator scalc;
-    DetailedNeutralHadronClusterEnergyCalculator calc;

+    ClusterEnergyCalculator scalc;
+    ClusterEnergyCalculator calc;

     int minTrkhits = 3;
     int minCalhits = 3;
     double pimass = .1395679;

@@ -76,6 +77,14 @@

     {
         return makeReconParticle(p,lc,lt,null);
     }

+    public void setPhotonClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        scalc = cec;
+    }
+    public void setNeutralHadronClusterEnergyCalculator(ClusterEnergyCalculator cec)
+    {
+        calc = cec;
+    }

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

@@ -164,6 +173,7 @@

                 else
                 {
                     E = calc.getEnergy(cc);

+                    if(E < .5)E = .5;

                     mass = k0lmass;
                     pid = k0lpid;
                 }