9 modified files
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.16 -r1.17
--- SVTHitPulsePlots.java 24 May 2012 14:33:59 -0000 1.16
+++ SVTHitPulsePlots.java 5 Jun 2013 19:03:21 -0000 1.17
@@ -26,7 +26,7 @@
*/
public class SVTHitPulsePlots extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private List<IPlotter> plotters = new ArrayList<IPlotter>();
private AIDA aida = AIDA.defaultInstance();
private String rawTrackerHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
@@ -39,8 +39,8 @@
private String outputPlots = null;
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Pulse Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Pulse Plots");
aida.tree().cd("/");
@@ -58,9 +58,9 @@
IAnalysisFactory fac = aida.analysisFactory();
- plotter3 = fac.createPlotterFactory().create("HPS SVT Pulse Plots: Raw Hits");
+ plotter3 = fac.createPlotterFactory("SVT Pulse Plots").create("HPS SVT Pulse Plots: Raw Hits");
plotter3.setTitle("HPS SVT Pulse Plots: Raw Hits");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotters.add(plotter3);
IPlotterStyle style3 = plotter3.style();
style3.statisticsBoxStyle().setVisible(false);
@@ -69,12 +69,12 @@
style3.dataStyle().errorBarStyle().setVisible(true);
plotter3.createRegions(5, 4);
- plotter2 = fac.createPlotterFactory().create("HPS SVT Hit vs Channel");
+ plotter2 = fac.createPlotterFactory("SVT Pulse Plots").create("HPS SVT Hit vs Channel");
plotter2.setTitle("HPS SVT Hit vs Channel");
plotter2.style().setParameter("hist2DStyle", "colorMap");
plotter2.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter2.style().zAxisStyle().setParameter("scale", "log");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotters.add(plotter2);
IPlotterStyle style2 = plotter2.style();
style2.statisticsBoxStyle().setVisible(false);
@@ -92,8 +92,8 @@
plotter3.region(region).plot(pulsePlot);
plotter2.region(region).plot(adcVsChanPlot);
}
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public SVTHitPulsePlots() {
@@ -143,7 +143,7 @@
Logger.getLogger(TrackingReconstructionPlots.class.getName()).log(Level.SEVERE, null, ex);
}
}
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
private boolean hasAdjacentHit(RawTrackerHit hit) {
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.8 -r1.9
--- SVTHitRecoCorrelations.java 27 Jun 2012 21:58:30 -0000 1.8
+++ SVTHitRecoCorrelations.java 5 Jun 2013 19:03:21 -0000 1.9
@@ -31,7 +31,7 @@
*/
public class SVTHitRecoCorrelations extends Driver implements Resettable {
- private List<AIDAFrame> plotterFrame = new ArrayList<AIDAFrame>();
+ //private List<AIDAFrame> plotterFrame = new ArrayList<AIDAFrame>();
private List<IPlotter> plotters = new ArrayList<IPlotter>();
private AIDA aida = AIDA.defaultInstance();
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
@@ -51,10 +51,10 @@
protected void detectorChanged(Detector detector) {
- plotterFrame.add(new AIDAFrame());
- plotterFrame.get(0).setTitle("HPS Top SVT Hit Reconstruction Correlation Plots");
- plotterFrame.add(new AIDAFrame());
- plotterFrame.get(1).setTitle("HPS Bottom SVT Hit Reconstruction Correlation Plots");
+ //plotterFrame.add(new AIDAFrame());
+ //plotterFrame.get(0).setTitle("HPS Top SVT Hit Reconstruction Correlation Plots");
+ //plotterFrame.add(new AIDAFrame());
+ //plotterFrame.get(1).setTitle("HPS Bottom SVT Hit Reconstruction Correlation Plots");
aida.tree().cd("/");
@@ -76,7 +76,7 @@
bcorr.setTitle("Cmpt "+ side[i] + " hits " + types[t]);
bcorr.createRegion();
plotter.get(i).add(bcorr);
- plotterFrame.get(i).addPlotter(bcorr);
+ //plotterFrame.get(i).addPlotter(bcorr);
plotters.add(bcorr);
@@ -223,10 +223,10 @@
}
*/
- for(int i=0;i<2;++i) {
- plotterFrame.get(i).pack();
- plotterFrame.get(i).setVisible(true);
- }
+ //for(int i=0;i<2;++i) {
+ //plotterFrame.get(i).pack();
+ // plotterFrame.get(i).setVisible(true);
+ //}
}
public SVTHitRecoCorrelations() {
@@ -458,9 +458,9 @@
} catch (IOException ex) {
Logger.getLogger(SVTHitRecoCorrelations.class.getName()).log(Level.SEVERE, null, ex);
}
- for(int i=0;i<2;++i) {
- plotterFrame.get(i).dispose();
- }
+ //for(int i=0;i<2;++i) {
+ // plotterFrame.get(i).dispose();
+ //}
}
@Override
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.19 -r1.20
--- SVTHitReconstructionPlots.java 22 Jun 2012 00:24:44 -0000 1.19
+++ SVTHitReconstructionPlots.java 5 Jun 2013 19:03:21 -0000 1.20
@@ -32,7 +32,7 @@
*/
public class SVTHitReconstructionPlots extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
private String trackerHitCollectionName = "StripClusterer_SiTrackerHitStrip1D";
@@ -55,8 +55,8 @@
private String outputPlots = null;
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Hit Reconstruction Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Hit Reconstruction Plots");
aida.tree().cd("/");
@@ -74,7 +74,7 @@
plotter1 = fac.createPlotterFactory().create("HPS SVT Raw Hit Plots");
plotter1.setTitle("Raw Hits");
- plotterFrame.addPlotter(plotter1);
+ //plotterFrame.addPlotter(plotter1);
IPlotterStyle style3 = plotter1.style();
style3.dataStyle().fillStyle().setColor("yellow");
style3.dataStyle().errorBarStyle().setVisible(false);
@@ -82,7 +82,7 @@
plotter3 = fac.createPlotterFactory().create("HPS SVT Reco Hit Plots");
plotter3.setTitle("Reco Hits");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
IPlotterStyle style4 = plotter3.style();
style4.dataStyle().fillStyle().setColor("yellow");
style4.dataStyle().errorBarStyle().setVisible(false);
@@ -91,7 +91,7 @@
plotter2 = fac.createPlotterFactory().create("HPS SVT Cluster Hit Plots");
plotter2.setTitle("Clusters");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
IPlotterStyle style44 = plotter2.style();
style44.dataStyle().fillStyle().setColor("yellow");
style44.dataStyle().errorBarStyle().setVisible(false);
@@ -99,7 +99,7 @@
plotter4 = fac.createPlotterFactory().create("HPS SVT Cluster Size Plots");
plotter4.setTitle("Cluster Size");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
IPlotterStyle style6 = plotter4.style();
style6.dataStyle().fillStyle().setColor("green");
style6.dataStyle().errorBarStyle().setVisible(false);
@@ -108,7 +108,7 @@
plotter5 = fac.createPlotterFactory().create("HPS SVT Cluster Amp Plots");
plotter5.setTitle("Cluster Amplitude");
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
IPlotterStyle style7 = plotter5.style();
style7.dataStyle().fillStyle().setColor("green");
style7.dataStyle().errorBarStyle().setVisible(false);
@@ -117,7 +117,7 @@
plotter6 = fac.createPlotterFactory().create("HPS SVT Cluster Position Vs Channel");
plotter6.setTitle("Cluster Position (y)");
- plotterFrame.addPlotter(plotter6);
+ //plotterFrame.addPlotter(plotter6);
IPlotterStyle style8 = plotter6.style();
style8.dataStyle().fillStyle().setColor("green");
style8.dataStyle().errorBarStyle().setVisible(false);
@@ -153,8 +153,8 @@
IProfile1D hitsPerLayerTop = aida.profile1D("Number of Fitted Hits per layer in Top Half", 10, 1, 11);
IProfile1D hitsPerLayerBot = aida.profile1D("Number of Fitted Hits per layer in Bottom Half", 10, 1, 11);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public SVTHitReconstructionPlots() {
@@ -263,7 +263,7 @@
Logger.getLogger(TrackingReconstructionPlots.class.getName()).log(Level.SEVERE, null, ex);
}
}
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
@Override
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.6 -r1.7
--- SVTMonitoringPlots.java 24 May 2012 19:48:40 -0000 1.6
+++ SVTMonitoringPlots.java 5 Jun 2013 19:03:21 -0000 1.7
@@ -31,7 +31,7 @@
private String inputCollection = "SVTRawTrackerHits";
private String fitCollection = "SVTFittedRawTrackerHits";
private AIDA aida = AIDA.defaultInstance();
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private IPlotter plotter, plotter2, plotter3;
// private IHistogram1D[][] plots = new IHistogram1D[2][10];
private IProfile1D[][] pedestalShifts = new IProfile1D[2][10];
@@ -62,15 +62,15 @@
}
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Monitoring");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Monitoring");
// Setup the plotter.
IAnalysisFactory fac = aida.analysisFactory();
plotter = fac.createPlotterFactory().create("Pedestal Shifts");
plotter.setTitle("Pedestal Shifts");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.style().dataStyle().errorBarStyle().setVisible(false);
plotter.style().statisticsBoxStyle().setVisible(false);
plotter.style().dataStyle().fillStyle().setColor("red");
@@ -80,7 +80,7 @@
plotter2 = fac.createPlotterFactory().create("Fitted T0");
plotter2.setTitle("Fitted T0");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
plotter2.style().statisticsBoxStyle().setVisible(false);
plotter2.style().setParameter("hist2DStyle", "colorMap");
@@ -91,7 +91,7 @@
plotter3 = fac.createPlotterFactory().create("Fitted Amplitude");
plotter3.setTitle("Fitted Amplitude");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.style().statisticsBoxStyle().setVisible(false);
plotter3.style().setParameter("hist2DStyle", "colorMap");
@@ -115,8 +115,8 @@
plotter3.region(region).plot(amps[module][layer]);
}
}
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public void process(EventHeader event) {
@@ -160,6 +160,6 @@
}
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
}
\ No newline at end of file
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.5 -r1.6
--- SVTPulseFitPlots.java 25 Apr 2013 22:11:14 -0000 1.5
+++ SVTPulseFitPlots.java 5 Jun 2013 19:03:21 -0000 1.6
@@ -25,7 +25,7 @@
*/
public class SVTPulseFitPlots extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
// private String trackerName = "Tracker";
@@ -45,38 +45,38 @@
@Override
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Pulse Fit Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Pulse Fit Plots");
aida.tree().cd("/");
IAnalysisFactory fac = aida.analysisFactory();
- plotter = fac.createPlotterFactory().create("HPS SVT Timing Plots");
+ plotter = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Timing Plots");
plotter.setTitle("Timing");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
IPlotterStyle style = plotter.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(4, 5);
- plotter2 = fac.createPlotterFactory().create("HPS SVT Amplitude Plots");
+ plotter2 = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Amplitude Plots");
plotter2.setTitle("Amplitude");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
IPlotterStyle style2 = plotter2.style();
style2.dataStyle().fillStyle().setColor("yellow");
style2.dataStyle().errorBarStyle().setVisible(false);
plotter2.createRegions(4, 5);
- plotter3 = fac.createPlotterFactory().create("HPS SVT Chisq Plots");
+ plotter3 = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Chisq Plots");
plotter3.setTitle("Chisq");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().fillStyle().setColor("yellow");
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.createRegions(4, 5);
- plotter4 = fac.createPlotterFactory().create("A vs. T0");
+ plotter4 = fac.createPlotterFactory("SVT Pulse Fit").create("A vs. T0");
plotter4.setTitle("A vs. T0");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.style().dataStyle().errorBarStyle().setVisible(false);
plotter4.style().statisticsBoxStyle().setVisible(false);
plotter4.style().setParameter("hist2DStyle", "colorMap");
@@ -85,9 +85,9 @@
plotter4.style().zAxisStyle().setVisible(false);
plotter4.createRegions(4, 5);
- plotter5 = fac.createPlotterFactory().create("Pulse Shape");
+ plotter5 = fac.createPlotterFactory("SVT Pulse Fit").create("Pulse Shape");
plotter5.setTitle("Pulse shape");
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
plotter5.style().dataStyle().errorBarStyle().setVisible(false);
plotter5.style().statisticsBoxStyle().setVisible(false);
plotter5.style().setParameter("hist2DStyle", "colorMap");
@@ -117,8 +117,8 @@
// shape = aida.histogram2D("Shape", 200, -1, 3, 200, -0.5, 2);
// plotter5.region(0).plot(shape);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public SVTPulseFitPlots() {
@@ -172,7 +172,7 @@
Logger.getLogger(TrackingReconstructionPlots.class.getName()).log(Level.SEVERE, null, ex);
}
}
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
@Override
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.9 -r1.10
--- SVTSimpleEventDisplay.java 29 May 2012 22:25:09 -0000 1.9
+++ SVTSimpleEventDisplay.java 5 Jun 2013 19:03:21 -0000 1.10
@@ -21,11 +21,11 @@
* Plots hit counts for all SVT channels at each stage of reconstruction;
* can be set to reset after each event for use as an event display
*
- * @version $Id: SVTSimpleEventDisplay.java,v 1.9 2012/05/29 22:25:09 meeg Exp $
+ * @version $Id: SVTSimpleEventDisplay.java,v 1.10 2013/06/05 19:03:21 jeremy Exp $
*/
public class SVTSimpleEventDisplay extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private String inputCollection = "SVTRawTrackerHits";
private String trackerHitCollection = "StripClusterer_SiTrackerHitStrip1D";
private String helicalHitCollection = "HelicalTrackHits";
@@ -73,36 +73,36 @@
@Override
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Hit Counts");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Hit Counts");
// Setup the plotter.
IAnalysisFactory fac = aida.analysisFactory();
plotter = fac.createPlotterFactory().create("RawTrackerHits");
plotter.setTitle("RawTrackerHits");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.style().dataStyle().errorBarStyle().setVisible(false);
plotter.style().statisticsBoxStyle().setVisible(false);
plotter.createRegions(4, 5);
plotter2 = fac.createPlotterFactory().create("TrackerHits");
plotter2.setTitle("TrackerHits");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
plotter2.style().statisticsBoxStyle().setVisible(false);
plotter2.createRegions(4, 5);
plotter3 = fac.createPlotterFactory().create("HelicalTrackHits");
plotter3.setTitle("HelicalTrackHits");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.style().statisticsBoxStyle().setVisible(false);
plotter3.createRegions(4, 5);
plotter4 = fac.createPlotterFactory().create("Hit Counts");
plotter4.setTitle("Hit Counts");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.style().dataStyle().errorBarStyle().setVisible(false);
// plotter4.style().statisticsBoxStyle().setVisible(false);
plotter4.createRegions(1, 2);
@@ -126,8 +126,8 @@
hitCount[1] = aida.histogram1D("Hit layers in bottom", 6, -0.5, 5.5);
plotter4.region(1).plot(hitCount[1]);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
@Override
@@ -198,7 +198,7 @@
@Override
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
@Override
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.5 -r1.6
--- SensorOccupancyPlotsDriver.java 5 Jun 2012 19:23:47 -0000 1.5
+++ SensorOccupancyPlotsDriver.java 5 Jun 2013 19:03:21 -0000 1.6
@@ -44,6 +44,8 @@
private Map<String, Integer> sensorRegionMap;
private int eventCount = 0;
private int eventRefreshRate = 1000;
+ private static final String nameStrip = "Tracker_TestRunModule_";
+ private static final int maxChannels = 640;
public SensorOccupancyPlotsDriver() {
}
@@ -85,7 +87,9 @@
plotter = fac.createPlotterFactory("SVT").create("Sensor Occupancy Plots");
IPlotterStyle pstyle = plotter.style();
pstyle.dataStyle().fillStyle().setColor("green");
- pstyle.dataStyle().markerStyle().setColor("green");
+ //pstyle.dataStyle().markerStyle().setColor("green");
+ pstyle.dataStyle().markerStyle().setVisible(false);
+ pstyle.dataStyle().outlineStyle().setVisible(false);
pstyle.dataStyle().errorBarStyle().setVisible(false);
pstyle.statisticsBoxStyle().setVisible(false);
@@ -116,7 +120,8 @@
// Setup the occupancy plots.
aida.tree().cd("/");
for (SiSensor sensor : sensors) {
- IHistogram1D occupancyPlot = aida.histogram1D(sensor.getName(), 640, 0, 639);
+ //IHistogram1D occupancyPlot = aida.histogram1D(sensor.getName().replaceAll("Tracker_TestRunModule_", ""), 640, 0, 639);
+ IHistogram1D occupancyPlot = createSensorPlot(sensor);
occupancyPlot.reset();
int region = sensorRegionMap.get(sensor.getName());
plotter.region(region).plot(occupancyPlot);
@@ -141,7 +146,8 @@
// Plot strip occupancies.
if (eventCount % eventRefreshRate == 0) {
for (SiSensor sensor : sensors) {
- IHistogram1D sensorHist = aida.histogram1D(sensor.getName());
+ //IHistogram1D sensorHist = aida.histogram1D(sensor.getName());
+ IHistogram1D sensorHist = getSensorPlot(sensor);
sensorHist.reset();
int[] strips = occupancyMap.get(sensor.getName());
for (int i = 0; i < strips.length; i++) {
@@ -157,6 +163,19 @@
++eventCount;
}
}
+
+ private IHistogram1D getSensorPlot(SiSensor sensor) {
+ return aida.histogram1D(sensor.getName());
+ }
+
+ private IHistogram1D createSensorPlot(SiSensor sensor) {
+ IHistogram1D hist = aida.histogram1D(sensor.getName(), maxChannels, 0, maxChannels-1);
+ hist.setTitle(sensor.getName().replaceAll(nameStrip, "")
+ .replace("module", "mod")
+ .replace("layer", "lyr")
+ .replace("sensor", "sens"));
+ return hist;
+ }
private void resetOccupancyMap() {
occupancyMap = new HashMap<String, int[]>();
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.3 -r1.4
--- TrackTimePlots.java 22 Jun 2012 00:24:44 -0000 1.3
+++ TrackTimePlots.java 5 Jun 2013 19:03:21 -0000 1.4
@@ -29,7 +29,7 @@
*/
public class TrackTimePlots extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
private String hitCollection = "StripClusterer_SiTrackerHitStrip1D";
private String trackCollection = "MatchedTracks";
@@ -46,8 +46,8 @@
@Override
protected void detectorChanged(Detector detector) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS SVT Track Time Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS SVT Track Time Plots");
aida.tree().cd("/");
@@ -57,7 +57,7 @@
plotter = fac.create("HPS SVT Timing Plots");
plotter.setTitle("Hit Times");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
style = plotter.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
@@ -65,7 +65,7 @@
plotter2 = fac.create("HPS SVT Track Time");
plotter2.setTitle("Track Time");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
style = plotter2.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
@@ -73,7 +73,7 @@
plotter3 = fac.create("HPS SVT Timing Plots");
plotter3.setTitle("Track Hit Time");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
style = plotter3.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
@@ -81,7 +81,7 @@
plotter4 = fac.create("HPS SVT Timing Plots");
plotter4.setTitle("Track Hit dt");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
style = plotter4.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
@@ -89,7 +89,7 @@
plotter5 = fac.create("HPS SVT Timing Plots");
plotter5.setTitle("Track Time vs. dt");
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
style = plotter5.style();
style.statisticsBoxStyle().setVisible(false);
style.setParameter("hist2DStyle", "colorMap");
@@ -99,7 +99,7 @@
plotter6 = fac.create("HPS SVT Timing Plots");
plotter6.setTitle("Track dt vs. Channel");
- plotterFrame.addPlotter(plotter6);
+ //plotterFrame.addPlotter(plotter6);
style = plotter6.style();
style.statisticsBoxStyle().setVisible(false);
style.setParameter("hist2DStyle", "colorMap");
@@ -109,7 +109,7 @@
plotter7 = fac.create("HPS SVT Track Hit Time Range");
plotter7.setTitle("Track Hit Time Range");
- plotterFrame.addPlotter(plotter7);
+ //plotterFrame.addPlotter(plotter7);
style = plotter7.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
@@ -164,8 +164,8 @@
// shape = aida.histogram2D("Shape", 200, -1, 3, 200, -0.5, 2);
// plotter5.region(0).plot(shape);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public void setHitCollection(String hitCollection) {
@@ -279,7 +279,7 @@
@Override
public void endOfData() {
- plotterFrame.dispose();
+ //plotterFrame.dispose();
}
@Override
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.13 -r1.14
--- TrackingReconstructionPlots.java 8 Sep 2012 00:17:54 -0000 1.13
+++ TrackingReconstructionPlots.java 5 Jun 2013 19:03:21 -0000 1.14
@@ -32,9 +32,9 @@
*/
public class TrackingReconstructionPlots extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
- private AIDAFrame topFrame;
- private AIDAFrame bottomFrame;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame topFrame;
+ //private AIDAFrame bottomFrame;
private AIDA aida = AIDA.defaultInstance();
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
@@ -84,13 +84,13 @@
protected void detectorChanged(Detector detector) {
this.detector = detector;
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Tracking Plots");
- topFrame = new AIDAFrame();
- topFrame.setTitle("Top Tracking Plots");
- bottomFrame = new AIDAFrame();
- bottomFrame.setTitle("Bottom Tracking Plots");
+ //topFrame = new AIDAFrame();
+ //topFrame.setTitle("Top Tracking Plots");
+ //bottomFrame = new AIDAFrame();
+ //bottomFrame.setTitle("Bottom Tracking Plots");
sensors = detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
@@ -101,7 +101,7 @@
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(2, 2);
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
trkPx = aida.histogram1D("Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D trkPy = aida.histogram1D("Track Momentum (Py)", 25, -0.1, 0.1);
@@ -122,7 +122,7 @@
stop1.dataStyle().fillStyle().setColor("green");
stop1.dataStyle().errorBarStyle().setVisible(false);
top1.createRegions(2, 2);
- topFrame.addPlotter(top1);
+ //topFrame.addPlotter(top1);
IHistogram1D toptrkPx = aida.histogram1D("Top Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D toptrkPy = aida.histogram1D("Top Track Momentum (Py)", 25, -0.1, 0.1);
@@ -141,7 +141,7 @@
sbot1.dataStyle().fillStyle().setColor("blue");
sbot1.dataStyle().errorBarStyle().setVisible(false);
bot1.createRegions(2, 2);
- bottomFrame.addPlotter(bot1);
+ //bottomFrame.addPlotter(bot1);
IHistogram1D bottrkPx = aida.histogram1D("Bottom Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D bottrkPy = aida.histogram1D("Bottom Track Momentum (Py)", 25, -0.1, 0.1);
@@ -163,7 +163,7 @@
plotter22 = fac.createPlotterFactory().create("HPS Track Params");
plotter22.setTitle("Track parameters");
- plotterFrame.addPlotter(plotter22);
+ //plotterFrame.addPlotter(plotter22);
IPlotterStyle style22 = plotter22.style();
style22.dataStyle().fillStyle().setColor("yellow");
style22.dataStyle().errorBarStyle().setVisible(false);
@@ -177,7 +177,7 @@
plotter2 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter2.setTitle("Track extrapolation");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
IPlotterStyle style2 = plotter2.style();
style2.dataStyle().fillStyle().setColor("yellow");
style2.dataStyle().errorBarStyle().setVisible(false);
@@ -202,7 +202,7 @@
plotter222 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter222.setTitle("Other");
- plotterFrame.addPlotter(plotter222);
+ //plotterFrame.addPlotter(plotter222);
IPlotterStyle style222 = plotter222.style();
style222.dataStyle().fillStyle().setColor("yellow");
style222.dataStyle().errorBarStyle().setVisible(false);
@@ -225,7 +225,7 @@
plotter3 = fac.createPlotterFactory().create("HPS Residual Plots");
plotter3.setTitle("Residuals");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
IPlotterStyle style3 = plotter3.style();
style3.dataStyle().fillStyle().setColor("yellow");
style3.dataStyle().errorBarStyle().setVisible(false);
@@ -267,7 +267,7 @@
plotter3_1 = fac.createPlotterFactory().create("HPS Residual Plots (Single hit per layer)");
plotter3_1.setTitle("Residuals (Top)");
- plotterFrame.addPlotter(plotter3_1);
+ //plotterFrame.addPlotter(plotter3_1);
IPlotterStyle style3_1 = plotter3_1.style();
style3_1.dataStyle().fillStyle().setColor("yellow");
style3_1.dataStyle().errorBarStyle().setVisible(false);
@@ -303,7 +303,7 @@
plotter3_2 = fac.createPlotterFactory().create("HPS Residual Plots (Single strip cluster per layer)");
plotter3_2.setTitle("Residuals (Bottom)");
- plotterFrame.addPlotter(plotter3_2);
+ //plotterFrame.addPlotter(plotter3_2);
IPlotterStyle style3_2 = plotter3_2.style();
style3_2.dataStyle().fillStyle().setColor("yellow");
style3_2.dataStyle().errorBarStyle().setVisible(false);
@@ -341,7 +341,7 @@
plotter4 = fac.createPlotterFactory().create("HPS Track and ECal Plots");
plotter4.setTitle("Track and ECal Correlations");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
IPlotterStyle style4 = plotter4.style();
style4.setParameter("hist2DStyle", "colorMap");
style4.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -380,7 +380,7 @@
stop2.setParameter("hist2DStyle", "colorMap");
stop2.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
top2.createRegions(2, 3);
- topFrame.addPlotter(top2);
+ //topFrame.addPlotter(top2);
IHistogram2D topeVsP = aida.histogram2D("Top Energy Vs Momentum", 50, 0, 500, 50, 0, 3000);
IHistogram1D topeOverP = aida.histogram1D("Top Energy Over Momentum", 50, 0, 2);
@@ -409,7 +409,7 @@
sbot2.setParameter("hist2DStyle", "colorMap");
sbot2.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
bot2.createRegions(2, 3);
- bottomFrame.addPlotter(bot2);
+ //bottomFrame.addPlotter(bot2);
IHistogram2D BottomeVsP = aida.histogram2D("Bottom Energy Vs Momentum", 50, 0, 500, 50, 0, 3000);
IHistogram1D BottomeOverP = aida.histogram1D("Bottom Energy Over Momentum", 50, 0, 2);
@@ -440,7 +440,7 @@
stop3.setParameter("hist2DStyle", "colorMap");
stop3.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
top3.createRegions(1, 2);
- topFrame.addPlotter(top3);
+ //topFrame.addPlotter(top3);
IHistogram2D topdistXvsX = aida.histogram2D("Top deltaX vs X", 51,-400,400, 25, -400, 400);
IHistogram2D topdistYvsY = aida.histogram2D("Top deltaY vs Y", 51,0,100, 25, -40, 40);
@@ -457,7 +457,7 @@
sbot3.setParameter("hist2DStyle", "colorMap");
sbot3.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
bot3.createRegions(1, 2);
- bottomFrame.addPlotter(bot3);
+ //bottomFrame.addPlotter(bot3);
IHistogram2D botdistXvsX = aida.histogram2D("Bottom deltaX vs X", 51,-400,400, 25, -400, 400);
@@ -473,7 +473,7 @@
plotter5 = fac.createPlotterFactory().create("HPS Hit Positions");
plotter5.setTitle("Hit Positions: Top");
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
IPlotterStyle style5 = plotter5.style();
style5.setParameter("hist2DStyle", "colorMap");
style5.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -491,7 +491,7 @@
plotter5_1 = fac.createPlotterFactory().create("HPS Hit Positions");
plotter5_1.setTitle("Hit Positions: Bottom");
- plotterFrame.addPlotter(plotter5_1);
+ //plotterFrame.addPlotter(plotter5_1);
IPlotterStyle style5_1 = plotter5_1.style();
style5_1.setParameter("hist2DStyle", "colorMap");
style5_1.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -506,7 +506,7 @@
plotter55 = fac.createPlotterFactory().create("HPS Hit Positions");
plotter55.setTitle("Helical Track Hits");
- plotterFrame.addPlotter(plotter55);
+ //plotterFrame.addPlotter(plotter55);
IPlotterStyle style55 = plotter55.style();
style55.dataStyle().fillStyle().setColor("Green");
style55.dataStyle().errorBarStyle().setVisible(false);
@@ -523,7 +523,7 @@
plotter6 = fac.createPlotterFactory().create("HPS ECAL Hit Positions");
plotter6.setTitle("ECAL Positions");
- plotterFrame.addPlotter(plotter6);
+ //plotterFrame.addPlotter(plotter6);
IPlotterStyle style6 = plotter6.style();
style6.setParameter("hist2DStyle", "colorMap");
style6.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -551,18 +551,18 @@
plotter6.region(6).plot(topECal3);
plotter6.region(7).plot(botECal3);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
- topFrame.pack();
- topFrame.setVisible(true);
+ //topFrame.pack();
+ //topFrame.setVisible(true);
- bottomFrame.pack();
- bottomFrame.setVisible(true);
+ //bottomFrame.pack();
+ //bottomFrame.setVisible(true);
plotter7 = fac.createPlotterFactory().create("HPS ECAL Hit Positions");
plotter7.setTitle("Basic Misc Stuff");
- plotterFrame.addPlotter(plotter7);
+ //plotterFrame.addPlotter(plotter7);
IPlotterStyle style7 = plotter7.style();
style7.setParameter("hist2DStyle", "colorMap");
style7.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
@@ -1004,9 +1004,9 @@
} catch (IOException ex) {
Logger.getLogger(TrackingReconstructionPlots.class.getName()).log(Level.SEVERE, null, ex);
}
- plotterFrame.dispose();
- topFrame.dispose();
- bottomFrame.dispose();
+ //plotterFrame.dispose();
+ //topFrame.dispose();
+ //bottomFrame.dispose();
}
private HPSEcalCluster findClosestCluster(Hep3Vector posonhelix, List<HPSEcalCluster> clusters) {
CVSspam 0.2.12