java/trunk/hps-java/src/main/java/org/lcsim/hps/evio

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/evio/TriggerData.java	2013-11-27 20:50:28 UTC (rev 45)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/evio/TriggerData.java	2013-11-27 21:13:43 UTC (rev 46)
@@ -8,6 +8,7 @@

  * @version $Id: TriggerData.java,v 1.3 2012/08/03 23:14:39 meeg Exp $
  */
 public class TriggerData implements GenericObject {

+

     public static final int OR_TRIG = 3;
     public static final int TOP_TRIG = 4;
     public static final int BOT_TRIG = 5;

@@ -15,7 +16,6 @@

     public static final int TIME = 7;
     public static final int TRIG_BANK_SIZE = 8;
     public static final String TRIG_COLLECTION = "TriggerBank";

-

     private int[] bank;
 
     public TriggerData(int[] bank) {

@@ -41,11 +41,39 @@

     public int getAndTrig() {
         return getIntVal(AND_TRIG);
     }

-    

+

     public int[] getBank() {
         return bank;
     }
 

+    public static int getTime(GenericObject object) {
+        return object.getIntVal(TIME);
+    }
+
+    public static int getOrTrig(GenericObject object) {
+        return object.getIntVal(OR_TRIG);
+    }
+
+    public static int getTopTrig(GenericObject object) {
+        return object.getIntVal(TOP_TRIG);
+    }
+
+    public static int getBotTrig(GenericObject object) {
+        return object.getIntVal(BOT_TRIG);
+    }
+
+    public static int getAndTrig(GenericObject object) {
+        return object.getIntVal(AND_TRIG);
+    }
+
+    public static int[] getBank(GenericObject object) {
+        int[] bank = new int[8];
+        for (int i = 0; i < 8; i++) {
+            bank[i] = object.getIntVal(i);
+        }
+        return bank;
+    }
+

     @Override
     public int getNInt() {
         return TRIG_BANK_SIZE;

java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal/EcalHitPlots.java	2013-11-27 20:50:28 UTC (rev 45)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal/EcalHitPlots.java	2013-11-27 21:13:43 UTC (rev 46)
@@ -3,11 +3,13 @@

 import hep.aida.IHistogram1D;
 import hep.aida.IHistogram2D;
 import hep.aida.IPlotter;

+import hep.aida.IPlotterFactory;

 
 import java.util.List;
 
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.GenericObject;

 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;
 import org.lcsim.hps.monitoring.deprecated.Resettable;

@@ -17,7 +19,7 @@

 
 public class EcalHitPlots extends Driver implements Resettable {
 

-	//AIDAFrame plotterFrame;

+    //AIDAFrame plotterFrame;

     String inputCollection = "EcalCalHits";
     AIDA aida = AIDA.defaultInstance();
     IPlotter plotter, plotter2, plotter3, plotter4;

@@ -49,17 +51,19 @@

     @Override
     protected void detectorChanged(Detector detector) {
 

-    	//plotterFrame = new AIDAFrame();

+        //plotterFrame = new AIDAFrame();

         //plotterFrame.setTitle("HPS ECal Hit Plots");
 

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

         // Setup the plotter.

-        plotter = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Counts");

+        plotter = plotterFactory.create("Hit Counts");

         plotter.setTitle("Hit Counts");
         //plotterFrame.addPlotter(plotter);
         plotter.style().dataStyle().errorBarStyle().setVisible(false);
 
         // 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);
 

@@ -70,7 +74,7 @@

 
 
         // Setup the plotter.

-        plotter2 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Energies");

+        plotter2 = plotterFactory.create("Hit Energies");

         plotter2.setTitle("Hit Energies");
         //plotterFrame.addPlotter(plotter2);
         plotter2.style().dataStyle().errorBarStyle().setVisible(false);

@@ -87,7 +91,7 @@

         plotter2.region(0).plot(hitEnergyPlot);
         plotter2.region(1).plot(hitMaxEnergyPlot);
 

-        plotter3 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Hit Times");

+        plotter3 = plotterFactory.create("Hit Times");

         plotter3.setTitle("Hit Times");
         //plotterFrame.addPlotter(plotter3);
         plotter3.style().dataStyle().errorBarStyle().setVisible(false);

@@ -107,31 +111,28 @@

 
         // Create the plotter regions.
         plotter3.region(0).plot(topTimePlot);

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

         plotter3.region(1).plot(botTimePlot);

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

         plotter3.region(2).plot(orTimePlot);

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

         plotter3.region(3).plot(topTrigTimePlot);

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

         plotter3.region(4).plot(botTrigTimePlot);

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

         plotter3.region(5).plot(orTrigTimePlot);

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

+        for (int i = 0; i < 6; i++) {
+            if (plotter3.region(i).style() != null) {
+                plotter3.region(i).style().yAxisStyle().setParameter("scale", "log");
+            }
+        }

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

-        plotter3.region(6).style().setParameter("hist2DStyle", "colorMap");
-        plotter3.region(6).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
-        plotter3.region(6).style().zAxisStyle().setParameter("scale", "log");

         plotter3.region(7).plot(botTimePlot2D);

-        plotter3.region(7).style().setParameter("hist2DStyle", "colorMap");
-        plotter3.region(7).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
-        plotter3.region(7).style().zAxisStyle().setParameter("scale", "log");

         plotter3.region(8).plot(orTimePlot2D);

-        plotter3.region(8).style().setParameter("hist2DStyle", "colorMap");
-        plotter3.region(8).style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
-        plotter3.region(8).style().zAxisStyle().setParameter("scale", "log");

+        for (int i = 6; i < 9; i++) {
+            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");
+            }
+        }

-        plotter4 = aida.analysisFactory().createPlotterFactory("Ecal Hit Plots").create("Edges");

+        plotter4 = plotterFactory.create("Edges");

         plotter4.setTitle("Edges");
         //plotterFrame.addPlotter(plotter4);
         plotter4.style().setParameter("hist2DStyle", "colorMap");

@@ -151,12 +152,12 @@

         int orTrigTime = -1;
         int topTrigTime = -1;
         int botTrigTime = -1;

-        if (event.hasCollection(TriggerData.class, "TriggerBank")) {
-            List<TriggerData> triggerList = event.get(TriggerData.class, "TriggerBank");

+        if (event.hasCollection(GenericObject.class, "TriggerBank")) {
+            List<GenericObject> triggerList = event.get(GenericObject.class, "TriggerBank");

             if (!triggerList.isEmpty()) {

-                TriggerData triggerData = triggerList.get(0);

+                GenericObject triggerData = triggerList.get(0);

-                int orTrig = triggerData.getOrTrig();

+                int orTrig = TriggerData.getOrTrig(triggerData);

                 if (orTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & orTrig) != 0) {

@@ -166,7 +167,7 @@

                         }
                     }
                 }

-                int topTrig = triggerData.getTopTrig();

+                int topTrig = TriggerData.getTopTrig(triggerData);

                 if (topTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & topTrig) != 0) {

@@ -176,7 +177,7 @@

                         }
                     }
                 }

-                int botTrig = triggerData.getBotTrig();

+                int botTrig = TriggerData.getBotTrig(triggerData);

                 if (botTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & botTrig) != 0) {

java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal/TriggerPlots.java	2013-11-27 20:50:28 UTC (rev 45)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/monitoring/ecal/TriggerPlots.java	2013-11-27 21:13:43 UTC (rev 46)
@@ -8,6 +8,7 @@

 
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.GenericObject;

 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;
 import org.lcsim.hps.monitoring.deprecated.Redrawable;

@@ -51,6 +52,7 @@

         this.clusterEnergyCut = clusterEnergyCut;
     }
 

