Print

Print


Commit in lcsim/src/org/lcsim/recon/pfa/structural on MAIN
ReclusterDTreeDriver.java+3-21.15 -> 1.16
MJC: Move truth info debug/check inside debug loop to avoid having to access truth FS particle list in production

lcsim/src/org/lcsim/recon/pfa/structural
ReclusterDTreeDriver.java 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- ReclusterDTreeDriver.java	24 Sep 2008 00:12:33 -0000	1.15
+++ ReclusterDTreeDriver.java	9 Oct 2008 21:41:20 -0000	1.16
@@ -35,7 +35,7 @@
   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *
-  * @version $Id: ReclusterDTreeDriver.java,v 1.15 2008/09/24 00:12:33 mcharles Exp $
+  * @version $Id: ReclusterDTreeDriver.java,v 1.16 2008/10/09 21:41:20 mcharles Exp $
   * @author Mat Charles <[log in to unmask]>
   */
 
@@ -1122,8 +1122,8 @@
     protected List<Cluster> reassignClustersToJet (Set<Track> jet, Collection<Cluster> initialShower, Collection<Cluster> unassignedClusters, List<SharedClusterGroup> allSharedClusters, double tolerance, ReassignClustersAlgorithm reassignAlgorithm, Map<Cluster, Track> newMapShowerComponentToTrack, Map<Track, Cluster> tweakedTracksMatchedToClusters, Map<Track, Set<Cluster>> newMapTrackToShowerComponents) 
     {
 	// Truth info debug
-	List<MCParticle> mcList = m_event.get(MCParticle.class, m_mcList);
 	if (m_debug) {
+	    List<MCParticle> mcList = m_event.get(MCParticle.class, m_mcList);
 	    System.out.println("DEBUG: Looking for clusters for the following tracks:");
 	    for (Track tr : jet) {
 		String printme = new String("  * Track with p="+(new BasicHep3Vector(tr.getMomentum())).magnitude()+" with contributions from truth particles: ");
@@ -1172,6 +1172,7 @@
 	    Cluster value = (Cluster)entry.getValue();
 	    if (m_debug) {
 		// Truth information check
+		List<MCParticle> mcList = m_event.get(MCParticle.class, m_mcList);
 		Map<MCParticle, List<SimCalorimeterHit>> truthMap = truthInListFromHitList(value.getCalorimeterHits(), mcList);
 		String printme = new String("DEBUG: Cluster with "+value.getCalorimeterHits().size()+" hits at cone angle of "+key);
 		printme += " has contributions from:";
CVSspam 0.2.8