diff -u -r1.1 -r1.2
--- PFA.java	6 Jan 2006 23:02:47 -0000	1.1
+++ PFA.java	12 Jan 2006 22:21:43 -0000	1.2
@@ -17,7 +17,7 @@

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

- * @version $Id: PFA.java,v 1.1 2006/01/06 23:02:47 mcharles Exp $

+ * @version $Id: PFA.java,v 1.2 2006/01/12 22:21:43 mcharles Exp $

  */
 
 public class PFA extends Driver

@@ -27,12 +27,16 @@

     List<StructuralLikelihoodQuantityWithEventInfo> m_perEventQuantities = null;
 
     TestFragmentIdentifier  m_wrappedID = null;

+    TestFragmentIdentifier  m_wrappedID2 = null;

 
     public void suspend()
     {
 	if (m_wrappedID != null) {
 	    m_wrappedID.commit();
 	}

+	if (m_wrappedID2 != null) {
+	    m_wrappedID2.commit();
+	}

 	super.suspend();
     }
 

@@ -159,24 +163,37 @@

 		//    A cluster with no skeletons will have one entry
 		//    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"));

+
+		// Or, cheat like a bandit
+		add (new StructuralCheater("MSTCluster linked", "MSTCluster separated cheated"));
+

 		// Handle fragments:
 		FragmentIdentifier nonCheatID = new SimpleFragmentIdentifier(nameOfHelixToClusterMap);
 		FragmentIdentifier    cheatID = new CheatFragmentIdentifier("MSTCluster separated");

+		FragmentIdentifier    cheatID2 = new CheatFragmentIdentifier("MSTCluster separated cheated");

 		m_wrappedID = new TestFragmentIdentifier(nonCheatID, cheatID);

+		//m_wrappedID2 = new TestFragmentIdentifier(nonCheatID, cheatID2);

 		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged", m_wrappedID)); // or nonCheatID

+		//add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged", nonCheatID));

 		add (new FragmentMerger("MSTCluster separated", "MSTCluster fragments merged-cheat", cheatID));
 		//add (new TestFragmentMerger("MSTCluster separated", "MSTCluster fragments merged-cheat", cheatID, new CheatFragmentMerger("MSTCluster separated", "MSTCluster fragments cheated xxx", cheatID))); // test!
 		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));

+		add (new FragmentMerger("MSTCluster separated cheated", "MSTCluster fragments merged (cheated on separation)", nonCheatID));
+		//add (new FragmentMerger("MSTCluster separated cheated", "MSTCluster fragments merged (cheated on separation)", m_wrappedID2));
+

 		// 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"));
-		add (new EventEnergySum("MSTCluster fragments removed", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-removed.aida"));
-		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!

+		/*
+		  add (new EventEnergySum("MSTCluster fragments merged", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-merged.aida"));
+		  add (new EventEnergySum("MSTCluster fragments merged-cheat", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-merged-cheat.aida"));
+		  add (new EventEnergySum("MSTCluster fragments removed", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-removed.aida"));
+		  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!
+		  add (new EventEnergySum("MSTCluster fragments merged (cheated on separation)", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap, "EnergySumHistos-merged-cheated-on-separation.aida"));
+		  */

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