lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.29 -r1.30
--- ReclusterDTreeDriver.java 12 Jul 2008 06:49:53 -0000 1.29
+++ ReclusterDTreeDriver.java 12 Jul 2008 08:09:28 -0000 1.30
@@ -34,7 +34,7 @@
* in this package, which uses the implementation in
* org.lcsim.recon.cluster.directedtree developed by NIU).
*
- * @version $Id: ReclusterDTreeDriver.java,v 1.29 2008/07/12 06:49:53 mcharles Exp $
+ * @version $Id: ReclusterDTreeDriver.java,v 1.30 2008/07/12 08:09:28 mcharles Exp $
* @author Mat Charles <[log in to unmask]>
*/
@@ -653,15 +653,17 @@
}
- for (Cluster clus : clustersMatchedToTweakedTracks.keySet()) {
+ if (m_debug) {
+ for (Cluster clus : clustersMatchedToTweakedTracks.keySet()) {
Track tr = clustersMatchedToTweakedTracks.get(clus);
double rawEnergy = energy(clus);
double totEnergy = energy(clus, allSharedClusters);
double trackMom = new BasicHep3Vector(tr.getMomentum()).magnitude();
System.out.println("Seed cluster ["+clus.getCalorimeterHits().size()+"] -> Track [p="+trackMom+"] -> "
+"raw energy "+rawEnergy+" -> total energy "+totEnergy);
- }
-
+ }
+ }
+
// Iterate to build clusters:
for (int iIter=0; iIter<10; iIter++) {
newMapShowerComponentToTrack = new HashMap<Cluster, Track>();
@@ -811,17 +813,17 @@
boolean punchThrough = isPunchThrough(showerComponents, allSharedClusters);
if (punchThrough) {
// Punches through -- no E/p info -- ignore
- System.out.println("DEBUG: Ignoring jet with total p="+jetMomentum+" since it punches through");
+ if (m_debug) { System.out.println("DEBUG: Ignoring jet with total p="+jetMomentum+" since it punches through"); }
return false;
}
double jetEnergy = energy(showerComponents, allSharedClusters);
boolean passesEoverP = testEoverP_twoSided(jetEnergy, jetMomentum, tolerance);
if (passesEoverP) {
- System.out.println("DEBUG: Ignoring jet with total p="+jetMomentum+" since it passes E/p (E="+jetEnergy+")");
+ if (m_debug) { System.out.println("DEBUG: Ignoring jet with total p="+jetMomentum+" since it passes E/p (E="+jetEnergy+")"); }
// Passes E/p check -- ignore
return false;
} else if (jetEnergy > jetMomentum) {
- System.out.println("DEBUG: Ignoring jet with p="+jetMomentum+" since it E>>p (E="+jetEnergy+")");
+ if (m_debug) { System.out.println("DEBUG: Ignoring jet with p="+jetMomentum+" since it E>>p (E="+jetEnergy+")"); }
// E>>p -- ignore
return false;
}
@@ -885,14 +887,16 @@
{
// Truth info 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: ");
- List<MCParticle> truthList = getMCParticle(tr);
- for (MCParticle part : truthList) {
- printme += "[" + part.getPDGID() + " with p="+ part.getMomentum().magnitude()+"]";
+ if (m_debug) {
+ 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: ");
+ List<MCParticle> truthList = getMCParticle(tr);
+ for (MCParticle part : truthList) {
+ printme += "[" + part.getPDGID() + " with p="+ part.getMomentum().magnitude()+"]";
+ }
+ System.out.println(printme);
}
- System.out.println(printme);
}
SortedMap<Double, Cluster> clustersSortedByAngle = new TreeMap();
@@ -918,10 +922,10 @@
List<Cluster> initialClustersPlusAdditions = new Vector<Cluster>(initialShower);
List<Cluster> output = new Vector<Cluster>();
- System.out.println("Starting cluster loop");
+ if (m_debug) { System.out.println("Starting cluster loop"); }
double startingEnergy = energy(initialShower, allSharedClusters);
double trackMomentum = jetScalarMomentum(jet);
- System.out.println("original E= " + startingEnergy + " P= " + trackMomentum + " E/P= " + (startingEnergy/trackMomentum));
+ if (m_debug) { System.out.println("original E= " + startingEnergy + " P= " + trackMomentum + " E/P= " + (startingEnergy/trackMomentum)); }
Iterator iter = clustersSortedByAngle.entrySet().iterator();
boolean previousIterationOK = false;
while(iter.hasNext()) {
@@ -950,7 +954,7 @@
boolean punchThrough = isPunchThrough(initialClustersPlusAdditions, allSharedClusters);
if (passesEoverPafter) {
// OK -- satisfies E/p now
- System.out.println("DEBUG: E/p now passes... E is "+energyBefore+" -> "+energyAfter);
+ if (m_debug) { System.out.println("DEBUG: E/p now passes... E is "+energyBefore+" -> "+energyAfter); }
if (!passesEoverPafterTight && energyAfter > trackMomentum && previousIterationOK) {
// ... but we're running over the safe edge and we were OK before => stop and don't add it
previousIterationOK = true;
@@ -964,14 +968,14 @@
if (punchThrough) {
// Raw energy < target, but punches through so that's OK -- stop
previousIterationOK = true;
- System.out.println("DEBUG: Punch-through now passes... E is "+energyBefore+" -> "+energyAfter);
+ if (m_debug) { System.out.println("DEBUG: Punch-through now passes... E is "+energyBefore+" -> "+energyAfter); }
output.add(value);
} else {
// Need more energy -- add cluster and keep going
output.add(value);
}
} else {
- System.out.println("DEBUG: Stopping because now E>>p...E is "+energyBefore+" -> "+energyAfter);
+ if (m_debug) { System.out.println("DEBUG: Stopping because now E>>p...E is "+energyBefore+" -> "+energyAfter); }
// We over-shot -- now E is too large.
// Don't add this cluster.
if (previousIterationOK) {
@@ -982,12 +986,12 @@
return null;
}
}
- System.out.println("DEBUG: Step: key= " + key + " energy= " + energyAfter + " E/P= " + (energyAfter/trackMomentum));
+ if (m_debug) { System.out.println("DEBUG: Step: key= " + key + " energy= " + energyAfter + " E/P= " + (energyAfter/trackMomentum)); }
}
if (!previousIterationOK) {
if (!iter.hasNext()) {
- System.out.println("DEBUG: Stopping because ran out of clusters -- fail");
+ if (m_debug) { System.out.println("DEBUG: Stopping because ran out of clusters -- fail"); }
return null;
} else {
throw new AssertionError("Internal consistency failure");
