lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.6 -r1.7
--- ExamplePFA.java 16 Dec 2005 21:12:13 -0000 1.6
+++ ExamplePFA.java 23 Dec 2005 17:24:06 -0000 1.7
@@ -19,7 +19,7 @@
/**
* An example PFA using the structual algorithm.
*
- * @version $Id: ExamplePFA.java,v 1.6 2005/12/16 21:12:13 mcharles Exp $
+ * @version $Id: ExamplePFA.java,v 1.7 2005/12/23 17:24:06 mcharles Exp $
*/
public class ExamplePFA extends Driver
@@ -151,11 +151,17 @@
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", new CheatFragmentIdentifier("MSTCluster separated")));
- //add (new FragmentRemover("MSTCluster separated", "MSTCluster fragments merged", new SimpleFragmentIdentifier(nameOfHelixToClusterMap)));
- //add (new CheatFragmentMerger("MSTCluster separated", "MSTCluster fragments merged", new CheatFragmentIdentifier("MSTCluster separated")));
+ 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")));
// When done, check the total energy in the event
- add (new EventEnergySum("MSTCluster fragments merged", nameOfClusterToHelixMapLinked, nameOfHelixToClusterMap));
+ 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"));
List<String> knownClusterLists = new Vector<String>();
knownClusterLists.add("MSTCluster EMCal");
lcsim/src/org/lcsim/contrib/uiowa/structural
diff -u -r1.1 -r1.2
--- EventEnergySum.java 16 Dec 2005 21:11:39 -0000 1.1
+++ EventEnergySum.java 23 Dec 2005 17:24:06 -0000 1.2
@@ -35,7 +35,7 @@
public class EventEnergySum extends Driver
{
- public EventEnergySum(String inputClusterListName, String nameOfClusterToInfoMap, String nameOfHelixToClusterMap)
+ public EventEnergySum(String inputClusterListName, String nameOfClusterToInfoMap, String nameOfHelixToClusterMap, String outputFileName)
{
m_inputClusterListName = inputClusterListName;
m_nameOfClusterToInfoMap = nameOfClusterToInfoMap;
@@ -43,7 +43,7 @@
IAnalysisFactory af = IAnalysisFactory.create();
try {
- m_tree = af.createTreeFactory().create("EnergySumHistos.aida","xml",false,true);
+ m_tree = af.createTreeFactory().create(outputFileName,"xml",false,true);
m_histoFactory = af.createHistogramFactory(m_tree);
m_hHadHitEnergy = m_histoFactory.createHistogram1D("hHadHitEnergy", 1000, 0.0, 0.00005);
m_hHadEndcapHitEnergy = m_histoFactory.createHistogram1D("hHadEndcapHitEnergy", 1000, 0.0, 0.00005);
