 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps on MAIN | |||
| monitoring/svt/SVTMonitoringPlots.java | +2 | -6 | 1.2 -> 1.3 |
| /SVTSimpleEventDisplay.java | +1 | -1 | 1.5 -> 1.6 |
| monitoring/ecal/EcalClusterPlots.java | +5 | -1 | 1.5 -> 1.6 |
| /EcalHitPlots.java | +7 | -4 | 1.4 -> 1.5 |
| evio/TestRunEvioToLcio.java | +9 | -5 | 1.12 -> 1.13 |
| +24 | -17 | ||
hmmm
diff -u -r1.2 -r1.3 --- SVTMonitoringPlots.java 18 May 2012 03:48:45 -0000 1.2 +++ SVTMonitoringPlots.java 18 May 2012 08:26:35 -0000 1.3 @@ -1,8 +1,6 @@
package org.lcsim.hps.monitoring.svt; import hep.aida.*;
-import hep.aida.ref.plotter.PlotterRegion; -import jas.hist.JASHist;
import java.util.List; import org.lcsim.detector.tracker.silicon.SiSensor;
@@ -162,7 +160,7 @@
int strip = fit.getRawTrackerHit().getIdentifierFieldValue("strip");
if (fit.getShapeFitParameters().getChiSq() < 5) {
// if (fit.getAmp() > 200) {
- t0s[module][layer - 1].fill(strip, fit.getT0());
+ t0s[module][layer - 1].fill(strip, fit.getT0());
// }
amps[module][layer - 1].fill(strip, fit.getAmp());
}
@@ -172,8 +170,6 @@
}
public void endOfData() {
- if (plotter != null) {
- plotter.hide();
- }
+ plotterFrame.dispose();
} }
\ No newline at end of file
diff -u -r1.5 -r1.6 --- SVTSimpleEventDisplay.java 18 May 2012 07:41:49 -0000 1.5 +++ SVTSimpleEventDisplay.java 18 May 2012 08:26:35 -0000 1.6 @@ -108,7 +108,7 @@
plotter4.setTitle("Hit Counts");
plotterFrame.addPlotter(plotter4);
plotter4.style().dataStyle().errorBarStyle().setVisible(false);
- plotter4.style().statisticsBoxStyle().setVisible(false);
+// plotter4.style().statisticsBoxStyle().setVisible(false);
plotter4.createRegions(1, 2);
// Setup the occupancy plots.
diff -u -r1.5 -r1.6 --- EcalClusterPlots.java 16 May 2012 16:05:59 -0000 1.5 +++ EcalClusterPlots.java 18 May 2012 08:26:35 -0000 1.6 @@ -73,7 +73,7 @@
plotter2.style().yAxisStyle().setParameter("scale", "log");
}
- clusterEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Cluster Energy", 1000, 500, maxE);
+ clusterEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Cluster Energy", 1000, -100, maxE);
clusterMaxEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Maximum Cluster Energy In Event", 1000, -100, maxE);
@@ -116,4 +116,8 @@
clusterEnergyPlot.reset();
clusterMaxEnergyPlot.reset();
}
+
+ public void endOfData() {
+ plotterFrame.dispose();
+ }
}
\ No newline at end of file
diff -u -r1.4 -r1.5 --- EcalHitPlots.java 16 May 2012 16:05:59 -0000 1.4 +++ EcalHitPlots.java 18 May 2012 08:26:35 -0000 1.5 @@ -54,10 +54,10 @@
// Setup plots.
aida.tree().cd("/");
hitCountPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Count In Event", 10, -0.5, 9.5);
- hitTimePlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time", 100, 0*4.0,100*4.0);
+ hitTimePlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time", 100, 0 * 4.0, 100 * 4.0);
// Create the plotter regions.
- plotter.createRegions(1,2);
+ plotter.createRegions(1, 2);
plotter.region(0).plot(hitCountPlot);
plotter.region(1).plot(hitTimePlot);
@@ -70,7 +70,7 @@
hitEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Energy", 1000, -100, maxE);
hitMaxEnergyPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Maximum Hit Energy In Event", 1000, -100, maxE);
-
+
if (logScale) {
plotter2.style().yAxisStyle().setParameter("scale", "log");
}
@@ -111,11 +111,14 @@
// hitCountPlot.reset(); // } // }
-
public void reset() {
hitCountPlot.reset();
hitTimePlot.reset();
hitEnergyPlot.reset();
hitMaxEnergyPlot.reset();
}
+
+ public void endOfData() {
+ plotterFrame.dispose();
+ }
}
\ No newline at end of file
diff -u -r1.12 -r1.13 --- TestRunEvioToLcio.java 18 May 2012 03:48:45 -0000 1.12 +++ TestRunEvioToLcio.java 18 May 2012 08:26:35 -0000 1.13 @@ -48,6 +48,7 @@
options.addOption(new Option("x", true, "The LCSim XML file to process the LCIO events."));
options.addOption(new Option("s", true, "Sleep duration between events (in ms)"));
options.addOption(new Option("e", true, "Stop after N events"));
+ options.addOption(new Option("w", false, "Wait after end of data"));
return options;
}
@@ -223,13 +224,16 @@
reader.close();
}
System.out.println("No more data");
-
- try { //TODO: this is kind of dumb
- Thread.sleep(1000000000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+
+ if (cl.hasOption("w")) {
+ try { //TODO: this is kind of dumb
+ Thread.sleep(1000000000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
+ System.out.println("Exiting");
jobManager.finish();
if (writer != null) {
try {
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