+    @Override

     protected void detectorChanged(Detector detector) {
 
     	//plotterFrame = new AIDAFrame();

@@ -223,6 +225,7 @@

         //plotterFrame.pack();
     }
 

+    @Override

     public void process(EventHeader event) {
         int orTrig = 0;
         int topTrig = 0;

@@ -231,13 +234,13 @@

         int orTrigTime = -1;
         int topTrigTime = -1;
         int botTrigTime = -1;

-        if (event.hasCollection(TriggerData.class, "TriggerBank")) {
-            List<TriggerData> triggerList = event.get(TriggerData.class, "TriggerBank");

+        if (event.hasCollection(GenericObject.class, "TriggerBank")) {
+            List<GenericObject> triggerList = event.get(GenericObject.class, "TriggerBank");

             if (!triggerList.isEmpty()) {

-                TriggerData triggerData = triggerList.get(0);

+                GenericObject triggerData = triggerList.get(0);

-                pairTrig = triggerData.getAndTrig();
-                orTrig = triggerData.getOrTrig();

+                pairTrig = TriggerData.getAndTrig(triggerData);
+                orTrig = TriggerData.getOrTrig(triggerData);

                 if (orTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & orTrig) != 0) {

@@ -247,7 +250,7 @@

                         }
                     }
                 }

-                topTrig = triggerData.getTopTrig();

+                topTrig = TriggerData.getTopTrig(triggerData);

                 if (topTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & topTrig) != 0) {

@@ -257,7 +260,7 @@

                         }
                     }
                 }

