Author: [log in to unmask]
Date: Tue Jan 20 14:44:41 2015
New Revision: 1960
Log:
Suppress print out when multiple hits are found in same channel as this can occur normally in the data.
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java Tue Jan 20 14:44:41 2015
@@ -141,19 +141,23 @@
// Map<Long, CalorimeterHit> hitMap = ClusterUtilities.createHitMap(hitList);
HashMap<Long, CalorimeterHit> hitMap = new HashMap<Long, CalorimeterHit>();
- boolean multihit = false;
+
+ //boolean multihit = false;
for (int ii = hitList.size() - 1; ii >= 0; ii--) {
- CalorimeterHit hit = hitList.get(ii);
- if (hitMap.containsKey(hit.getCellID())){
-// throw new RuntimeException("Multiple CalorimeterHits found in same crystal.");
- multihit = true;
- hitList.remove(ii);
- }
- else{hitMap.put(hit.getCellID(), hit);}
- }
-
- if (multihit == true){System.out.println("Multiple CalorimeterHits found in same crystal!");}
-
+ CalorimeterHit hit = hitList.get(ii);
+ if (hitMap.containsKey(hit.getCellID())) {
+ // throw new RuntimeException("Multiple CalorimeterHits found in same crystal.");
+ //multihit = true;
+ hitList.remove(ii);
+ } else {
+ hitMap.put(hit.getCellID(), hit);
+ }
+ }
+
+ // Multiple hits in same channel occurs in the data, so no print out is needed here. --JM
+ //if (multihit == true) {
+ // System.err.println("Multiple CalorimeterHits found in same crystal!");
+ //}
// Create a map to connect a seed hit to its cluster.
Map<CalorimeterHit, BaseCluster> seedToCluster = new HashMap<CalorimeterHit, BaseCluster>();
|