java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitCorrelations.java 2014-06-04 23:48:17 UTC (rev 671)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitCorrelations.java 2014-06-05 00:19:23 UTC (rev 672)
@@ -27,7 +27,6 @@
public class SvtHitCorrelations extends Driver {
private AIDA aida;
- private List<AIDAFrame> frames = new ArrayList<AIDAFrame>();
private List<IPlotter> plotters = new ArrayList<IPlotter>();
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
@@ -42,13 +41,6 @@
aida = AIDA.defaultInstance();
aida.tree().cd("/");
- for(int index = 0; index < 4; index++) frames.add(new AIDAFrame());
-
- frames.get(0).setTitle("Top Correlation Plots: Axial vs Axial");
- frames.get(1).setTitle("Top Correlation Plots: Axial vs Stereo");
- frames.get(2).setTitle("Bottom Correlation Plots: Axial vs Axial");
- frames.get(3).setTitle("Bottom Correlation Plots: Axial vs Stereo");
-
int nPlotters = 0;
String plotName;
@@ -62,7 +54,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
}
}
@@ -77,7 +68,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
}
}
@@ -93,7 +83,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
}
}
@@ -108,16 +97,12 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(3).addPlotter(plotters.get(nPlotters));
nPlotters++;
}
}
}
-
- for(AIDAFrame frame : frames){
- frame.pack();
- frame.setVisible(true);
- }
+
+ for(IPlotter plotter : plotters) plotter.show();
}
/**
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java 2014-06-04 23:48:17 UTC (rev 671)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java 2014-06-05 00:19:23 UTC (rev 672)
@@ -51,7 +51,6 @@
private AIDA aida;
private ShaperAnalyticFitAlgorithm shaperFitter = new ShaperAnalyticFitAlgorithm();
- private List<AIDAFrame> frames = new ArrayList<AIDAFrame>();
private List<IHistogram1D> histos1D = new ArrayList<IHistogram1D>();
private List<IHistogram2D> histos2D = new ArrayList<IHistogram2D>();
private List<IPlotter> plotters = new ArrayList<IPlotter>();
@@ -239,13 +238,6 @@
aida = AIDA.defaultInstance();
aida.tree().cd("/");
- // Create AIDA Frames
- for(int index = 0; index < 2; index++) frames.add(new AIDAFrame());
-
- // Set frame titles
- frames.get(0).setTitle("Occupancy");
- frames.get(1).setTitle("ADC Counts");
-
//
Set<SiSensor> sensors = SvtUtils.getInstance().getSensors();
int plotterIndex = 0;
@@ -264,7 +256,6 @@
histos1D.add(histo1D);
PlotUtils.setup1DRegion(plotters.get(plotterIndex), title, PlotUtils.getPlotterRegion(sensor), "Channel #", histo1D);
}
- frames.get(0).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -279,7 +270,6 @@
histos1D.add(histo1D);
PlotUtils.setup1DRegion(plotters.get(plotterIndex), title, PlotUtils.getPlotterRegion(sensor), "Channel #", histo1D);
}
- frames.get(0).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -294,7 +284,6 @@
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, PlotUtils.getPlotterRegion(sensor), "Channel #", "ADC Counts", histo2D);
}
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
} else if(sensorName != null){
title = sensorName + " - ADC Counts vs Channel #";
@@ -302,7 +291,6 @@
histo2D = aida.histogram2D(title, 640, 0, 639, 300, 0, 10000);
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, 0, "Channel #", "ADC Counts", histo2D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
} else {
throw new RuntimeException("Sensor of interest is not set!");
@@ -317,7 +305,6 @@
histo2D = aida.histogram2D(title, 640, 0, 639, 300, 0, 100);
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, 0, "Channel #", "Chi Squared", histo2D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -340,7 +327,6 @@
histo1D = aida.histogram1D(title, 100, -150, 100);
histos1D.add(histo1D);
PlotUtils.setup1DRegion(plotters.get(plotterIndex), title, 2, "t0 [ns]", histo1D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -366,7 +352,6 @@
histo2D = aida.histogram2D(title, 300, 0, 6000, 100, -100, 100);
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, 3, "Amplitude [ADC Counts]", "t0 [ns]", histo2D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -384,7 +369,6 @@
histo2D = aida.histogram2D(title, 6, 1, 7, 400, 0, 4000);
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, 1, "Sample Number", "Amplitude [ADC Counts]", histo2D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
@@ -400,7 +384,6 @@
histos2D.add(histo2D);
PlotUtils.setup2DRegion(plotters.get(plotterIndex), title, PlotUtils.getPlotterRegion(sensor), "Channel #", "t0 Resolution [ns]", histo2D);
}
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
else if(sensorName != null){
@@ -410,7 +393,6 @@
histo1D = aida.histogram1D(title, 40, -20, 20);
histos1D.add(histo1D);
PlotUtils.setup1DRegion(plotters.get(plotterIndex), title, 0, "<Hit Time> - Hit Time [ns]", histo1D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
else throw new RuntimeException("Sensor of interest not set!");
@@ -424,14 +406,11 @@
histo1D = aida.histogram1D(title, 100, 0, 75);
histos1D.add(histo1D);
PlotUtils.setup1DRegion(plotters.get(plotterIndex), title, 0, "Number of RawTrackerHits", histo1D);
- frames.get(1).addPlotter(plotters.get(plotterIndex));
plotterIndex++;
}
- for(AIDAFrame frame : frames){
- frame.pack();
- frame.setVisible(true);
- }
+ for(IPlotter plotter : plotters) plotter.show();
+
}
/**
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java 2014-06-04 23:48:17 UTC (rev 671)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java 2014-06-05 00:19:23 UTC (rev 672)
@@ -37,7 +37,6 @@
private String trackCollectionName = "MatchedTracks";
private String stripHitCollectionName = "StripClusterer_SiTrackerHitStrip1D";
private AIDA aida;
- private List<AIDAFrame> frames = new ArrayList<AIDAFrame>();
private List<IPlotter> plotters = new ArrayList<IPlotter>();
@@ -58,13 +57,6 @@
aida = AIDA.defaultInstance();
aida.tree().cd("/");
- for(int index = 0; index < 4; index++) frames.add(new AIDAFrame());
-
- frames.get(0).setTitle("Track Position");
- frames.get(1).setTitle("Track Parameters");
- frames.get(2).setTitle("Track Momentum");
- frames.get(3).setTitle("Cluster Matching");
-
int nPlotters = 0;
//--- Track Extrapolation ---//
@@ -75,7 +67,6 @@
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style();
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Harp"));
@@ -83,7 +74,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Ecal: Curvature < 0"));
@@ -91,7 +81,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Harp: Curvature < 0"));
@@ -99,7 +88,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Ecal: Curvature > 0"));
@@ -107,7 +95,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Harp: Curvature > 0"));
@@ -115,7 +102,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Ecal: Two Tracks"));
@@ -124,7 +110,6 @@
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style();
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Track Position at Harp: Two Tracks"));
@@ -132,7 +117,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(0).addPlotter(plotters.get(nPlotters));
nPlotters++;
@@ -142,42 +126,36 @@
plotters.get(nPlotters).region(0).plot(aida.histogram1D("DOCA", 120, 0, 120));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Z0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Z0", 120, 0, 120));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("phi0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("phi0", 50, -Math.PI, Math.PI));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Curvature"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("R", 200, -10, 10));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Tan(Lambda)"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Tan(Lambda)", 100, 0, 1));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("ChiSquared"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("ChiSquared", 100, 0, 100));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(1).addPlotter(plotters.get(nPlotters));
nPlotters++;
//--- Momentum ---//
@@ -186,77 +164,66 @@
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Px", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Py"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Py", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Pz"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Pz", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Px: C > 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Px: C > 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Py: C > 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Py: C > 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Pz: C > 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Pz: C > 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Px: C < 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Px: C < 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Py: C < 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Py: C < 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Pz: C < 0"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Pz: C < 0", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("Px: Two Tracks"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("Px: Two Tracks", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("E over P"));
plotters.get(nPlotters).region(0).plot(aida.histogram1D("E over P", 100, 0, 5));
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
plotters.get(nPlotters).style().dataStyle().errorBarStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
plotters.add(aida.analysisFactory().createPlotterFactory().create("E versus P"));
@@ -264,7 +231,6 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(2).addPlotter(plotters.get(nPlotters));
nPlotters++;
//--- Cluster Matching ---//
@@ -274,13 +240,9 @@
plotters.get(nPlotters).region(0).style().setParameter("hist2DStyle", "colorMap");
plotters.get(nPlotters).region(0).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotters.get(nPlotters).style().statisticsBoxStyle().setVisible(false);
- frames.get(3).addPlotter(plotters.get(nPlotters));
nPlotters++;
- for(AIDAFrame frame : frames){
- frame.pack();
- frame.setVisible(true);
- }
+ for(IPlotter plotter : plotters) plotter.show();
}
public void process(EventHeader event){
