Author: [log in to unmask] Date: Fri May 15 22:50:28 2015 New Revision: 2985 Log: fix bugs in previous commit Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java java/trunk/monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java java/trunk/users/src/main/java/org/hps/users/meeg/SVTSmallHitsDriver.java Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java ============================================================================= --- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java (original) +++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java Fri May 15 22:50:28 2015 @@ -93,7 +93,7 @@ private int maxSampleMonitorPeriod = 100; SystemStatus occupancyStatus; - private int occupancyMonitorStart = 5000; + private int occupancyMonitorStart = 2500; private int occupancyMonitorPeriod = 100; private double minPeakOccupancy = 0.0001; private double maxPeakOccupancy = 0.01; @@ -456,7 +456,7 @@ // Get RawTrackerHit collection from event. List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName); - if (SvtPlotUtils.countSmallHits(rawHits) > 3) { + if (dropSmallHitEvents && SvtPlotUtils.countSmallHits(rawHits) > 3) { return; } @@ -628,7 +628,7 @@ if (apvOccupancy[i] < 0.1 * peakOccupancy || apvOccupancy[i] < minPeakOccupancy) { continue; //skip through the tail end of the sensor } - if (0.9 * apvOccupancy[i] > apvOccupancy[i - 1]) { + if (apvOccupancy[i] > apvOccupancy[i - 1]) { System.out.println("occupancy not monotonic"); return false; } @@ -638,7 +638,7 @@ if (apvOccupancy[i] < 0.1 * peakOccupancy || apvOccupancy[i] < minPeakOccupancy) { continue; //skip through the tail end of the sensor } - if (0.9 * apvOccupancy[i] > apvOccupancy[i + 1]) { + if (apvOccupancy[i] > apvOccupancy[i + 1]) { System.out.println("occupancy not monotonic"); return false; } Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java ============================================================================= --- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java (original) +++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java Fri May 15 22:50:28 2015 @@ -297,7 +297,7 @@ // Get RawTrackerHit collection from event. List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "SVTRawTrackerHits"); - if (SvtPlotUtils.countSmallHits(rawHits) > 3) { + if (dropSmallHitEvents && SvtPlotUtils.countSmallHits(rawHits) > 3) { return; } } Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java ============================================================================= --- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java (original) +++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java Fri May 15 22:50:28 2015 @@ -233,7 +233,7 @@ // Get RawTrackerHit collection from event. List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName); - if (SvtPlotUtils.countSmallHits(rawHits) > 3) { + if (dropSmallHitEvents && SvtPlotUtils.countSmallHits(rawHits) > 3) { return; } Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java ============================================================================= --- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java (original) +++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java Fri May 15 22:50:28 2015 @@ -27,7 +27,7 @@ /** * This is a class for exporting plot graphics to PDF. - * + * * @author Jeremy McCormick <[log in to unmask]> */ public final class ExportPdf { @@ -45,11 +45,13 @@ /** * Save a set of tabs containing plots to a file. - * - * @param plotTabs the top level tab component (plots are actually in a set of tabs without these tabs) + * + * @param plotTabs the top level tab component (plots are actually in a set + * of tabs without these tabs) * @param fileName the file name * @param runData the list of run data to save on the cover page - * @throws IOException if there is a problem with the IO (e.g. writing to PDF file) + * @throws IOException if there is a problem with the IO (e.g. writing to + * PDF file) */ public static void write(List<IPlotter> plotters, String fileName, List<String> runData) throws IOException { @@ -68,7 +70,7 @@ // Create 1st page with run summary data. try { - writeRunData(document, runData); + writeRunData(document, runData); } catch (DocumentException e) { throw new IOException(e); } @@ -87,15 +89,15 @@ /** * Write a plotter's graphics into a single PDF page. - * + * * @param document the output PDF document * @param writer the PDF writer * @param image the buffered bitmap image * @throws IOException if there is a problem writing to the PDF document */ static void writePage(Document document, PdfWriter writer, IPlotter plotter) throws IOException { - - Image image = ((Plotter)plotter).getImage(); + + Image image = ((Plotter) plotter).getImage(); String title = plotter.title(); // Add header label. @@ -114,7 +116,7 @@ } catch (BadElementException e) { throw new IOException(e); } - iTextImage.scaleToFit(document.getPageSize()); + iTextImage.scaleAbsolute(document.getPageSize().getWidth(), (float) 0.75 * document.getPageSize().getHeight()); iTextImage.setAlignment(Element.ALIGN_CENTER); try { document.add(iTextImage); @@ -125,7 +127,7 @@ /** * Get a buffered image from a Swing component. - * + * * @param component the Swing component * @return the image from painting the component onto a buffered image */ @@ -137,7 +139,7 @@ /** * Add a page with the run summary data. - * + * * @param runData the list of run summary information */ static void writeRunData(Document document, List<String> runData) throws DocumentException { Modified: java/trunk/users/src/main/java/org/hps/users/meeg/SVTSmallHitsDriver.java ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/meeg/SVTSmallHitsDriver.java (original) +++ java/trunk/users/src/main/java/org/hps/users/meeg/SVTSmallHitsDriver.java Fri May 15 22:50:28 2015 @@ -68,7 +68,7 @@ smallHitCounts.put(sensor.getName(), count + 1); } } - if (smallHitCount > 5) { + if (smallHitCount > 3) { dtSumWith += event.getTimeStamp() - previousTimestamp; nHitsWith += smallHitCount; nWith++;