-                botTrig = triggerData.getBotTrig();

+                botTrig = TriggerData.getBotTrig(triggerData);

                 if (botTrig != 0) {
                     for (int i = 0; i < 32; i++) {
                         if ((1 << (31 - i) & botTrig) != 0) {

@@ -514,9 +517,11 @@

         }
     }
 

+    @Override

     public void reset() {
     }
 

+    @Override

     public void endOfData() {
         redraw();
         System.out.format("Top trigger bit: \t");

java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring

--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring/ECalMonitoring.lcsim	2013-11-27 20:50:28 UTC (rev 45)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring/ECalMonitoring.lcsim	2013-11-27 21:13:43 UTC (rev 46)
@@ -60,11 +60,11 @@

             <ecalCollectionName>EcalCalHits</ecalCollectionName>
         </driver>
         <driver name="EcalHitPlots" type="org.lcsim.hps.monitoring.ecal.EcalHitPlots">

-            <maxE>2000</maxE>

+            <maxE>2.0</maxE>

             <logScale>true</logScale>
         </driver>
         <driver name="EcalClusterPlots" type="org.lcsim.hps.monitoring.ecal.EcalClusterPlots">

-            <maxE>2000</maxE>

+            <maxE>2.0</maxE>

             <logScale>false</logScale>
         </driver>
         <driver name="EcalEvsX" type="org.lcsim.hps.monitoring.ecal.EcalEvsX">

@@ -74,8 +74,8 @@

         <driver name="TriggerPlots" type="org.lcsim.hps.monitoring.ecal.TriggerPlots">
             <clusterEnergyCut>0.500</clusterEnergyCut>
         </driver>

-<!--        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">

+        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">

             <outputFileName>triggerEPlots</outputFileName>

-        </driver>-->

+        </driver>

     </drivers>
 </lcsim>

java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring

--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring/ECalTriggerMonitoring.lcsim	2013-11-27 20:50:28 UTC (rev 45)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/monitoring/ECalTriggerMonitoring.lcsim	2013-11-27 21:13:43 UTC (rev 46)
@@ -73,8 +73,8 @@

             <clusterEnergyCut>1280</clusterEnergyCut>
             <eventRefreshRate>10000</eventRefreshRate>
         </driver>

-<!--        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">

+        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">

             <outputFileName>triggerPlots</outputFileName>

-        </driver>-->

+        </driver>

     </drivers>
 </lcsim>