Author: [log in to unmask]
Date: Wed Jan 7 18:03:03 2015
New Revision: 1902
Log:
Use BaseCluster instead of HPSEcalCluster in several clustering algorithms.
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java Wed Jan 7 18:03:03 2015
@@ -5,7 +5,6 @@
import java.util.Comparator;
import java.util.List;
-import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -113,7 +112,7 @@
}
// Create a cluster for the potential seed.
- BaseCluster protoCluster = new HPSEcalCluster(); // FIXME: Should be changed to BaseCluster but needs prop calculations for now.
+ BaseCluster protoCluster = new BaseCluster();
protoCluster.addHit(seed);
// Iterate over the other hits and if the are within
@@ -145,6 +144,7 @@
}
}
}
+
// If this point is reached, then the seed was not
// invalidated by any of the other hits and is really
@@ -172,8 +172,7 @@
}
}
}
-
-
+
// VERBOSE :: Print a new line.
if(verbose) { System.out.println(); }
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java Wed Jan 7 18:03:03 2015
@@ -6,7 +6,6 @@
import java.util.List;
import java.util.Map;
-import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -108,7 +107,7 @@
}
if (biggestSeed == null) { // if no neighbors had more energy than this hit, this hit is a seed
hitToSeed.put(hit, hit);
- BaseCluster cluster = new HPSEcalCluster(); // FIXME: Replace with BaseCluster.
+ BaseCluster cluster = new BaseCluster();
clusters.add(cluster);
seedToCluster.put(hit, cluster);
} else {
