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

--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java	2014-05-01 19:29:05 UTC (rev 540)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java	2014-05-01 19:42:50 UTC (rev 541)
@@ -96,9 +96,9 @@

        for(int ii = 0; ii < (47*11); ii = ii +1){
              int row=EcalMonitoringUtils.getRowFromHistoID(ii);
              int column=EcalMonitoringUtils.getColumnFromHistoID(ii);      

-             channelEnergyPlot.add(aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Energy : " + (row) + " "+ (column)+ ": "+ii, 100, -0.1, maxEch));  

+             channelEnergyPlot.add(aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Energy : " + (row) + " "+ (column)+ ": "+ii, 100, 0, maxEch));  

              channelTimePlot.add(aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time : " + (row) + " "+ (column)+ ": "+ii, 100, 0, 400));     

-             channelTimeVsEnergyPlot.add(aida.histogram2D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time Vs Energy : " + (row) + " "+ (column)+ ": "+ii, 100, 0, 400,100, -0.1, maxEch));              

+             channelTimeVsEnergyPlot.add(aida.histogram2D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time Vs Energy : " + (row) + " "+ (column)+ ": "+ii, 100, 0, 400,100, 0, maxEch));              

        }
        id=0;
        iy=EcalMonitoringUtils.getRowFromHistoID(id);

@@ -110,7 +110,7 @@

     	hEnergyDraw=aida.histogram1D("Energy",channelEnergyPlot.get(0).axis().bins(), channelEnergyPlot.get(0).axis().lowerEdge(),channelEnergyPlot.get(0).axis().upperEdge());
     	hTimeDraw=aida.histogram1D("Time", channelTimePlot.get(0).axis().bins(),channelTimePlot.get(0).axis().lowerEdge(),channelTimePlot.get(0).axis().upperEdge());
     	hTimeVsEnergyDraw=aida.histogram2D("Hit Time Vs Energy" ,channelTimeVsEnergyPlot.get(0).xAxis().bins(),channelTimeVsEnergyPlot.get(0).xAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).xAxis().upperEdge(),channelTimeVsEnergyPlot.get(0).yAxis().bins(),channelTimeVsEnergyPlot.get(0).yAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).yAxis().upperEdge());

-    	//hTimeVsEnergyDraw=aida.histogram2D("Time Vs Energy",100,0,400,100,-0.1,maxEch);

+    	

@@ -120,6 +120,8 @@

        
         plotter = plotterFactory.create("Single hits");
         plotter.setTitle("");

+        plotter.style().setParameter("hist2DStyle", "colorMap");
+        plotter.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");

         plotter.style().dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());
         plotter.style().dataStyle().errorBarStyle().setVisible(false);
         plotter.createRegions(2,2);

@@ -280,7 +282,7 @@

     	iy=(int) ecalPoint.getY(); //raw
     	id=EcalMonitoringUtils.getHistoIDFromRowColumn(iy,ix);
     	System.out.println("Crystal event: "+ix+" "+iy+" "+id);

-    	

+    	System.out.println("BINS "+hTimeVsEnergyDraw.yAxis().bins());

         //  plotter.hide();
     	//get the new histograms
     

@@ -298,9 +300,12 @@

        	
      	
        	hTimeVsEnergyDraw.reset();

-        plotter.region(2).setTitle(channelTimeVsEnergyPlot.get(id).title());

+        
+       	plotter.region(2).setTitle(channelTimeVsEnergyPlot.get(id).title());

        	hTimeVsEnergyDraw.setTitle(channelTimeVsEnergyPlot.get(id).title());
        	hTimeVsEnergyDraw.add(channelTimeVsEnergyPlot.get(id));

-	}    

+
+       	
+    }    

 }
 

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-01 19:29:05 UTC (rev 540)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java	2014-05-01 19:42:50 UTC (rev 541)
@@ -88,7 +88,8 @@

         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);
         hitTimePlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Hit Time", 100, 0 * 4.0, 100 * 4.0);

@@ -121,6 +122,7 @@

         IPlotterStyle style = plotter.region(2).style();
         style.setParameter("hist2DStyle", "colorMap");
         style.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");

+        style.dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());

         style.zAxisStyle().setParameter("scale", "log");
         plotter.region(2).plot(occupancyPlot);
         

@@ -128,7 +130,7 @@

         plotter2 = plotterFactory.create("Hit Energies");
         plotter2.setTitle("Hit Energies");
         plotter2.style().dataStyle().errorBarStyle().setVisible(false);

-

+        plotter2.style().dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());

         
         if (logScale) {
             plotter2.style().yAxisStyle().setParameter("scale", "log");

@@ -142,6 +144,7 @@

         plotter3 = plotterFactory.create("Hit Times");
         plotter3.setTitle("Hit Times");
         plotter3.style().dataStyle().errorBarStyle().setVisible(false);

+        plotter3.style().dataStyle().fillStyle().setParameter("showZeroHeightBins",Boolean.FALSE.toString());

         plotter3.createRegions(3, 3);      
         plotter3.region(0).plot(topTimePlot);
         plotter3.region(1).plot(botTimePlot);