lcsim/src/org/lcsim/contrib/uiowa/structural

diff -u -r1.7 -r1.8
--- ExamplePFA.java	23 Dec 2005 17:24:06 -0000	1.7
+++ ExamplePFA.java	24 Dec 2005 19:22:39 -0000	1.8
@@ -19,7 +19,7 @@

 /**
  * An example PFA using the structual algorithm.
  *

- * @version $Id: ExamplePFA.java,v 1.7 2005/12/23 17:24:06 mcharles Exp $

+ * @version $Id: ExamplePFA.java,v 1.8 2005/12/24 19:22:39 mcharles Exp $

  */
 
 public class ExamplePFA extends Driver

@@ -150,11 +150,14 @@

 		//    The total number of hits is the same as the total number of hits in "MSTCluster linked"
 		add (new MakeSeparatedClusters("MSTCluster linked", "MapClustersToSkeletons", "MSTCluster separated"));
 		// Handle fragments:

-		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged", new SimpleFragmentIdentifier(nameOfHelixToClusterMap)));
-		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged-cheat", new CheatFragmentIdentifier("MSTCluster separated")));
-		add (new FragmentRemover("MSTCluster separated", "MSTCluster fragments removed", new SimpleFragmentIdentifier(nameOfHelixToClusterMap)));
-		add (new FragmentRemover("MSTCluster separated", "MSTCluster fragments removed-cheat", new CheatFragmentIdentifier("MSTCluster separated")));
-		add (new CheatFragmentMerger("MSTCluster separated", "MSTCluster fragments cheated", new CheatFragmentIdentifier("MSTCluster separated")));

+		FragmentIdentifier nonCheatID = new SimpleFragmentIdentifier(nameOfHelixToClusterMap);
+		FragmentIdentifier    cheatID = new CheatFragmentIdentifier("MSTCluster separated");
+		FragmentIdentifier  wrappedID = new TestFragmentIdentifier(nonCheatID, cheatID);
+		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged", wrappedID)); // or nonCheatID
+		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged-cheat", cheatID));
+		add (new FragmentRemover("MSTCluster separated", "MSTCluster fragments removed", nonCheatID));
+		add (new FragmentRemover("MSTCluster separated", "MSTCluster fragments removed-cheat", cheatID));
+		add (new CheatFragmentMerger("MSTCluster separated", "MSTCluster fragments cheated", cheatID));

 		// When done, check the total energy in the event
 		add (new EventEnergySum("MSTCluster fragments merged", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-merged.aida"));
 		add (new EventEnergySum("MSTCluster fragments merged-cheat", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-merged-cheat.aida"));

@@ -162,6 +165,7 @@

 		add (new EventEnergySum("MSTCluster fragments removed-cheat", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-removed-cheat.aida"));
 		add (new EventEnergySum("MSTCluster fragments cheated", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-cheated.aida"));
 		add (new EventEnergySum("MSTCluster linked", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-all.aida"));

+		add (new test.Test("MSTCluster linked")); // TEST!

 
 		List<String> knownClusterLists = new Vector<String>();
 		knownClusterLists.add("MSTCluster EMCal");