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

SensorOccupancyPlotsDriver.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- SensorOccupancyPlotsDriver.java	23 Mar 2012 23:47:05 -0000	1.2
+++ SensorOccupancyPlotsDriver.java	25 Mar 2012 07:23:20 -0000	1.3
@@ -12,6 +12,7 @@

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;

+import org.lcsim.detector.identifier.*;

 import org.lcsim.geometry.Detector;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

@@ -27,10 +28,16 @@

     private String trackerName = "Tracker";
     private int eventCount = 0;
     private int eventRefreshRate = 1;

+    private boolean debug = true;
+    Map<SiSensor,Integer> sensorRegionMap;

     
     public SensorOccupancyPlotsDriver()
     {}

+    public void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+

     public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
         this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
     }

@@ -38,7 +45,23 @@

     public void setEventRefreshRate(int eventRefreshRate) {
         this.eventRefreshRate = eventRefreshRate;
     }

+    /*
+    private int computeRegion(SiSensor sensor, IIdentifierHelper helper) {
+        IIdentifier id = sensor.getIdentifier();
+        int layer = sensor.getIdentifierHelper().getValue(id, "layer"); // 1-10; axial layers are odd layers; stereo layers are even
+        int module = sensor.getIdentifierHelper().getValue(id, "module"); // 0-1; module number is top or bottom
+        int ix = (layer - 1) / 2;
+        int iy = 0;
+        if (module > 0) {
+            iy += 2;
+        }
+        if (layer % 2 == 0) {
+            iy += 1;
+        }
+        int region = iy * 4 + ix;
+        return region;
+    }
+    */

     protected void detectorChanged(Detector detector) {
         
         // If called > 1 then destroy plots that might be currently up.

@@ -63,46 +86,65 @@

         
         // Make a list of SiSensors in the SVT.
         sensors = this.detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);

         // For now throw an error if there are "too many" sensors.
         if (sensors.size() > 20) {
             throw new RuntimeException("Can't handle > 20 sensors at a time.");
         }

-        
-        // Reset or setup the data structure for occupancy calculations by sensor.

+
+        // Map a map of sensors to their region numbers in the plotter.
+        IIdentifierHelper helper = sensors.get(0).getIdentifierHelper();
+        sensorRegionMap = new HashMap<SiSensor,Integer>();
+        for (SiSensor sensor : sensors) {
+            
+            IIdentifier id = sensor.getIdentifier();
+            
+            int layer = helper.getValue(id, "layer"); // 1-10; axial layers are odd layers; stereo layers are even
+            int module = helper.getValue(id, "module"); // 0-1; module number is top or bottom
+            
+            int ix = (layer - 1) / 2;
+            int iy = 0;
+            if (module > 0) {
+                iy += 2;
+            }
+            if (layer % 2 == 0) {
+                iy += 1;
+            }
+            int region = ix * 4 + iy;
+
+            System.out.println(sensor.getName() + "; lyr=" + layer + "; mod=" + module + " -> xy[" + ix + "][" + iy + "] -> reg="+region);
+            sensorRegionMap.put(sensor,region);
+        }
+

         resetOccupancyMap();
 
         // Setup the occupancy plots.

-        int region = 0;

         aida.tree().cd("/");
         for (SiSensor sensor : sensors) {
             IHistogram1D occupancyPlot = aida.histogram1D(sensor.getName(), 640, 0, 639);

-            occuPlotter.region(region).plot(occupancyPlot);
-            ++region;

+            occuPlotter.region(sensorRegionMap.get(sensor)).plot(occupancyPlot);

         }
         occuPlotter.show();
     }
             
     public void process(EventHeader event) {

+        if (debug)
+            System.out.println("SensorOccupancyPlots.process");
+

         // Increment event counter.
         ++eventCount;
 
         // Get RawTrackerHit collection from event.
         List<RawTrackerHit> rawTrackerHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);

-        // Loop over RawTrackerHit collection and increment occupancies.

+        // Increment hit count of each strip.

         for (RawTrackerHit hit : rawTrackerHits) {

-            // Increment hit counts for each strip.

             int[] strips = occupancyMap.get((SiSensor) hit.getDetectorElement());
             strips[hit.getIdentifierFieldValue("strip")] += 1;
         }
         
         if (eventCount % this.eventRefreshRate == 0) {

-
-            // Occupancy plots are redrawn each time.
-            occuPlotter.clearRegions();
-            int region = 0;

             for (SiSensor sensor : sensors) {
                 IHistogram1D sensorHist = aida.histogram1D(sensor.getName());
                 sensorHist.reset();

@@ -113,15 +155,12 @@

                         sensorHist.fill(i, stripOccupancy);
                     }
                 }

-                occuPlotter.region(region).plot(aida.histogram1D(sensor.getName()));
-                ++region;

-            occuPlotter.show();

+            //occuPlotter.show();

         }
     }    
     
     private void resetOccupancyMap() {

-        // Data structure for occupancy calculations by sensor.

         occupancyMap = new HashMap<SiSensor,int[]>();
         for (SiSensor sensor : sensors) {
             occupancyMap.put(sensor, new int[640]);

+ + c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 3; + c.anchor = GridBagConstraints.WEST; + JLabel refreshLabel = new JLabel("Event Refresh:"); + refreshLabel.setHorizontalAlignment(JLabel.LEFT); + fieldsPanel.add(refreshLabel, c); + + c = new GridBagConstraints(); + c.gridx = 1; + c.gridy = 3; + c.anchor = GridBagConstraints.EAST; + refreshField = new JTextField(Integer.toString(eventRefresh), 4); + refreshField.setHorizontalAlignment(JTextField.RIGHT); + + fieldsPanel.add(refreshField, c); +

+ public int getEventCount() { + return eventCount; + } + + public int getEventRefresh() { + return Integer.parseInt(refreshField.getText()); + } + + public void updateEventCount() { + ++eventCount; + if (updateEvent()) { + eventCounterField.setText(Integer.toString(eventCount)); + }

- public void updateAverageEventRate() { - double avgProcTime = (System.currentTimeMillis() - jobStartTime) / Double.parseDouble(eventCounterField.getText()); - double avgEventRate = 1000 / avgProcTime; - avgEventRateField.setText(rateFormat.format(avgEventRate));

+ public void updateAverageEventRate() { + if (updateEvent()) { + double jobTime = System.currentTimeMillis() - jobStartTime; + if (jobTime > 0) { + double avgProcTime = jobTime / eventCount; + double avgEventRate = 10e3 / avgProcTime; + avgEventRateField.setText(rateFormat.format(avgEventRate)); + } + } + } +

Commit in `hps-java/src/main` on MAIN
`java/org/lcsim/hps/monitoring/SensorOccupancyPlotsDriver.java`	+56	-17	1.2 -> 1.3
`/MonitoringConsumer.java`	+50	-27	1.1 -> 1.2
`/MonitoringGui.java`	+60	-15	1.1 -> 1.2
`resources/org/lcsim/hps/steering/EtSensorOccupancy.lcsim`	+8	-10	1.1 -> 1.2
	+174	-69