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

diff -u -r1.9 -r1.10
--- ExamplePFA.java	3 Jan 2006 19:34:47 -0000	1.9
+++ ExamplePFA.java	3 Jan 2006 20:15:39 -0000	1.10
@@ -16,7 +16,7 @@

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

- * @version $Id: ExamplePFA.java,v 1.9 2006/01/03 19:34:47 mcharles Exp $

+ * @version $Id: ExamplePFA.java,v 1.10 2006/01/03 20:15:39 mcharles Exp $

  */
 
 public class ExamplePFA extends Driver

@@ -27,7 +27,7 @@

 
     public ExamplePFA(boolean writeLikelihood) 
     {

-        // Step 1 (here):

+        // Step 1:

         //   For each MC particle, make a helix swimmer.
 	//   Requires B field.
         //   Output: Helix swimmer and MC particle (linked)

@@ -44,6 +44,8 @@

 	//   (a) Handle MCParticles which weren't mapped properly
         //   (b) Look at E/P for MCParticles which were mapped.
 	//

+
+	// Make helix swimmers for tracks and swim to the ECAL:

 	String nameOfHelixList = new String("HelixList");
 	String nameOfExtrapolationInfoList = new String("HelixExtrapolatedToECALList");
 	String nameOfHelixToClusterMap = new String("HelixToClusterMap");

@@ -54,7 +56,6 @@

 	// Begin with a big-scale cluster set, made with the MST:
 	Metrics geomDist = new GeometricalDistance();
 	Metrics hitHitDist = new MinimumHitToHitDistance();

-

 	MSTClusterDriver mstDriverEcal = new MSTClusterDriver("EMCal");
 	MSTClusterDriver mstDriverHcal = new MSTClusterDriver("HCal");
 	mstDriverEcal.registerMetrics(geomDist);

@@ -113,8 +114,8 @@

 		eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackDOCA(), 50, 0.0, 100.0, false, true);
 		eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackPOCAInCalorimeter(), 2, -0.5, 1.5, false, false);
 		eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackSmallestDistanceToPOCA(), 25, 0.0, 250.0, false, true);

-		//eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackIntermediateHitsCount(), 10, -0.5, 9.5, false, true);
-		//eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackIntermediateHitsFraction(), 11, -0.05, 1.05, false, false);

+		//eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackIntermediateHitsCount(), 10, -0.5, 9.5, false, true); // Not implemented
+		//eval.addLikelihoodQuantityTrackToTrack(new TrackToTrackIntermediateHitsFraction(), 11, -0.05, 1.05, false, false); // Not implemented

 		eval.addLikelihoodQuantityTrackToClump(new TrackToClumpDOCA(), 50, 0.0, 300.0, false, true);
 		eval.addLikelihoodQuantityTrackToClump(new ClusterToClusterMinDistance(), 25, 0.0, 250.0, false, true);
 		eval.addLikelihoodQuantityClumpToClump(new ClumpToClumpDOCA(), 20, 0.0, 200.0, false, true);

@@ -148,36 +149,9 @@

 		add (new MakeSeparatedClusters("MSTCluster linked", "MapClustersToSkeletons", "MSTCluster separated"));
 		// Handle fragments:
 		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));

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

 		// 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!
-
-		List<String> knownClusterLists = new Vector<String>();
-		knownClusterLists.add("MSTCluster EMCal");
-		knownClusterLists.add("MSTCluster HCal");
-		knownClusterLists.add("MSTCluster linked");
-		knownClusterLists.add("MSTCluster separated");
-
-// 		add (new CheckStatusOfHitList("EcalBarrHits"));
-// 		add (new CheckStatusOfHitList("EcalEndcapHits"));
-// 		add (new CheckStatusOfHitList("HcalBarrHits"));
-// 		add (new CheckStatusOfHitList("HcalEndcapHits"));
-// 		add (new CheckStatusOfClusterList("MSTCluster EMCal", knownClusterLists));
-// 		add (new CheckStatusOfClusterList("MSTCluster HCal", knownClusterLists));
- 		add (new CheckStatusOfClusterList("MSTCluster linked", knownClusterLists));
- 		add (new CheckStatusOfClusterList("MSTCluster separated", knownClusterLists));

 	    }
 	}
     }