lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.25 -r1.26
--- NonTrivialPFA.java 13 Oct 2007 20:08:39 -0000 1.25
+++ NonTrivialPFA.java 15 Oct 2007 07:16:42 -0000 1.26
@@ -368,12 +368,7 @@
if (cheatOnLikelihood) {
addCheatingStructuralLinker(prefix, eventLargeClusters, eventMips, eventClumps, eventSkeletonClusters, eventUnusedHits, inputHitListsForAssociator, inputClusterListsForAssociator, mcListName);
} else {
- boolean makeExtraLikelihoodPlots = false;
- if (makeExtraLikelihoodPlots) {
- addStructuralLinkerWithPlots(prefix, evalWrapper, eventLargeClusters, eventMips, eventClumps, eventSkeletonClusters, eventUnusedHits, inputHitListsForAssociator, inputClusterListsForAssociator, mcListName);
- } else {
- addStructuralLinker(prefix, evalWrapper, eventLargeClusters, eventMips, eventClumps, eventSkeletonClusters, eventUnusedHits);
- }
+ addStructuralLinker(prefix, evalWrapper, eventLargeClusters, eventMips, eventClumps, eventSkeletonClusters, eventUnusedHits);
}
// Book-keeping
accountant.addListOfNamedLists( new String[] { eventSmallClusters, eventUnusedHits, eventSkeletonClusters, eventPhotonClusters, eventMuonParticles } );
@@ -459,6 +454,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));
}
// Make sure the book-keeping is OK: