Author: [log in to unmask]
Date: Mon Jan 5 21:32:43 2015
New Revision: 1882
Log:
Change ctor access to package protected for clustering algorithms. ClusterFactory should be used instead.
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/AbstractClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/NearestNeighborClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java
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/SimpleCosmicClusterer.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/AbstractClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/AbstractClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/AbstractClusterer.java Mon Jan 5 21:32:43 2015
@@ -35,7 +35,7 @@
* @param defaultCuts The default cut values for the algorithm matching the cutNames ordering.
* @throw IllegalArgumentException if the arguments are null or the arrays are different lengths.
*/
- protected AbstractClusterer(String cutNames[], double[] defaultCuts) {
+ AbstractClusterer(String cutNames[], double[] defaultCuts) {
if (cutNames == null) {
throw new IllegalArgumentException("The cutNames is set to null.");
}
@@ -52,7 +52,7 @@
* Constructor with cuts set.
* @param cuts The numerical cuts.
*/
- protected AbstractClusterer(NumericalCuts cuts) {
+ AbstractClusterer(NumericalCuts cuts) {
this.cuts = cuts;
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java Mon Jan 5 21:32:43 2015
@@ -15,7 +15,7 @@
* <p>
* This Driver creates clusters from a CalorimeterHit input collection.
* <p>
- * The clustering algorithm is implemented according to the description in pages 83 and 84 of the
+ * The clustering algorithm is implemented according to the description on pages 83 and 84 of the
* <a href="https://confluence.slac.stanford.edu/download/attachments/86676777/HPSProposal-FINAL_Rev2.pdf">HPS Proposal document</a>.
*
* @author Jeremy McCormick <[log in to unmask]>
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/NearestNeighborClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/NearestNeighborClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/NearestNeighborClusterer.java Mon Jan 5 21:32:43 2015
@@ -21,7 +21,7 @@
double minHitEnergy = 0;
double minSize = 2;
- public NearestNeighborClusterer() {
+ NearestNeighborClusterer() {
super(new String[] {"minHitEnergy", "minSize" }, new double[] { 0.0, 2.0 });
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java Mon Jan 5 21:32:43 2015
@@ -54,8 +54,8 @@
}
/**
- * This controls whether the rejected
- * @param writeRejectedHitCollection
+ * This controls whether the rejected hit collection is written out.
+ * @param writeRejectedHitCollection True to write rejected hit collection.
*/
public void setWriteRejectedHitCollection(boolean writeRejectedHitCollection) {
this.writeRejectedHitCollection = writeRejectedHitCollection;
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 Mon Jan 5 21:32:43 2015
@@ -75,7 +75,7 @@
// lowest energy.
private static final EnergyComparator ENERGY_COMP = new EnergyComparator();
- public ReconClusterer() {
+ ReconClusterer() {
super(new String[] { "hitEnergyThreshold", "seedEnergyThreshold", "clusterEnergyThreshold", "minTime", "timeWindow", "timeCut" },
new double[] { 0.0075, 0.1, 0.3, 0.0, 20.0, 0. });
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleCosmicClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleCosmicClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleCosmicClusterer.java Mon Jan 5 21:32:43 2015
@@ -40,7 +40,7 @@
/**
* Default constructor that sets cut names and default values.
*/
- public SimpleCosmicClusterer() {
+ SimpleCosmicClusterer() {
super(new String[] { "minClusterSize", "minRows", "maxHitsPerRow" }, new double[] { 3, 3, 2 });
}
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 Mon Jan 5 21:32:43 2015
@@ -37,7 +37,7 @@
/**
* Initialize the algorithm with default cuts.
*/
- public SimpleReconClusterer() {
+ SimpleReconClusterer() {
super(new String[] { "minEnergy", "minTime", "timeWindow", "timeCut" }, new double[] { 0.001, 0.0, 20.0, 0. });
}
