Author: [log in to unmask] Date: Wed Feb 4 14:05:14 2015 New Revision: 2043 Log: Modify to use passed list as the primary list for clustering. This works fine since it is copied from the event header list by the ClusterDriver. 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 Wed Feb 4 14:05:14 2015 @@ -99,22 +99,18 @@ return this.rejectedHitList; } - public List<Cluster> createClusters(EventHeader event, List<CalorimeterHit> hits) { - - // I am pretty sure this map must be cleared between events. --JM + public List<Cluster> createClusters(EventHeader event, List<CalorimeterHit> hitList) { + + // Clear the position map. correctedPositionMap.clear(); - - // Create a list to store the event hits in. - List<CalorimeterHit> hitList = hits; - - // Create a list to store the newly created clusters in. + + // Clear the rejected hit list. + rejectedHitList = new ArrayList<CalorimeterHit>(); + + // Create a list for the created clusters. ArrayList<Cluster> clusterList = new ArrayList<Cluster>(); - // Create a list to store the rejected hits in. - // ArrayList<CalorimeterHit> rejectedHitList = new ArrayList<CalorimeterHit>(); - rejectedHitList = new ArrayList<CalorimeterHit>(); - - // Sort the list of hits by energy. + // Sort the input hit list by energy. ClusterUtilities.sortHitsUniqueEnergy(hitList); // Filter the hit list of any hits that fail to pass the