Commit in hps-java/src/main/java/org/lcsim/hps/evio on MAIN | |||
EvioConsumer.java | +1 | -83 | 1.7 -> 1.8 |
cleanup
diff -u -r1.7 -r1.8 --- EvioConsumer.java 17 Mar 2012 02:16:24 -0000 1.7 +++ EvioConsumer.java 17 Mar 2012 02:20:27 -0000 1.8 @@ -171,7 +171,7 @@
occupancyMap.put(sensor, new int[640]); }
- // Normalized occupancy plots are only setup the first time, not after a call to "reset" from the GUI.
+ // Normalized occupancy plots are only setup the first time, not after a call to "reset" from the GUI.
if (occuPlot == null) { IPlotter plotter3 = fac.createPlotterFactory().create("HPS SVT Normalized Sensor Occupancy Plots"); occuPlot = plotter3;
@@ -360,87 +360,6 @@
// The default AIDA instance. AIDA aida = AIDA.defaultInstance();
- // Data plots. - /* - AIDA aida = AIDA.defaultInstance(); - aida.tree().cd("/"); - IHistogram1D adcValuePlot = aida.histogram1D("ADC Value", 500, 0, 500); - ICloud1D eventRatePlot = aida.cloud1D("Event Rate [Hz]"); - IHistogram1D rawHitCountPlot = aida.histogram1D("Number of RawTrackerHits in Event", 100, 0, 100); - IHistogram1D tkrHitCountPlot = aida.histogram1D("Number of TrackerHits in Event", 50, 0, 50); - IHistogram1D tkrCountPlot = aida.histogram1D("Number of Tracks in Event", 20, 0, 20); - ICloud1D hitsPerTrackPlot = aida.cloud1D("Number of Hits per Track"); - IHistogram1D tkrMomXPlot = aida.histogram1D("Track Px", 200, 0, 2.0); - IHistogram1D tkrMomYPlot = aida.histogram1D("Track Py", 160, -0.2, 0.2); - IHistogram1D tkrMomZPlot = aida.histogram1D("Track Pz", 160, -0.2, 0.2); - IHistogram1D tkrMomPlot = aida.histogram1D("Track P", 200, 0, 4.0); - ICloud1D timePlot = aida.cloud1D("Time [ns]"); - ICloud1D badEventPlot = aida.cloud1D("Bad Event Count"); - - IPlotter plotter = fac.createPlotterFactory().create("HPS SVT Plots"); - plotters.add(plotter); - plotter.style().dataStyle().errorBarStyle().setVisible(false); - plotter.createRegions(4,4); - plotter.region(0).plot(adcValuePlot); - plotter.region(1).plot(eventRatePlot); - plotter.region(2).plot(rawHitCountPlot); - plotter.region(3).plot(tkrHitCountPlot); - plotter.region(4).plot(tkrCountPlot); - plotter.region(5).plot(hitsPerTrackPlot); - plotter.region(6).plot(tkrMomXPlot); - plotter.region(7).plot(tkrMomYPlot); - plotter.region(8).plot(tkrMomZPlot); - plotter.region(9).plot(tkrMomPlot); - plotter.region(10).plot(timePlot); - plotter.region(11).plot(badEventPlot); - - plotter.show(); - - // Make a list of sensors in the SVT. - List<SiSensor> sensors = detector.getSubdetector("Tracker").getDetectorElement().findDescendants(SiSensor.class); - - // Setup occupancy plots. - IPlotter plotter2 = fac.createPlotterFactory().create("HPS SVT Sensor Occupancy Plots"); - plotters.add(plotter2); - IPlotterStyle style = plotter2.style(); - style.dataStyle().fillStyle().setColor("yellow"); - style.dataStyle().errorBarStyle().setVisible(false); - plotter2.createRegions(5, 4); - int ns = sensors.size(); - for (int i=0; i<ns; i++) { - IHistogram1D occupancyPlot = aida.histogram1D(sensors.get(i).getName(), 640, 0, 639); - plotter2.region(i).plot(occupancyPlot); - } - plotter2.show(); - */ - - // Make a list of sensors in the SVT. - //List<SiSensor> sensors = detector.getSubdetector("Tracker").getDetectorElement().findDescendants(SiSensor.class); - //int ns = sensors.size(); - - // Data structure for occupancy calculations by sensor. - //Map<SiSensor,int[]> occupancyMap = new HashMap<SiSensor,int[]>(); - //for (SiSensor sensor : sensors) { - // occupancyMap.put(sensor, new int[640]); - //} - - // Setup normalized occupancy plots. - /* - IPlotter plotter3 = fac.createPlotterFactory().create("HPS SVT Normalized Sensor Occupancy Plots"); - //plotters.add(plotter3); - IPlotterStyle style3 = plotter3.style(); - style3.dataStyle().fillStyle().setColor("green"); - style3.dataStyle().markerStyle().setColor("green"); - style3.dataStyle().errorBarStyle().setVisible(false); - style3.statisticsBoxStyle().setVisible(false); - plotter3.createRegions(5, 4); - for (int i=0; i<ns; i++) { - IHistogram1D occupancyPlot = aida.histogram1D(sensors.get(i).getName() + " Normalized", 640, 0, 639); - plotter3.region(i).plot(occupancyPlot); - } - plotter3.show(); - */ -
// Show GUI. EvioConsumerGui.main(new String[]{});
@@ -535,7 +454,6 @@
for (RawTrackerHit hit : hits) { // Fill ADC value plot.
- //adcValuePlot.fill(hit.getADCValues()[0]);
aida.histogram1D("ADC Value").fill(hit.getADCValues()[0]); // Fill time plot.
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