Author: [log in to unmask]
Date: Sat Jan 3 15:43:05 2015
New Revision: 1838
Log:
Remove usage of Resettable interface.
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalDaqPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalMonitoringPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalClusterPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalDaqPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalHitPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalMonitoringPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalPedestalPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/TriggerPlots.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java Sat Jan 3 15:43:05 2015
@@ -9,7 +9,6 @@
import org.apache.commons.math.stat.StatUtils;
import org.hps.readout.ecal.TriggerData;
import org.hps.recon.ecal.ECalUtils;
-import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -17,7 +16,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalClusterPlots extends Driver implements Resettable {
+public class EcalClusterPlots extends Driver {
//AIDAFrame plotterFrame;
String inputCollection = "EcalClusters";
@@ -186,14 +185,6 @@
}
@Override
- public void reset() {
- clusterCountPlot.reset();
- clusterSizePlot.reset();
- clusterEnergyPlot.reset();
- clusterMaxEnergyPlot.reset();
- }
-
- @Override
public void endOfData() {
//plotterFrame.dispose();
}
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalDaqPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalDaqPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalDaqPlots.java Sat Jan 3 15:43:05 2015
@@ -19,7 +19,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalDaqPlots extends Driver implements Resettable {
+public class EcalDaqPlots extends Driver {
private String subdetectorName = "Ecal";
private String inputCollection = "EcalReadoutHits";
@@ -83,23 +83,6 @@
plotter.show();
}
-// public void endOfData() {
-// if (plotter != null) {
-// plotter.hide();
-// }
-// }
-
- public void reset() {
- if (plotter != null) {
- plotter.hide();
- plotter.destroyRegions();
- for (IHistogram1D plot : plots) {
- plot.reset();
- }
- detectorChanged(detector);
- }
- }
-
public void process(EventHeader event) {
if (event.hasCollection(RawCalorimeterHit.class, inputCollection)) {
List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, inputCollection);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalHitPlots extends Driver implements Resettable {
+public class EcalHitPlots extends Driver {
//AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
@@ -254,14 +254,6 @@
}
@Override
- public void reset() {
- hitCountPlot.reset();
- hitTimePlot.reset();
- hitEnergyPlot.reset();
- hitMaxEnergyPlot.reset();
- }
-
- @Override
public void endOfData() {
//plotterFrame.dispose();
}
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalMonitoringPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalMonitoringPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalMonitoringPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalMonitoringPlots extends Driver implements Resettable, Redrawable {
+public class EcalMonitoringPlots extends Driver implements Redrawable {
String inputCollection = "EcalReadoutHits";
String clusterCollection = "EcalClusters";
@@ -109,14 +109,6 @@
}
@Override
- public void reset() {
- hitCountFillPlot.reset();
- hitCountDrawPlot.reset();
- clusterCountFillPlot.reset();
- clusterCountDrawPlot.reset();
- }
-
- @Override
public void redraw() {
hitCountDrawPlot.reset();
hitCountDrawPlot.add(hitCountFillPlot);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalClusterPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalClusterPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalClusterPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalClusterPlots extends Driver implements Resettable {
+public class EcalClusterPlots extends Driver {
//AIDAFrame plotterFrame;
String inputCollection = "EcalClusters";
@@ -177,7 +177,6 @@
}
}
}
-// }
}
clusterMaxEnergyPlot.fill(maxEnergy);
} else {
@@ -186,15 +185,6 @@
}
@Override
- public void reset() {
- clusterCountPlot.reset();
- clusterSizePlot.reset();
- clusterEnergyPlot.reset();
- clusterMaxEnergyPlot.reset();
- }
-
- @Override
public void endOfData() {
- //plotterFrame.dispose();
}
}
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalDaqPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalDaqPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalDaqPlots.java Sat Jan 3 15:43:05 2015
@@ -19,7 +19,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalDaqPlots extends Driver implements Resettable {
+public class EcalDaqPlots extends Driver {
private String subdetectorName = "Ecal";
private String inputCollection = "EcalReadoutHits";
@@ -83,23 +83,6 @@
plotter.show();
}
-// public void endOfData() {
-// if (plotter != null) {
-// plotter.hide();
-// }
-// }
-
- public void reset() {
- if (plotter != null) {
- plotter.hide();
- plotter.destroyRegions();
- for (IHistogram1D plot : plots) {
- plot.reset();
- }
- detectorChanged(detector);
- }
- }
-
public void process(EventHeader event) {
if (event.hasCollection(RawCalorimeterHit.class, inputCollection)) {
List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, inputCollection);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalHitPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalHitPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalHitPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalHitPlots extends Driver implements Resettable {
+public class EcalHitPlots extends Driver {
//AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
@@ -254,14 +254,6 @@
}
@Override
- public void reset() {
- hitCountPlot.reset();
- hitTimePlot.reset();
- hitEnergyPlot.reset();
- hitMaxEnergyPlot.reset();
- }
-
- @Override
public void endOfData() {
//plotterFrame.dispose();
}
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalMonitoringPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalMonitoringPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalMonitoringPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalMonitoringPlots extends Driver implements Resettable, Redrawable {
+public class EcalMonitoringPlots extends Driver implements Redrawable {
String inputCollection = "EcalReadoutHits";
String clusterCollection = "EcalClusters";
@@ -109,14 +109,6 @@
}
@Override
- public void reset() {
- hitCountFillPlot.reset();
- hitCountDrawPlot.reset();
- clusterCountFillPlot.reset();
- clusterCountDrawPlot.reset();
- }
-
- @Override
public void redraw() {
hitCountDrawPlot.reset();
hitCountDrawPlot.add(hitCountFillPlot);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalPedestalPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalPedestalPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/EcalPedestalPlots.java Sat Jan 3 15:43:05 2015
@@ -28,7 +28,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalPedestalPlots extends Driver implements Resettable, ActionListener, Redrawable {
+public class EcalPedestalPlots extends Driver implements ActionListener, Redrawable {
private String inputCollection = "EcalReadoutHits";
private IPlotter plotter;
@@ -202,19 +202,6 @@
}
@Override
- public void reset() {
- if (plotter != null) {
- plotter.hide();
- plotter.destroyRegions();
- for (int x = -23; x <= 23; x++) { // slot
- for (int y = -5; y <= 5; y++) { // crate
- aPlots[x + 23][y + 5].reset();
- }
- }
- }
- }
-
- @Override
public void process(EventHeader event) {
if (event.hasCollection(RawTrackerHit.class, inputCollection)) {
List<RawTrackerHit> hits = event.get(RawTrackerHit.class, inputCollection);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/TriggerPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/TriggerPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/testrun/ecal/TriggerPlots.java Sat Jan 3 15:43:05 2015
@@ -17,7 +17,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class TriggerPlots extends Driver implements Resettable, Redrawable {
+public class TriggerPlots extends Driver implements Redrawable {
int eventRefreshRate = 10000;
int eventn = 0;
@@ -518,10 +518,6 @@
}
@Override
- public void reset() {
- }
-
- @Override
public void endOfData() {
redraw();
System.out.format("Top trigger bit: \t");
