lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.29 -r1.30
--- NonTrivialPFA.java	10 Nov 2007 02:09:57 -0000	1.29
+++ NonTrivialPFA.java	21 Nov 2007 23:08:06 -0000	1.30
@@ -268,8 +268,10 @@

 	{
 	    // Find clumps
 	    String prefix = "clumpfinder__";

-	    addClumpFinder(prefix, eventHitMapEcalWithoutMipsOrPhotons, eventClumpsEcal, eventHitMapEcalWithoutMipsOrPhotonsOrClumps);
-	    addClumpFinder(prefix, eventHitMapHcalWithoutMips, eventClumpsHcal, eventHitMapHcalWithoutMipsOrClumps);

+	    //addClumpFinder(prefix, eventHitMapEcalWithoutMipsOrPhotons, eventClumpsEcal, eventHitMapEcalWithoutMipsOrPhotonsOrClumps);
+	    //addClumpFinder(prefix, eventHitMapHcalWithoutMips, eventClumpsHcal, eventHitMapHcalWithoutMipsOrClumps);
+	    addAlternateClumpFinder(prefix, eventHitMapEcalWithoutMipsOrPhotons, eventClumpsEcal, eventHitMapEcalWithoutMipsOrPhotonsOrClumps);
+	    addAlternateClumpFinder(prefix, eventHitMapHcalWithoutMips, eventClumpsHcal, eventHitMapHcalWithoutMipsOrClumps);

 	    // Merge ECAL & HCAL lists
 	    ListAddDriver<Cluster> mergeClumps = new ListAddDriver<Cluster>(Cluster.class);
 	    mergeClumps.addInputList(eventClumpsEcal);

@@ -422,12 +424,9 @@

 	    accountant.addListOfNamedLists( new String[] { eventSmallPhotonParticles, eventLargePhotonParticleList, "merge_ron_ron__neutralHadronParticles", "merge_ron_ron__chargedHadronParticlesAfterFragmentHandling", eventMuonParticles } );
 
 	    accountant.addListOfNamedLists( new String[] { eventOutputParticlesFlushed } );

-
-	    // OK! Now try again in a different way.
-	    //add(new ReclusterDriver(mcListName, trackList,  eventMuonParticles,  eventPhotonClusters,  eventSkeletonClusters,  eventSmallClusters,  eventUnusedHits,  eventLargeClusters,  eventMips,  eventClumps, eventSplitSkeletonClusters, evalWrapper));
-	    //add(new ParticleListToClusterListDriver("ReclusteredParticles", "ReclusteredClusters"));

 	}
 

+

 	// Make sure the book-keeping is OK:
 	add(accountant);
     }

@@ -729,6 +728,11 @@

 	ClumpFinder findClumps = new ClumpFinder(inputHitMap, outputClusterList, outputHitMap);
 	add(findClumps);
     }

+    protected void addAlternateClumpFinder(String prefix, String inputHitMap, String outputClusterList, String outputHitMap)
+    {
+	ClumpFinder findClumps = new AlternateClumpFinder(inputHitMap, outputClusterList, outputHitMap);
+	add(findClumps);
+    }

 
     protected void addHadronicClusterFinder(String prefix, String inputHitMapECAL, String inputHitMapHCAL, String inputMIPListECAL, String inputMIPListHCAL, String inputClumpListECAL, String inputClumpListHCAL, String outputLargeClusters, String outputSmallClusters)
     {

lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.2 -r1.3
--- ExampleRunAndWriteOutPFA.java	9 Nov 2007 20:00:43 -0000	1.2
+++ ExampleRunAndWriteOutPFA.java	21 Nov 2007 23:08:06 -0000	1.3
@@ -7,6 +7,7 @@

 import org.lcsim.util.loop.LCIODriver;
 import org.lcsim.util.*;
 import org.lcsim.event.*;

+import org.lcsim.recon.cluster.structural.likelihood.LikelihoodEvaluatorWrapper;

 
 /**
  * Example driver to create PFA output with a list of

@@ -23,7 +24,10 @@

     public ExampleRunAndWriteOutPFA()
     {
         add(new org.lcsim.contrib.uiowa.NonTrivialPFA(false)); // Run the PFA, output is a List<ReconstructedParticle> named "PFAReconstructedParticles"

+	add(new org.lcsim.contrib.uiowa.ReclusterDriver("ReconFSParticles", "FSReconTracks", "muonParticles", "photonClustersWithoutFragments", "skeletons", "MSTClustersLinkedWithFewerThanTenHits", "structuralUnusedHits", "MSTClustersLinkedWithTenOrMoreHits", "mips", "clumps", "splitSkeletons", new LikelihoodEvaluatorWrapper()));
+	add(new FlushReconstructedParticlesDriver("ReclusteredParticles", "FlushedReclusteredParticles", "FlushedReclusteredClusters"));

 	add(new org.lcsim.contrib.uiowa.MassPlots("PFAReconstructedParticles", "output-write.aida")); // Make some histograms and write them to a file

+	add(new org.lcsim.contrib.uiowa.MassPlots("ReclusteredParticles", "output-write-reclustered.aida")); // Make some histograms and write them to a file

         add(new org.lcsim.util.loop.LCIODriver("test.slcio")); // Write out to an LCIO file
     }
 }

lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.1 -r1.2
--- ExampleReadPFA.java	4 Sep 2007 17:27:56 -0000	1.1
+++ ExampleReadPFA.java	21 Nov 2007 23:08:06 -0000	1.2
@@ -16,5 +16,6 @@

 {
     public ExampleReadPFA() {
 	add(new MassPlots("PFAReconstructedParticles", "output-read.aida"));

+	add(new MassPlots("ReclusteredParticles", "output-read-reclustered.aida"));

     }
 }