Commit in lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat on MAIN
CheatGenReconParticleDriver.java+25-11.1 -> 1.2
PPRReconDriver.java+8-31.1 -> 1.2
PerfectReconParticleDriver.java+21-11.1 -> 1.2
+54-5
3 modified files
Fix collection name problem

lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat
CheatGenReconParticleDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- CheatGenReconParticleDriver.java	15 Feb 2007 19:50:23 -0000	1.1
+++ CheatGenReconParticleDriver.java	15 Feb 2007 22:55:21 -0000	1.2
@@ -20,9 +20,33 @@
     String FSname = "GenFinalStateParticles";
     String Tname = "RefinedCheatTracks";
     String Cname = "RefinedCheatClusters";
-    String Rname = "CheatReconstructedParticles";
+    String Rname;
+    String defRname = "CheatReconstructedParticles";
     public CheatGenReconParticleDriver()
     {
+        Rname = defRname;
+//
+//     Make a list of MCParticles to be considered   
+//
+        add(new CreateFinalStateMCParticleList("Gen"));
+//
+//     Make TrackerHit Clusters
+//
+        add(new CheatTrackDriver());
+//
+//     Make CalorimeterHit Cheat Clusters
+//
+        add(new CheatClusterDriver());
+//
+//     Make Cheat ReconstructedParticles
+//
+       CheatParticleDriver cpd = new CheatParticleDriver(Cname,Tname,FSname);
+       cpd.setOutputName(Rname);
+       add(cpd);
+    }
+    public CheatGenReconParticleDriver(String s)
+    {
+        Rname = s;
 //
 //     Make a list of MCParticles to be considered   
 //

lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat
PPRReconDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- PPRReconDriver.java	15 Feb 2007 20:14:02 -0000	1.1
+++ PPRReconDriver.java	15 Feb 2007 22:55:21 -0000	1.2
@@ -30,13 +30,18 @@
    private AIDA aida = AIDA.defaultInstance();
     String Rname = "CheatGenReconstructedParticles";
     PPRReconParticleConstructor crpc;
-    String outName = "PPRReconParticles";
+    String outName;
+    String defName = "PPRReconParticles";
     public PPRReconDriver()
     {
-        add(new CheatGenReconParticleDriver());
+        outName = defName;
+        add(new CheatGenReconParticleDriver(Rname));
         crpc = new PPRReconParticleConstructor();
     }
-    public void setOutputName(String s){outName = s;}
+    public void setOutputName(String s)
+    {
+        outName = s;
+    }
     protected void process(EventHeader event)
     {
         super.process(event);

lcsim/src/org/lcsim/contrib/Cassell/recon/Cheat
PerfectReconParticleDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- PerfectReconParticleDriver.java	15 Feb 2007 19:50:23 -0000	1.1
+++ PerfectReconParticleDriver.java	15 Feb 2007 22:55:21 -0000	1.2
@@ -16,9 +16,29 @@
    private AIDA aida = AIDA.defaultInstance();
     String Tname = "RefinedCheatTracks";
     String Cname = "RefinedCheatClusters";
-    String Rname = "PerfectReconstructedParticles";
+    String Rname;
+    String defRname = "PerfectReconstructedParticles";
     public PerfectReconParticleDriver()
     {
+        Rname = defRname;
+//
+//     Make TrackerHit Clusters
+//
+        add(new CheatTrackDriver());
+//
+//     Make CalorimeterHit Cheat Clusters
+//
+        add(new CheatClusterDriver());
+//
+//     Make Cheat ReconstructedParticles
+//
+       CheatParticleDriver cpd = new CheatParticleDriver(Cname,Tname);
+       cpd.setOutputName(Rname);
+       add(cpd);
+    }
+    public PerfectReconParticleDriver(String s)
+    {
+        Rname = s;
 //
 //     Make TrackerHit Clusters
 //
CVSspam 0.2.8