lcsim/src/org/lcsim/recon/pfa/structural
diff -u -r1.7 -r1.8
--- SetUpDTreeForReclustering.java 22 Oct 2008 18:57:16 -0000 1.7
+++ SetUpDTreeForReclustering.java 22 Oct 2008 19:28:09 -0000 1.8
@@ -16,9 +16,6 @@
public class SetUpDTreeForReclustering extends Driver
{
- boolean useOldRonPhotonFinder = false;
- boolean useForwardEcal = false;
-
public SetUpDTreeForReclustering(String inputTrackList, Collection<String> allHitLists, Collection<String> recoHitLists, Collection<String> hitsForMST, HelixExtrapolator findCluster) {
// Convert DigiSim's lists to hitmaps:
Map<String,String> mapListToHitMap = new HashMap<String,String>();
@@ -121,7 +118,7 @@
add(new VetoHitsFromClusters("PhotonsMinusMuonHits", "ShowerFinderMapTrackToMip", "PhotonClustersForDTree"));
if (findVetoedPhotons) {
// Test: pick out vetoed clusters
- add(new ListSubtractDriver("PreliminaryPhotonClustersForDTree", "PhotonClustersForDTree", "VetoedPhotonClusters"));
+ add(new ListSubtractDriver("PreliminaryPhotonClustersForDTreeMinusElectrons", "PhotonClustersForDTree", "VetoedPhotonClusters"));
add(new CheckDisjoint("PhotonClustersForDTree", "VetoedPhotonClusters"));
add(new RemoveHitsFromClusters("VetoedPhotonClusters", "MuonTrackClusterMap", "VetoedPhotonClustersMinusMuonHits"));
add(new RemoveHitsFromClusters("VetoedPhotonClustersMinusMuonHits", "ShowerFinderMapTrackToMip", "VetoedPhotonClustersMinusMuonHitsAndMipHits"));
lcsim/src/org/lcsim/recon/pfa/identifier
diff -u -r1.1 -r1.2
--- TrackToElectronMapMaker.java 22 Oct 2008 17:40:34 -0000 1.1
+++ TrackToElectronMapMaker.java 22 Oct 2008 19:28:09 -0000 1.2
@@ -12,7 +12,7 @@
/**
* Try to make electrons.
*
- * @version $Id: TrackToElectronMapMaker.java,v 1.1 2008/10/22 17:40:34 mcharles Exp $
+ * @version $Id: TrackToElectronMapMaker.java,v 1.2 2008/10/22 19:28:09 mcharles Exp $
* @author [log in to unmask]
*/
@@ -28,7 +28,7 @@
m_outputElectronClusterListName = outputElectronClusterList;
m_inputPhotonListName = inputPhotonList;
m_findCluster = findCluster;
- m_photonCalib = new QNeutralHadronClusterEnergyCalculator();
+ m_photonCalib = new QPhotonClusterEnergyCalculator();
}
@@ -70,6 +70,8 @@
// Accept as electron
electronCandidateMap.put(tr, matchedCluster);
}
+ } else {
+ throw new AssertionError("Internal consistency failure");
}
}
}
@@ -83,6 +85,7 @@
if (electronClusters.contains(clus)) { throw new AssertionError("Book-keeping failure"); }
electronClusters.add(clus);
electronTracks.add(tr);
+ outputMap.put(tr,clus);
}
}