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

diff -u -r1.2 -r1.3
--- OutputPPRRecon.java	4 Jun 2008 17:30:27 -0000	1.2
+++ OutputPPRRecon.java	6 Jun 2008 18:43:15 -0000	1.3
@@ -9,7 +9,6 @@

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

-import org.lcsim.recon.cluster.util.*;

 import org.lcsim.util.Driver;
 import java.io.File;
 import org.lcsim.util.loop.LCIODriver;

@@ -33,40 +32,38 @@

     String PPRPflowRname = "PPRReconParticles";
     String CheatReconFSname = "ReconFSParticles";
     /** Creates a new instance of OutputPPRRecon */

-    public OutputPPRRecon(String location, String lciofn)

+    public OutputPPRRecon(File output)

     {
 //

-// Do the cheating reconstruction (includes Digisim)

+// Do the PPR reconstruction

 //

-        CheatReconDriver crd = new CheatReconDriver();
-        crd.setCheatReconstructedParticleOutputName(CheatReconRname);
-        crd.setCheatFSParticleOutputName(CheatReconFSname);
-        add(crd);
-        
-        
-        
-//
-// Make the perfect pattern recognition pflow reconstructed particles from the
-// Cheat Recon particles
-//
-        PPRDriver pprd = new PPRDriver(CheatReconRname,PPRPflowRname);
-        ClusterEnergyCalculator pcec = new QPhotonClusterEnergyCalculator();
-        pprd.setPhotonClusterEnergyCalculator(pcec);
-        ClusterEnergyCalculator nhcec = new QNeutralHadronClusterEnergyCalculator();
-        pprd.setNeutralHadronClusterEnergyCalculator(nhcec);
-        add(pprd);
-        

+        add(new PPRReconDriver());

 //
 // Write the events to disk
 //

-        File output = new File(location,lciofn);

         LCIODriver driver = new LCIODriver(output);
         for(int i=0;i<ignore.length;i++)
         {
             driver.getWriter().addIgnore(ignore[i]);
         }
         add(driver);

-        

+    }
+    public OutputPPRRecon(String path, String name)
+    {
+//
+// Do the PPR reconstruction
+//
+        add(new PPRReconDriver());
+//
+// Write the events to disk
+//
+        File output = new File(path,name);
+        LCIODriver driver = new LCIODriver(output);
+        for(int i=0;i<ignore.length;i++)
+        {
+            driver.getWriter().addIgnore(ignore[i]);
+        }
+        add(driver);

     }
     
 }

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

diff -u -r1.5 -r1.6
--- PPRReconDriver.java	13 Sep 2007 14:41:29 -0000	1.5
+++ PPRReconDriver.java	6 Jun 2008 18:43:15 -0000	1.6
@@ -1,5 +1,6 @@

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

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

 
 /**
  *

@@ -7,41 +8,30 @@

  */
 public class PPRReconDriver extends Driver
 {

-    String defRname = "CheatGenReconstructedParticles";
-    String Rname;
-    String outName;
-    public PPRReconDriver(String out)

+    String CheatReconRname = "ReconPerfectReconParticles";
+    String PPRPflowRname = "PPRReconParticles";
+    String CheatReconFSname = "ReconFSParticles";
+    public PPRReconDriver()

     {

-        outName = out;
-        Rname = defRname;
-        add(new CheatGenReconParticleDriver(Rname));
-        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
-        add(d);
-    }
-    public PPRReconDriver(String out,int minT, int minC)
-    {
-        outName = out;
-        Rname = defRname;
-        add(new CheatGenReconParticleDriver(Rname));
-        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
-        d.setMinTrackerHits(minT);
-        d.setMinCalorimeterHits(minC);
-        add(d);
-    }
-    public PPRReconDriver(String perfect,String out)
-    {
-        outName = out;
-        Rname = perfect;
-        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
-        add(d);
-    }
-    public PPRReconDriver(String perfect,String out,int minT, int minC)
-    {
-        outName = out;
-        Rname = perfect;
-        PPRParticleDriver d = new PPRParticleDriver(Rname, outName);
-        d.setMinTrackerHits(minT);
-        d.setMinCalorimeterHits(minC);
-        add(d);

+//
+// Do the cheating reconstruction (includes Digisim)
+//
+        CheatReconDriver crd = new CheatReconDriver();
+        crd.setCheatReconstructedParticleOutputName(CheatReconRname);
+        crd.setCheatFSParticleOutputName(CheatReconFSname);
+        add(crd);
+        
+        
+        
+//
+// Make the perfect pattern recognition pflow reconstructed particles from the
+// Cheat Recon particles
+//
+        PPRDriver pprd = new PPRDriver(CheatReconRname,PPRPflowRname);
+        ClusterEnergyCalculator pcec = new QPhotonClusterEnergyCalculator();
+        pprd.setPhotonClusterEnergyCalculator(pcec);
+        ClusterEnergyCalculator nhcec = new QNeutralHadronClusterEnergyCalculator();
+        pprd.setNeutralHadronClusterEnergyCalculator(nhcec);
+        add(pprd);

     }
 }