java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots

--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java	2014-05-18 00:57:20 UTC (rev 595)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java	2014-05-18 16:51:29 UTC (rev 596)
@@ -42,7 +42,7 @@

 public class EcalDaqPlots extends Driver implements Resettable {
 
     private String subdetectorName = "Ecal";

-    private String inputCollection = "EcalReadoutHits";

+    private String inputCollection = "EcalCalHits";

     private IPlotter plotter;
     private AIDA aida;
     private Detector detector;

@@ -150,7 +150,7 @@

         }
 
         IPlotterFactory factory= aida.analysisFactory().createPlotterFactory("ECAL DAQ Plots");

-        plotter =factory.create("DAQ Plots");

+        plotter =factory.create("Crates");

         IPlotterStyle pstyle = plotter.style();
         pstyle.dataStyle().fillStyle().setColor("orange");
         pstyle.dataStyle().markerStyle().setColor("orange");

@@ -206,7 +206,7 @@

             	int slotN=channel.getSlot();
             	int channelN=channel.getChannel();
               

-            	System.out.println("found channel at " + column + " " + row + " corresponding to DAQ crate/slot/channel " + crateN + " "+slotN+" "+channelN);

+            //	System.out.println("found channel at " + column + " " + row + " corresponding to DAQ crate/slot/channel " + crateN + " "+slotN+" "+channelN);

                 
             	//Top CRATE
             	if (row>0){

java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots

--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java	2014-05-18 00:57:20 UTC (rev 595)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java	2014-05-18 16:51:29 UTC (rev 596)
@@ -84,11 +84,7 @@

         aida.tree().cd("/");
         IPlotterFactory plotterFactory = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots");
 

-        // Setup the plotter.
-        plotter = plotterFactory.create("Hit Counts");
-        plotter.setTitle("Hit Counts");
-        plotter.style().dataStyle().errorBarStyle().setVisible(false);
-        plotter.style().dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());

+       

         
         // Setup plots.
         hitCountPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Count In Event", 10, -0.5, 9.5);

@@ -112,8 +108,12 @@

+        // Setup the plotter.
+        plotter = plotterFactory.create("Hit Counts");
+        plotter.setTitle("Hit Counts");
+        plotter.style().dataStyle().errorBarStyle().setVisible(false);
+        plotter.style().dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());      

-        

         // Create the plotter regions.
         plotter.createRegions(2,2);
         plotter.region(0).plot(hitNumberPlot);

@@ -154,7 +154,7 @@

         plotter3.region(5).plot(orTrigTimePlot);
         for (int i = 0; i < 6; i++) {
             if (plotter3.region(i).style() != null) {

-                plotter3.region(i).style().yAxisStyle().setParameter("scale", "log");

+               // plotter3.region(i).style().yAxisStyle().setParameter("scale", "log");

             }
         }
         plotter3.region(6).plot(topTimePlot2D);

@@ -164,7 +164,7 @@

             if (plotter3.region(i).style() != null) {
                 plotter3.region(i).style().setParameter("hist2DStyle", "colorMap");
                 plotter3.region(i).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");

-                plotter3.region(i).style().zAxisStyle().setParameter("scale", "log");

+             //   plotter3.region(i).style().zAxisStyle().setParameter("scale", "log");

             }
         }