Author: [log in to unmask]
Date: Sat Jan 3 21:57:13 2015
New Revision: 1862
Log:
Change clusterer names to be more reasonable in ecal.cluster package.
Added:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java
- copied, changed from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java
- copied, changed from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java
- copied, changed from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleClasInnerCalClusterer.java
Removed:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterer.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleClasInnerCalClusterer.java
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClustererFactory.java
java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClustererFactory.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClustererFactory.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClustererFactory.java Sat Jan 3 21:57:13 2015
@@ -13,11 +13,11 @@
* this class implements the {@link Clusterer} interface and will throw an error if it does not.
*
* @see Clusterer
- * @see ClasInnerCalClusterer
+ * @see ReconClusterer
* @see DualThresholdCosmicClusterer
* @see LegacyClusterer
* @see NearestNeighborClusterer
- * @see SimpleClasInnerCalClusterer
+ * @see SimpleReconClusterer
* @see SimpleCosmicClusterer
*
* @author Jeremy McCormick <[log in to unmask]>
@@ -41,10 +41,10 @@
Clusterer clusterer;
if (LegacyClusterer.class.getSimpleName().equals(name)) {
clusterer = new LegacyClusterer();
- } else if (SimpleClasInnerCalClusterer.class.getSimpleName().equals(name)) {
- clusterer = new SimpleClasInnerCalClusterer();
- } else if (ClasInnerCalClusterer.class.getSimpleName().equals(name)) {
- clusterer = new ClasInnerCalClusterer();
+ } else if (SimpleReconClusterer.class.getSimpleName().equals(name)) {
+ clusterer = new SimpleReconClusterer();
+ } else if (ReconClusterer.class.getSimpleName().equals(name)) {
+ clusterer = new ReconClusterer();
} else if (NearestNeighborClusterer.class.getSimpleName().equals(name)) {
clusterer = new NearestNeighborClusterer();
} else if (DualThresholdCosmicClusterer.class.getSimpleName().equals(name)) {
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java (from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterDriver.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterDriver.java Sat Jan 3 21:57:13 2015
@@ -8,14 +8,14 @@
/**
* This is an implementation of {@link ClusterDriver} specialized for the
- * {@link ClasInnerCalClusterer}. It currently implements optional
+ * {@link ReconClusterer}. It currently implements optional
* writing of a rejected hit list to the LCSim event.
*
- * @see ClasInnerCalClusterer
+ * @see ReconClusterer
*
* @author Jeremy McCormick <[log in to unmask]>
*/
-public class ClasInnerCalClusterDriver extends ClusterDriver {
+public class ReconClusterDriver extends ClusterDriver {
// The name of the output collection of rejected hits.
String rejectedHitCollectionName;
@@ -24,7 +24,7 @@
boolean writeRejectedHitCollection = false;
// Reference to the concrete Clusterer object for convenience.
- ClasInnerCalClusterer innerCalClusterer;
+ ReconClusterer innerCalClusterer;
/**
* Perform job initialization.
@@ -35,7 +35,7 @@
this.setClustererName("ClasInnerCalClusterer");
} else {
// Does the Clusterer have the right type if there was a custom inialization parameter?
- if (!(clusterer instanceof ClasInnerCalClusterer)) {
+ if (!(clusterer instanceof ReconClusterer)) {
// The Clusterer does not appear to have the right type for this Driver!
throw new IllegalArgumentException("The Clusterer type " + this.clusterer.getClass().getCanonicalName() + " does not have the right type.");
}
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java (from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterer.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClasInnerCalClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ReconClusterer.java Sat Jan 3 21:57:13 2015
@@ -43,7 +43,7 @@
* @author Kyle McCarty <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
*/
-public class ClasInnerCalClusterer extends AbstractClusterer {
+public class ReconClusterer extends AbstractClusterer {
// Energy comparator which performs position comparison when energy is equal.
private static final EnergyComparator ENERGY_COMP = new EnergyComparator();
@@ -74,7 +74,7 @@
// List of rejected hits.
List<CalorimeterHit> currentRejectedHitList;
- public ClasInnerCalClusterer() {
+ public ReconClusterer() {
super(new String[] { "hitEnergyThreshold", "seedEnergyThreshold", "clusterEnergyThreshold", "minTime", "timeWindow", "timeCut" },
new double[] { 0.0075, 0.1, 0.3, 0.0, 20.0, 0. });
}
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java (from r1812, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleClasInnerCalClusterer.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleClasInnerCalClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/SimpleReconClusterer.java Sat Jan 3 21:57:13 2015
@@ -26,7 +26,7 @@
* @author Sho Uemura <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
*/
-public class SimpleClasInnerCalClusterer extends AbstractClusterer {
+public class SimpleReconClusterer extends AbstractClusterer {
double minEnergy;
double minTime;
@@ -36,7 +36,7 @@
/**
* Initialize the algorithm with default cuts.
*/
- public SimpleClasInnerCalClusterer() {
+ public SimpleReconClusterer() {
super(new String[] { "minEnergy", "minTime", "timeWindow", "timeCut" }, new double[] { 0.001, 0.0, 20.0, 0. });
}
Modified: java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java
=============================================================================
--- java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java (original)
+++ java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java Sat Jan 3 21:57:13 2015
@@ -47,23 +47,30 @@
// Create test output dir.
testOutputDir = new TestOutputFile(getClass().getSimpleName());
testOutputDir.mkdir();
+
+ // Initialize conditions system.
+ new DatabaseConditionsManager();
}
public void testClasInnerCalClusterer() {
// This is just replicating the default cuts.
- runClustererTest("ClasInnerCalClusterer", new double[] { 0.0075, 0.1, 0.3, 0.0, 20.0, 0. }, true);;
+ //runClustererTest("ReconClusterer", new double[] { 0.0075, 0.1, 0.3, 0.0, 20.0, 0. }, true);
+ runClustererTest("ReconClusterer");
}
public void testSimplClasInnerCalClusterer() {
- runClustererTest("SimpleClasInnerCalClusterer", new double[] { 0.0, 0.0, 9999.0, 0. }, true);
+ //runClustererTest("SimpleReconClusterer", new double[] { 0.0, 0.0, 9999.0, 0. }, true);
+ runClustererTest("SimpleReconClusterer");
}
- public void testNearestNeighborClusterer() {
- runClustererTest("NearestNeighborClusterer", new double[] { 0.0, 2.0 }, true);
+ public void testNearestNeighborClusterer() {
+ //runClustererTest("NearestNeighborClusterer", new double[] { 0.0, 2.0 }, true);
+ runClustererTest("NearestNeighborClusterer");
}
public void testLegacyClusterer() {
- runClustererTest("LegacyClusterer", new double[] { 0.0, 0.0 }, true);
+ //runClustererTest("LegacyClusterer", new double[] { 0.0, 0.0 }, true);
+ runClustererTest("LegacyClusterer");
}
/**
@@ -73,10 +80,7 @@
* @param writeLcioFile Whether or not to write an LCIO output file.
*/
private void runClustererTest(String clustererName, double[] cuts, boolean writeLcioFile) {
-
- // Initialize conditions system.
- new DatabaseConditionsManager();
-
+
// Config loop.
LCSimLoop loop = new LCSimLoop();
try {
@@ -91,7 +95,9 @@
String clusterCollectionName = clustererName + "Clusters";
ClusterDriver clusterDriver = new ClusterDriver();
clusterDriver.setClustererName(clustererName);
- clusterDriver.setCuts(cuts);
+ if (cuts != null) {
+ clusterDriver.setCuts(cuts);
+ }
clusterDriver.getLogger().setLevel(Level.ALL);
clusterDriver.setInputHitCollectionName("EcalHits");
clusterDriver.setOutputClusterCollectionName(clusterCollectionName);
@@ -102,7 +108,7 @@
loop.add(new ClusterCheckDriver(clusterCollectionName));
if (writeLcioFile) {
- loop.add(new LCIODriver(testOutputDir.getPath() + File.separator + clustererName));
+ loop.add(new LCIODriver(testOutputDir.getPath() + File.separator + clustererName + ".slcio"));
}
// Run the job.
@@ -112,6 +118,10 @@
throw new RuntimeException(e);
}
loop.dispose();
+ }
+
+ private void runClustererTest(String clustererName) {
+ runClustererTest(clustererName, null, true);
}
/**
