lcsim/src/org/lcsim/util
diff -u -r1.5 -r1.6
--- OverlayDriver.java 29 Apr 2011 16:23:37 -0000 1.5
+++ OverlayDriver.java 29 Apr 2011 17:11:15 -0000 1.6
@@ -510,7 +510,6 @@
System.err.println("Unable to move collection: "+collectionName+" of type "+collectionType);
return null;
}
- if (this.getHistogramLevel() > HLEVEL_NORMAL) System.out.println("Moved collection: "+collectionName+" of type "+collectionType+" to "+time+"ns");
return movedCollection;
}
@@ -654,6 +653,7 @@
String collectionName = collection.getName();
Class collectionType = collection.getType();
Class overlayCollectionType = overlayCollection.getType();
+ if (this.getHistogramLevel() > HLEVEL_NORMAL) System.out.println("Merging collection: "+collectionName+" of type "+collectionType+".");
if (!collectionType.equals(overlayCollectionType)) {
System.err.println("Can not merge collections: "+collectionName
+" of type "+collectionType+" and "+overlayCollectionType);
@@ -702,9 +702,13 @@
boolean hasPDG = LCIOUtil.bitTest(collection.getFlags(),LCIOConstants.CHBIT_PDG);
// loop over the hits from the overlay event
+ int nHitsMerged = 0;
+ int nSimCaloHits = overlayEntries.size();
for (SimCalorimeterHit hit : (List<SimCalorimeterHit>)overlayEntries) {
long cellID = hit.getCellID();
+ nHitsMerged++;
+ if (this.getHistogramLevel() > HLEVEL_HIGH && nHitsMerged%100 == 0) System.out.print("Merged "+nHitsMerged+" / "+nSimCaloHits+" hits\n");
if (hitMap.containsKey(cellID)) {
SimCalorimeterHit oldHit = hitMap.get(hit.getCellID());
int nHitMcP = oldHit.getMCParticleCount();