 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps/monitoring/ecal on MAIN | |||
| EcalClusterPlots.java | +10 | -10 | 1.9 -> 1.10 |
| EcalEventMonitor.java | +10 | -10 | 1.9 -> 1.10 |
| EcalHitPlots.java | +14 | -14 | 1.9 -> 1.10 |
| EcalMonitoringPlots.java | +4 | -4 | 1.9 -> 1.10 |
| EcalPedestalPlots.java | +15 | -15 | 1.12 -> 1.13 |
| EcalWindowEventPlots.java | +12 | -12 | 1.2 -> 1.3 |
| TriggerPlots.java | +12 | -12 | 1.8 -> 1.9 |
| +77 | -77 | ||
fix up plots for use with monitoring app; remove usage of AIDAFrame where possible
diff -u -r1.9 -r1.10 --- EcalClusterPlots.java 25 Feb 2013 22:39:24 -0000 1.9 +++ EcalClusterPlots.java 5 Jun 2013 19:03:48 -0000 1.10 @@ -20,7 +20,7 @@
public class EcalClusterPlots extends Driver implements Resettable {
- AIDAFrame plotterFrame;
+ //AIDAFrame plotterFrame;
String inputCollection = "EcalClusters";
AIDA aida = AIDA.defaultInstance();
IPlotter plotter, plotter2, plotter3, plotter4;
@@ -50,13 +50,13 @@
@Override
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS ECal Cluster Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS ECal Cluster Plots");
// Setup the plotter.
plotter = aida.analysisFactory().createPlotterFactory().create("Cluster Counts");
plotter.setTitle("Cluster Counts");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.style().dataStyle().errorBarStyle().setVisible(false);
// Setup plots.
@@ -73,7 +73,7 @@
// Setup the plotter.
plotter2 = aida.analysisFactory().createPlotterFactory().create("Cluster Energies");
plotter2.setTitle("Cluster Energies");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
if (logScale) {
@@ -91,7 +91,7 @@
plotter3 = aida.analysisFactory().createPlotterFactory().create("Cluster Times");
plotter3.setTitle("Cluster Times");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.createRegions(1, 2);
plotter3.style().yAxisStyle().setParameter("scale", "log");
@@ -103,7 +103,7 @@
plotter4 = aida.analysisFactory().createPlotterFactory().create("Edges");
plotter4.setTitle("Edges");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.style().setParameter("hist2DStyle", "colorMap");
plotter4.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter4.style().zAxisStyle().setParameter("scale", "log");
@@ -112,8 +112,8 @@
edgePlot = aida.histogram2D(detector.getDetectorName() + " : " + inputCollection + " : Hit Pairs Across Crystal Edges", 93, -23.25, 23.25, 21, -5.25, 5.25);
plotter4.region(0).plot(edgePlot);
- plotterFrame.setVisible(true); - plotterFrame.pack();
+ //plotterFrame.setVisible(true); + //plotterFrame.pack();
}
@Override
@@ -196,6 +196,6 @@
@Override
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
} }
\ No newline at end of file
diff -u -r1.9 -r1.10 --- EcalEventMonitor.java 8 May 2012 15:49:31 -0000 1.9 +++ EcalEventMonitor.java 5 Jun 2013 19:03:48 -0000 1.10 @@ -28,7 +28,7 @@
IHistogram2D clusterPlot;
int eventRefreshRate = 1;
int eventn = 0;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private JCheckBox logScaleBox;
public EcalEventMonitor() {
@@ -53,10 +53,10 @@
// Setup the plotter.
plotter = aida.analysisFactory().createPlotterFactory().create();
plotter.setTitle(title);
- plotterFrame = new AIDAFrame(); - plotterFrame.addPlotter(plotter); - plotterFrame.setVisible(true); - plotterFrame.setTitle(title);
+ //plotterFrame = new AIDAFrame(); + //plotterFrame.addPlotter(plotter); + //plotterFrame.setVisible(true); + //plotterFrame.setTitle(title);
// Create the plotter regions.
plotter.createRegions(1, 2);
@@ -79,9 +79,9 @@
logScaleBox = new JCheckBox("log scale");
logScaleBox.addItemListener(this);
- plotterFrame.getControlsPanel().add(logScaleBox);
+ //plotterFrame.getControlsPanel().add(logScaleBox);
- plotterFrame.pack();
+ //plotterFrame.pack();
}
public void process(EventHeader event) {
@@ -106,9 +106,9 @@
}
public void endOfData() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
}
@Override
diff -u -r1.9 -r1.10 --- EcalHitPlots.java 25 Feb 2013 22:39:24 -0000 1.9 +++ EcalHitPlots.java 5 Jun 2013 19:03:48 -0000 1.10 @@ -18,7 +18,7 @@
public class EcalHitPlots extends Driver implements Resettable {
- AIDAFrame plotterFrame;
+ //AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
AIDA aida = AIDA.defaultInstance();
IPlotter plotter, plotter2, plotter3, plotter4;
@@ -50,13 +50,13 @@
@Override
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS ECal Hit Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS ECal Hit Plots");
// Setup the plotter.
- plotter = aida.analysisFactory().createPlotterFactory().create("Hit Counts");
+ plotter = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Counts");
plotter.setTitle("Hit Counts");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.style().dataStyle().errorBarStyle().setVisible(false);
// Setup plots.
@@ -71,9 +71,9 @@
// Setup the plotter.
- plotter2 = aida.analysisFactory().createPlotterFactory().create("Hit Energies");
+ plotter2 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Energies");
plotter2.setTitle("Hit Energies");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
hitEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Energy", 1000, -0.1, maxE);
@@ -88,9 +88,9 @@
plotter2.region(0).plot(hitEnergyPlot);
plotter2.region(1).plot(hitMaxEnergyPlot);
- plotter3 = aida.analysisFactory().createPlotterFactory().create("Hit Times");
+ plotter3 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Times");
plotter3.setTitle("Hit Times");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.createRegions(3, 3);
@@ -132,9 +132,9 @@
plotter3.region(8).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter3.region(8).style().zAxisStyle().setParameter("scale", "log");
- plotter4 = aida.analysisFactory().createPlotterFactory().create("Edges");
+ plotter4 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Edges");
plotter4.setTitle("Edges");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.style().setParameter("hist2DStyle", "colorMap");
plotter4.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter4.style().zAxisStyle().setParameter("scale", "log");
@@ -143,8 +143,8 @@
edgePlot = aida.histogram2D(detector.getDetectorName() + " : " + inputCollection + " : Hit Pairs Across Crystal Edges", 93, -23.25, 23.25, 21, -5.25, 5.25);
plotter4.region(0).plot(edgePlot);
- plotterFrame.setVisible(true); - plotterFrame.pack();
+ //plotterFrame.setVisible(true); + //plotterFrame.pack();
}
@Override
@@ -263,6 +263,6 @@
@Override
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
} }
\ No newline at end of file
diff -u -r1.9 -r1.10 --- EcalMonitoringPlots.java 18 May 2012 07:41:49 -0000 1.9 +++ EcalMonitoringPlots.java 5 Jun 2013 19:03:48 -0000 1.10 @@ -48,7 +48,7 @@
protected void detectorChanged(Detector detector) {
// Setup the plotter.
- plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECal Monitoring Plots");
+ plotter = aida.analysisFactory().createPlotterFactory("Ecal Monitoring Plots").create("HPS ECal Monitoring Plots");
// Setup plots.
aida.tree().cd("/");
hitCountDrawPlot = aida.histogram2D(detector.getDetectorName() + " : " + inputCollection + " : Hit Count", 47, -23.5, 23.5, 11, -5.5, 5.5);
@@ -67,9 +67,9 @@
style.setParameter("hist2DStyle", "colorMap");
style.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter.region(1).plot(clusterCountDrawPlot);
- if (!hide) {
- plotter.show();
- }
+ //if (!hide) {
+ // plotter.show();
+ //}
}
public void process(EventHeader event) {
diff -u -r1.12 -r1.13 --- EcalPedestalPlots.java 25 Feb 2013 22:39:24 -0000 1.12 +++ EcalPedestalPlots.java 5 Jun 2013 19:03:48 -0000 1.13 @@ -29,7 +29,7 @@
private IPlotter plotter;
private IPlotter plotter2;
private AIDA aida = AIDA.defaultInstance();
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private IHistogram2D aMeanPlot;
private IHistogram2D aSigmaPlot;
private IHistogram2D tMeanPlot;
@@ -108,29 +108,29 @@
}
}
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS ECal Crystal Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS ECal Crystal Plots");
xCombo = new JComboBox(xList);
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- plotterFrame.getControlsPanel().add(xLabel); - plotterFrame.getControlsPanel().add(xCombo);
+ //plotterFrame.getControlsPanel().add(xLabel); + //plotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(yCombo);
- plotterFrame.getControlsPanel().add(yLabel); - plotterFrame.getControlsPanel().add(yCombo);
+ //plotterFrame.getControlsPanel().add(yLabel); + //plotterFrame.getControlsPanel().add(yCombo);
blankButton = new JButton("Hide histogram");
- plotterFrame.getControlsPanel().add(blankButton);
+ //plotterFrame.getControlsPanel().add(blankButton);
blankButton.addActionListener(this);
// Setup the plotter.
plotter = aida.analysisFactory().createPlotterFactory().create();
plotter.setTitle("HPS ECal Hit Amplitude Plots");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.createRegions(1, 3);
plotter.style().statisticsBoxStyle().setVisible(false);
@@ -148,7 +148,7 @@
// Setup the plotter.
plotter2 = aida.analysisFactory().createPlotterFactory().create();
plotter2.setTitle("HPS ECal Hit Time Plots");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.createRegions(1, 3);
plotter2.style().statisticsBoxStyle().setVisible(false);
@@ -168,15 +168,15 @@
xCombo.setSelectedIndex(-5 + 23);
yCombo.setSelectedIndex(2 + 5 - 1);
- plotterFrame.pack();
- if (!hide) {
- plotterFrame.setVisible(true);
- }
+ //plotterFrame.pack();
+ //if (!hide) {
+ // plotterFrame.setVisible(true);
+ //}
}
@Override
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
if (calWindow > 0) {
for (int crate = 1; crate < 3; crate++) {
for (short slot = 0; slot < 20; slot++) {
diff -u -r1.2 -r1.3 --- EcalWindowEventPlots.java 13 May 2012 21:39:24 -0000 1.2 +++ EcalWindowEventPlots.java 5 Jun 2013 19:03:48 -0000 1.3 @@ -19,7 +19,7 @@
private String inputCollection;
private IPlotter plotter;
private AIDA aida = AIDA.defaultInstance();
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private IHistogram1D[][] plots = new IHistogram1D[47][11];
private JLabel xLabel, yLabel;
private JComboBox xCombo;
@@ -68,8 +68,8 @@
// Setup the plotter.
plotter = aida.analysisFactory().createPlotterFactory().create();
plotter.setTitle("HPS ECal Window Event Plots");
- plotterFrame = new AIDAFrame(); - plotterFrame.addPlotter(plotter);
+ //plotterFrame = new AIDAFrame(); + //plotterFrame.addPlotter(plotter);
aida = AIDA.defaultInstance();
aida.tree().cd("/");
@@ -87,19 +87,19 @@
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- plotterFrame.getControlsPanel().add(xLabel); - plotterFrame.getControlsPanel().add(xCombo);
+ //plotterFrame.getControlsPanel().add(xLabel); + //plotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(yCombo);
- plotterFrame.getControlsPanel().add(yLabel); - plotterFrame.getControlsPanel().add(yCombo);
+ //plotterFrame.getControlsPanel().add(yLabel); + //plotterFrame.getControlsPanel().add(yCombo);
blankButton = new JButton("Hide histogram");
- plotterFrame.getControlsPanel().add(blankButton);
+ //plotterFrame.getControlsPanel().add(blankButton);
blankButton.addActionListener(this);
- plotterFrame.pack();
+ //plotterFrame.pack();
plotter.style().statisticsBoxStyle().setVisible(false);
plotter.style().zAxisStyle().setParameter("allowZeroSuppression", "true");
@@ -109,9 +109,9 @@
xCombo.setSelectedIndex((-5 + 23));
yCombo.setSelectedIndex((2 + 5 - 1));
- if (!hide) {
- plotterFrame.setVisible(true);
- }
+ //if (!hide) {
+ // plotterFrame.setVisible(true);
+ //}
}
@Override
diff -u -r1.8 -r1.9 --- TriggerPlots.java 8 Sep 2012 00:17:54 -0000 1.8 +++ TriggerPlots.java 5 Jun 2013 19:03:48 -0000 1.9 @@ -21,7 +21,7 @@
int eventRefreshRate = 10000;
int eventn = 0;
- AIDAFrame plotterFrame;
+ //AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
String clusterCollection = "EcalClusters";
double clusterEnergyCut = 1280.0;
@@ -54,14 +54,14 @@
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Trigger Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Trigger Plots");
aida.tree().cd("/");
plotter = aida.analysisFactory().createPlotterFactory().create("Hit Times");
plotter.setTitle("Hit Times");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.style().dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(3, 3);
@@ -98,7 +98,7 @@
plotter2 = aida.analysisFactory().createPlotterFactory().create("Clusters");
plotter2.setTitle("Clusters");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
plotter2.style().setParameter("hist2DStyle", "colorMap");
plotter2.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -130,7 +130,7 @@
plotter3 = aida.analysisFactory().createPlotterFactory().create("Cluster Times");
plotter3.setTitle("Cluster Times");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.createRegions(3, 3);
@@ -162,7 +162,7 @@
plotter4 = aida.analysisFactory().createPlotterFactory().create("Trigger Types");
plotter4.setTitle("Trigger Types");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.style().dataStyle().errorBarStyle().setVisible(false);
plotter4.style().yAxisStyle().setParameter("scale", "log");
// plotter4.style().setParameter("hist2DStyle", "colorMap");
@@ -178,7 +178,7 @@
plotter5 = aida.analysisFactory().createPlotterFactory().create("Bottom turn-on");
plotter5.setTitle("Bottom turn-on");
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
plotter5.style().dataStyle().errorBarStyle().setVisible(false);
plotter5.createRegions(3, 3);
@@ -201,7 +201,7 @@
plotter6 = aida.analysisFactory().createPlotterFactory().create("Top turn-on");
plotter6.setTitle("Top turn-on");
- plotterFrame.addPlotter(plotter6);
+ //plotterFrame.addPlotter(plotter6);
plotter6.style().dataStyle().errorBarStyle().setVisible(false);
plotter6.createRegions(3, 3);
@@ -220,8 +220,8 @@
plotter6.region(5).plot(bottrigtag_cl_ecal_e_probe_trig);
plotter6.region(6).plot(bottrig_cl_ecal_emax_tag);
- plotterFrame.setVisible(true); - plotterFrame.pack();
+ //plotterFrame.setVisible(true); + //plotterFrame.pack();
}
public void process(EventHeader event) {
@@ -541,7 +541,7 @@
System.out.println("Events where bottom fired:");
System.out.format("Top fired:\t\t%d\t%d\n", simTrigAnd.binEntries(1) + simTrigAnd.binEntries(3), simTrigAnd.binEntries(0) + simTrigAnd.binEntries(2));
System.out.format("Top didn't fire:\t%d\t%d\n", simTrigBot.binEntries(1) + simTrigBot.binEntries(3), simTrigBot.binEntries(0) + simTrigBot.binEntries(2));
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
@Override
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1