Author: [log in to unmask]
Date: Sat Jan 3 20:16:41 2015
New Revision: 1857
Log:
Remove deprecated Redrawable interface. HPSJAVA-378
Removed:
java/trunk/util/src/main/java/org/hps/util/Redrawable.java
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalMonitoringPlots.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
java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
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 20:16:41 2015
@@ -7,7 +7,6 @@
import java.util.List;
import org.hps.recon.ecal.HPSEcalCluster;
-import org.hps.util.Redrawable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -16,7 +15,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalMonitoringPlots extends Driver implements Redrawable {
+public class EcalMonitoringPlots extends Driver {
String inputCollection = "EcalReadoutHits";
String clusterCollection = "EcalClusters";
@@ -107,15 +106,13 @@
plotter.destroyRegions();
}
- @Override
public void redraw() {
hitCountDrawPlot.reset();
hitCountDrawPlot.add(hitCountFillPlot);
clusterCountDrawPlot.reset();
clusterCountDrawPlot.add(clusterCountFillPlot);
}
-
- @Override
+
public void setEventRefreshRate(int eventRefreshRate) {
this.eventRefreshRate = eventRefreshRate;
}
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 20:16:41 2015
@@ -7,7 +7,6 @@
import java.util.List;
import org.hps.recon.ecal.HPSEcalCluster;
-import org.hps.util.Redrawable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -16,7 +15,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalMonitoringPlots extends Driver implements Redrawable {
+public class EcalMonitoringPlots extends Driver {
String inputCollection = "EcalReadoutHits";
String clusterCollection = "EcalClusters";
@@ -107,15 +106,13 @@
plotter.destroyRegions();
}
- @Override
- public void redraw() {
+ void redraw() {
hitCountDrawPlot.reset();
hitCountDrawPlot.add(hitCountFillPlot);
clusterCountDrawPlot.reset();
clusterCountDrawPlot.add(clusterCountFillPlot);
}
- @Override
public void setEventRefreshRate(int eventRefreshRate) {
this.eventRefreshRate = eventRefreshRate;
}
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 20:16:41 2015
@@ -15,7 +15,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.recon.ecal.ECalUtils;
-import org.hps.util.Redrawable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.Identifier;
@@ -27,7 +26,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalPedestalPlots extends Driver implements ActionListener, Redrawable {
+public class EcalPedestalPlots extends Driver implements ActionListener {
private String inputCollection = "EcalReadoutHits";
private IPlotter plotter;
@@ -267,8 +266,7 @@
}
}
- @Override
- public void redraw() {
+ void redraw() {
aSigmaPlot.reset();
aMeanPlot.reset();
tSigmaPlot.reset();
@@ -287,7 +285,6 @@
}
}
- @Override
public void setEventRefreshRate(int eventRefreshRate) {
this.eventRefreshRate = eventRefreshRate;
}
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 20:16:41 2015
@@ -8,7 +8,6 @@
import org.hps.readout.ecal.TriggerData;
import org.hps.recon.ecal.HPSEcalCluster;
-import org.hps.util.Redrawable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -16,11 +15,10 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class TriggerPlots extends Driver implements Redrawable {
+public class TriggerPlots extends Driver {
int eventRefreshRate = 10000;
int eventn = 0;
- //AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
String clusterCollection = "EcalClusters";
double clusterEnergyCut = 1280.0;
@@ -544,7 +542,6 @@
//plotterFrame.dispose();
}
- @Override
public void redraw() {
IHistogram1D heffTop = aida.histogramFactory().divide("bottom turn-on: top tag", toptrig_cl_ecal_e_probe_trig, toptrig_cl_ecal_e_probe);
plotter5.region(7).clear();
@@ -565,7 +562,6 @@
plotter6.region(8).plot(heffBot2);
}
- @Override
public void setEventRefreshRate(int eventRefreshRate) {
this.eventRefreshRate = eventRefreshRate;
}
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java Sat Jan 3 20:16:41 2015
@@ -23,7 +23,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.Redrawable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
@@ -36,7 +35,7 @@
*
* @author phansson+
*/
-public class ECalGainDriver extends Driver implements ActionListener, Redrawable {
+public class ECalGainDriver extends Driver implements ActionListener {
private int nevents = 0;
private boolean debug = true;
@@ -483,8 +482,7 @@
}
}
- @Override
- public void redraw() {
+ void redraw() {
//do something if needed
mpePlot.reset();
@@ -501,8 +499,7 @@
}
}
- @Override
public void setEventRefreshRate(int eventRefreshRate) {
refreshRate = eventRefreshRate;
}
-}
+}
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java Sat Jan 3 20:16:41 2015
@@ -20,7 +20,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.readout.ecal.TriggerData;
-import org.hps.util.Redrawable;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -34,7 +33,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalCrystalFilter extends Driver implements ActionListener, Redrawable {
+public class EcalCrystalFilter extends Driver implements ActionListener {
private String inputCollection;
private String outputPlotFileName;
@@ -943,7 +942,7 @@
}
}
- public void redraw() {
+ void redraw() {
// aSigmaPlot.reset();
// aMeanPlot.reset();
// tSigmaPlot.reset();
