Author: [log in to unmask]
Date: Thu Jan 15 10:25:18 2015
New Revision: 1934
Log:
Remove cluster extension classes and their usage. HPSJAVA-366
Removed:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalCluster.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalClusterIC.java
java/trunk/integration-tests/src/test/java/org/hps/ReconClusterICTest.java
java/trunk/users/src/test/java/org/hps/users/holly/ECalClusterICTest.java
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalEventMonitor.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java Thu Jan 15 10:25:18 2015
@@ -6,8 +6,6 @@
import java.util.List;
import java.util.Map;
import org.apache.commons.math.stat.StatUtils;
-import org.hps.recon.ecal.HPSEcalCluster;
-import org.hps.recon.ecal.HPSEcalClusterIC;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalEventMonitor.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalEventMonitor.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalEventMonitor.java Thu Jan 15 10:25:18 2015
@@ -11,7 +11,6 @@
import javax.swing.JCheckBox;
-import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java Thu Jan 15 10:25:18 2015
@@ -9,7 +9,6 @@
import org.hps.readout.ecal.TriggerDriver;
import org.hps.recon.ecal.ECalUtils;
-import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java Thu Jan 15 10:25:18 2015
@@ -1,7 +1,7 @@
package org.hps.users.jeremym;
-import org.hps.recon.ecal.EcalClusterer;
import org.hps.recon.ecal.EcalRawConverterDriver;
+import org.hps.recon.ecal.cluster.ClusterDriver;
import org.hps.recon.tracking.DataTrackerHitDriver;
import org.hps.recon.tracking.HelicalTrackHitDriver;
import org.hps.recon.tracking.RawTrackerHitFitterDriver;
@@ -34,11 +34,10 @@
ecalRawConverter.setEcalCollectionName("EcalCalHits");
ecalRawConverter.setUse2014Gain(false);
this.add(ecalRawConverter);
-
- EcalClusterer ecalClusterer = new EcalClusterer();
- ecalClusterer.setEcalName("Ecal");
- ecalClusterer.setEcalCollectionName("EcalCalHits");
- this.add(ecalClusterer);
+
+ ClusterDriver clusterer = new ClusterDriver();
+ clusterer.setClustererName("LegacyClusterer");
+ this.add(clusterer);
RawTrackerHitFitterDriver fitterDriver = new RawTrackerHitFitterDriver();
fitterDriver.setFitAlgorithm("Analytic");
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java Thu Jan 15 10:25:18 2015
@@ -10,7 +10,6 @@
import java.util.List;
import java.util.Map;
-import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
|