lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.15 -r1.16
--- NonTrivialPFA.java	27 Aug 2007 20:20:50 -0000	1.15
+++ NonTrivialPFA.java	27 Aug 2007 21:03:58 -0000	1.16
@@ -358,7 +358,7 @@

 	    if (cheatOnFragments) {
 		addHadronFinders(prefixHadronsMain, eventOutputParticles, fragIDCheat, fragMerge, eventMips, eventHaloMinusPhotonClusters, eventSmallClustersNotPhotons, trackList, eventSmallPhotonParticles, largePhotonParticleList, ronNeutralHadronCalib, ronNeutralHadronCalib, false);
 	    } else {

-		addHadronFinders(prefixHadronsMain, eventOutputParticles, fragID, fragMerge, eventMips, eventHaloMinusPhotonClusters, eventSmallClustersNotPhotons, trackList, eventSmallPhotonParticles, largePhotonParticleList, ronNeutralHadronCalib, ronChargedHadronCalib, true);

+		addHadronFinders(prefixHadronsMain, eventOutputParticles, fragID, fragMerge, eventMips, eventHaloMinusPhotonClusters, eventSmallClustersNotPhotons, trackList, eventSmallPhotonParticles, largePhotonParticleList, ronNeutralHadronCalib, ronChargedHadronCalib, false);

 	    }
 
 	    // Flush the output list to make sure it's LCIO-compatible

@@ -866,12 +866,16 @@

 	String tempChargedParticleList = prefix+"chargedHadronParticlesAfterFragmentHandling";
 	boolean applyEoverPcut = true;
 	addTrackMatcher(prefix+"FindCharged__", trackList, inputMIPList, clusterList, null, tempChargedParticleList,   applyEoverPcut, calibrationForEoverP, trackDebug);

-	System.out.println(prefix+": Will write out charged particles as '"+tempChargedParticleList+"'");

+	if (trackDebug) {
+	    System.out.println(prefix+": Will write out charged particles as '"+tempChargedParticleList+"'");
+	}

 
 	// ... and then any remaining clusters should be neutral
 	String tempNeutralParticleList = prefix+"neutralHadronParticles";
 	addNeutralHadronHandler(prefix+"FindNeutral__", tempChargedParticleList, clusterList, tempNeutralParticleList, calibration);

-	System.out.println(prefix+": Will write out neutral particles as '"+tempNeutralParticleList+"'");

+	if (trackDebug) {
+	    System.out.println(prefix+": Will write out neutral particles as '"+tempNeutralParticleList+"'");
+	}

 
 	// Make particle lists
 	String[] mergeThese = { tempChargedParticleList, tempNeutralParticleList, largePhotonParticleList, smallPhotonParticleList } ;