Print

---

Author: mgraham
Date: Mon Nov 10 07:35:46 2014
New Revision: 1470

Log:
Fix these two classes to outputPlotDir for png files 

Modified:
    java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java
    java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java

Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java
 =============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java	(original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java	Mon Nov 10 07:35:46 2014
@@ -208,9 +208,8 @@
             int[] strips = occupancyMap.get(sensor.getName());
             for (int i = 0; i < strips.length; i++) {
                 double stripOccupancy = (double) strips[i] / (double) (eventCountRaw);
-                if (stripOccupancy != 0) {
+                if (stripOccupancy != 0)
                     sensorHist.fill(i, stripOccupancy);
-                }
                 avg += stripOccupancy;
             }
             //do the end-of-run quantities here too since we've already done the loop.  
@@ -240,7 +239,7 @@
         for (HpsSiSensor sensor : sensors) {
             IHistogram1D sensPlot = getSensorPlot(plotDir + "t0Hit_", sensor);
             IFitResult result = fitGaussian(sensPlot, fitter, "range=\"(-8.0,8.0)\"");
-            
+
             boolean isTop = sensor.isTopLayer();
             if (isTop) {
                 plotterTop.region(irTop).plot(sensPlot);
@@ -254,15 +253,17 @@
             avgt0Map.put(sensor.getName(), result.fittedParameters()[1]);
             sigt0Map.put(sensor.getName(), result.fittedParameters()[2]);
         }
-        try {
-            plotterTop.writeToFile("t0TopPlots.png");
-        } catch (IOException ex) {
-            Logger.getLogger(SvtMonitoring.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        try {
-            plotterBottom.writeToFile("t0BottomPlots.png");
-        } catch (IOException ex) {
-            Logger.getLogger(SvtMonitoring.class.getName()).log(Level.SEVERE, null, ex);
+        if (outputPlots) {
+            try {
+                plotterTop.writeToFile(outputPlotDir + "t0TopPlots.png");
+            } catch (IOException ex) {
+                Logger.getLogger(SvtMonitoring.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            try {
+                plotterBottom.writeToFile(outputPlotDir + "t0BottomPlots.png");
+            } catch (IOException ex) {
+                Logger.getLogger(SvtMonitoring.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
     }
 

Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java
 =============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java	(original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java	Mon Nov 10 07:35:46 2014
@@ -156,10 +156,12 @@
         plotter.region(1).plot(resVy.fittedFunction());
         plotter.region(2).plot(bsconVz);
         plotter.region(2).plot(resVz.fittedFunction());
+        if(outputPlots){
         try {
-            plotter.writeToFile("vertex.png");
+            plotter.writeToFile(outputPlotDir +"vertex.png");
         } catch (IOException ex) {
             Logger.getLogger(V0Monitoring.class.getName()).log(Level.SEVERE, null, ex);
+        }
         }
 
         monitoredQuantityMap.put(fpQuantNames[0], (double) nTotV0 / nRecoEvents);