lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.2 -r1.3
--- NonTrivialPFA.java 4 Apr 2007 18:10:53 -0000 1.2
+++ NonTrivialPFA.java 10 Apr 2007 20:43:08 -0000 1.3
@@ -166,14 +166,14 @@
String outputHitMap = "hit map ecal without photons";
addPhotonFinder(prefix, inputHitMap, inputTrackList, photonClusterList, outputHitMap);
prefix = "photonmaker: ";
- String photonParticleList = "large photon particles";
+ String photonParticleList_adhoc = "large photon particles (adhoc calib)";
String photonParticleList_RonCalib = "large photon particles (ron calib)";
- addPhotonParticleMaker(prefix, photonClusterList, photonParticleList, adHocCalib);
+ addPhotonParticleMaker(prefix, photonClusterList, photonParticleList_adhoc, adHocCalib);
addPhotonParticleMaker(prefix, photonClusterList, photonParticleList_RonCalib, ronPhotonCalib);
// Book-keeping
accountant.addListOfNamedLists( new String[] { "hit map ecal without photons", "photon clusters", "input hit map hcal" } );
- accountant.addListOfNamedLists( new String[] { "hit map ecal without photons", "large photon particles", "input hit map hcal" } );
- accountant.addListOfNamedLists( new String[] { "hit map ecal without photons", "large photon particles (ron calib)", "input hit map hcal" } );
+ accountant.addListOfNamedLists( new String[] { "hit map ecal without photons", photonParticleList_adhoc, "input hit map hcal" } );
+ accountant.addListOfNamedLists( new String[] { "hit map ecal without photons", photonParticleList_RonCalib, "input hit map hcal" } );
}
@@ -285,14 +285,15 @@
// Look for teeny clusters near front of ECAL (soft photons)
prefix = "smallphotonfinder: ";
- String smallPhotonParticleList = "small photons";
+ String smallPhotonParticleList_adhoc = "small photons (adhoc calib)";
String smallPhotonParticleList_RonCalib = "small photons (ron calib)";
String haloMinusPhotonClusterList = "skeletons plus halo minus small photons";
String smallClusterMinusPhotonClusterList = "mst clusters linked (<10 hits) minus small photons";
SimpleFragmentIdentifier fragID = new SimpleFragmentIdentifier(10, 100.0);
fragID.addParticleList(tempParticleList);
- addSmallPhotonFinder(prefix, fragID, haloClusterList, smallClusterList, smallPhotonParticleList, haloMinusPhotonClusterList, smallClusterMinusPhotonClusterList, adHocCalib);
- addSmallPhotonFinder(prefix, fragID, haloClusterList, smallClusterList, smallPhotonParticleList_RonCalib, haloMinusPhotonClusterList, smallClusterMinusPhotonClusterList, ronPhotonCalib);
+ // FIXME: Separate out the cluster formation from the particle making to avoid duplication of haloMinusPhotonClusterList, smallClusterMinusPhotonClusterList
+ addSmallPhotonFinder(prefix+"adhoc: ", fragID, haloClusterList, smallClusterList, smallPhotonParticleList_adhoc, haloMinusPhotonClusterList, smallClusterMinusPhotonClusterList, adHocCalib);
+ addSmallPhotonFinder(prefix+"ron: ", fragID, haloClusterList, smallClusterList, smallPhotonParticleList_RonCalib, haloMinusPhotonClusterList, smallClusterMinusPhotonClusterList, ronPhotonCalib);
// Merge/handle fragments
SimpleFragmentMerger fragMerge = new SimpleFragmentMerger();
@@ -310,30 +311,30 @@
prefix = "trackmatchsecondpass: ";
String tempChargedParticleListMerge = "charged hadron particles 2";
String tempChargedParticleListNoMerge = "charged hadron particles 2 [no merge]";
- addTrackMatcher(prefix, trackList, inputMIPList, tempClusterListMerge, null, tempChargedParticleListMerge, true, adHocCalib, false); // Check: "trackList" ?
- addTrackMatcher(prefix, trackList, inputMIPList, tempClusterListNoMerge, null, tempChargedParticleListNoMerge, true, adHocCalib, false); // Check: "trackList" ?
+ addTrackMatcher(prefix+"adhoc/merge", trackList, inputMIPList, tempClusterListMerge, null, tempChargedParticleListMerge, true, adHocCalib, false); // Check: "trackList" ?
+ addTrackMatcher(prefix+"adhoc/nomerge", trackList, inputMIPList, tempClusterListNoMerge, null, tempChargedParticleListNoMerge, true, adHocCalib, false); // Check: "trackList" ?
// ... and then any remaining clusters should be neutral
- String tempNeutralParticleListMerge = "neutral hadron particles";
- String tempNeutralParticleListNoMerge = "neutral hadron particles [no merge]";
+ String tempNeutralParticleListMerge_adhoc = "neutral hadron particles (adhoc calib)";
+ String tempNeutralParticleListNoMerge_adhoc = "neutral hadron particles [no merge] (adhoc calib)";
String tempNeutralParticleListMerge_RonCalib = "neutral hadron particles (ron calib)";
String tempNeutralParticleListNoMerge_RonCalib = "neutral hadron particles [no merge] (ron calib)";
prefix = "neutrals: ";
- addNeutralHadronHandler(prefix, tempChargedParticleListMerge, tempClusterListMerge, tempNeutralParticleListMerge, adHocCalib);
- addNeutralHadronHandler(prefix, tempChargedParticleListNoMerge, tempClusterListNoMerge, tempNeutralParticleListNoMerge, adHocCalib);
- addNeutralHadronHandler(prefix, tempChargedParticleListMerge, tempClusterListMerge, tempNeutralParticleListMerge_RonCalib, ronNeutralHadronCalib);
- addNeutralHadronHandler(prefix, tempChargedParticleListNoMerge, tempClusterListNoMerge, tempNeutralParticleListNoMerge_RonCalib, ronNeutralHadronCalib);
+ addNeutralHadronHandler(prefix+"adhoc/merge: ", tempChargedParticleListMerge, tempClusterListMerge, tempNeutralParticleListMerge_adhoc, adHocCalib);
+ addNeutralHadronHandler(prefix+"adhoc/nomerge: ", tempChargedParticleListNoMerge, tempClusterListNoMerge, tempNeutralParticleListNoMerge_adhoc, adHocCalib);
+ addNeutralHadronHandler(prefix+"ron/merge: ", tempChargedParticleListMerge, tempClusterListMerge, tempNeutralParticleListMerge_RonCalib, ronNeutralHadronCalib);
+ addNeutralHadronHandler(prefix+"ron/nomerge: ", tempChargedParticleListNoMerge, tempClusterListNoMerge, tempNeutralParticleListNoMerge_RonCalib, ronNeutralHadronCalib);
// Make particle lists
- String largePhotonParticleList = "large photon particles";
- String[] particleListsMerge = { tempChargedParticleListMerge, tempNeutralParticleListMerge, largePhotonParticleList, smallPhotonParticleList } ;
- String[] particleListsNoMerge = { tempChargedParticleListNoMerge, tempNeutralParticleListNoMerge, largePhotonParticleList, smallPhotonParticleList } ;
- String combinedParticleListMerge = "all particles";
- String combinedParticleListNoMerge = "all particles [no frag merge]";
- addMerger(particleListsMerge, combinedParticleListMerge);
- addMerger(particleListsNoMerge, combinedParticleListNoMerge);
+ String largePhotonParticleList_adhoc = "large photon particles (adhoc calib)";
+ String[] particleListsMerge_adhoc = { tempChargedParticleListMerge, tempNeutralParticleListMerge_adhoc, largePhotonParticleList_adhoc, smallPhotonParticleList_adhoc } ;
+ String[] particleListsNoMerge_adhoc = { tempChargedParticleListNoMerge, tempNeutralParticleListNoMerge_adhoc, largePhotonParticleList_adhoc, smallPhotonParticleList_adhoc } ;
+ String combinedParticleListMerge_adhoc = "all particles (adhoc calib)";
+ String combinedParticleListNoMerge_adhoc = "all particles [no frag merge] (adhoc calib)";
+ addMerger(particleListsMerge_adhoc, combinedParticleListMerge_adhoc);
+ addMerger(particleListsNoMerge_adhoc, combinedParticleListNoMerge_adhoc);
// And with Ron's calibration:
- String largePhotonParticleList_RonCalib = "large photon particles";
+ String largePhotonParticleList_RonCalib = "large photon particles (ron calib)";
String[] particleListsMerge_RonCalib = { tempChargedParticleListMerge, tempNeutralParticleListMerge_RonCalib, largePhotonParticleList_RonCalib, smallPhotonParticleList_RonCalib } ;
String[] particleListsNoMerge_RonCalib = { tempChargedParticleListNoMerge, tempNeutralParticleListNoMerge_RonCalib, largePhotonParticleList_RonCalib, smallPhotonParticleList_RonCalib } ;
String combinedParticleListMerge_RonCalib = "all particles (ron calib)";