LISTSERV 16.5 - LCD-CVS Archives

+ try { + evioEvent = reader.parseNextEvent(); + } catch (NullPointerException e) { + e.printStackTrace(); + } + } while (evioEvent == null || !eventBuilder.isPhysicsEvent(evioEvent)); + + // Create LCSim event from EVIO data.

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

TestRunTriggeredReconToEvio.java 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- TestRunTriggeredReconToEvio.java	26 Apr 2012 21:16:50 -0000	1.7
+++ TestRunTriggeredReconToEvio.java	27 Apr 2012 22:13:53 -0000	1.8
@@ -6,20 +6,16 @@

 
 import java.util.List;
 import java.util.Queue;

-import org.jlab.coda.jevio.DataType;
-import org.jlab.coda.jevio.EventBuilder;
-import org.jlab.coda.jevio.EventWriter;
-import org.jlab.coda.jevio.EvioException;

+import org.jlab.coda.jevio.*;

 import org.lcsim.event.EventHeader;
 import org.lcsim.hps.recon.ecal.HPSEcalDaqIDConverter;
 import org.lcsim.util.Driver;
 
 /**

- * This class takes raw data generated from MC and converts
- * it to EVIO.  The goal is to make this look like data
- * which will come off the actual ET ring during the 
- * test run.
- *

+ * This class takes raw data generated from MC and converts it to EVIO. The goal
+ * is to make this look like data which will come off the actual ET ring during
+ * the test run.
+ *

  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class TestRunTriggeredReconToEvio extends Driver {

@@ -103,7 +99,7 @@

 	protected void process(EventHeader event) {
 		if (triggerBit) {
 			// Make a new EVIO event.

-			EventBuilder builder = new EventBuilder(EventConstants.PHYSICS_EVENT_TAG, DataType.BANK, event.getEventNumber());

+			EventBuilder builder = new EventBuilder(EventConstants.PHYSICS_EVENT_TAG, DataType.BANK, EventConstants.EVENT_BANK_NUM);

 			builderQueue.add(new QueuedEtEvent(builder, writers.size()));
 			triggerBit = false;
 		}

@@ -138,6 +134,19 @@

 	}
 
 	private void writeEvioEvent(EventBuilder builder) {

+		EvioBank eventIDBank = new EvioBank(EventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
+		int[] eventID = new int[3];
+		eventID[0] = eventsWritten;
+		eventID[1] = 0; //trigger type
+		eventID[2] = 0; //status
+
+		try {
+			eventIDBank.appendIntData(eventID);
+			builder.addChild(builder.getEvent(), eventIDBank);
+		} catch (EvioException e) {
+			throw new RuntimeException(e);
+		}
+

 		builder.setAllHeaderLengths();
 		System.out.printf("Writing event with %d bytes\n", builder.getEvent().getTotalBytes());
 		try {

hps-java/src/main/java/org/lcsim/hps/recon/tracking

HPSSVTDataBuffer.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- HPSSVTDataBuffer.java	25 Apr 2012 05:11:37 -0000	1.4
+++ HPSSVTDataBuffer.java	27 Apr 2012 22:13:53 -0000	1.5
@@ -13,7 +13,7 @@

 /**
  *
  * @author Omar Moreno <[log in to unmask]>

- * @version $Id: HPSSVTDataBuffer.java,v 1.4 2012/04/25 05:11:37 omoreno Exp $

+ * @version $Id: HPSSVTDataBuffer.java,v 1.5 2012/04/27 22:13:53 meeg Exp $

  */
 public class HPSSVTDataBuffer {

@@ -23,7 +23,7 @@

     // Singleton
     private static final HPSSVTDataBuffer instance = new HPSSVTDataBuffer();

-    int[] header = new int[6];

+    int[] header = new int[7];

     int temp = 23; // C
     int nErrors = 0;

@@ -90,27 +90,28 @@

     	
     	// If the FPGA data block is empty, add the header information
     	if(instance.fpgaToData.get(fpga).isEmpty()){

+		header[0] = 0; //TODO: figure out what this is actually supposed to be - probably event number

     	
     		// Insert the temperature information. All temperatures are currently
     		// set to 23 C

-    		header[0] = (header[0] &= ~TEMP_MASK) | (temp & TEMP_MASK);
-    		header[0] = (header[0] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);
-

     		header[1] = (header[1] &= ~TEMP_MASK) | (temp & TEMP_MASK);
     		header[1] = (header[1] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);
         
     		header[2] = (header[2] &= ~TEMP_MASK) | (temp & TEMP_MASK);
     		header[2] = (header[2] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);

     		header[3] = (header[3] &= ~TEMP_MASK) | (temp & TEMP_MASK);
     		header[3] = (header[3] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);

     		header[4] = (header[4] &= ~TEMP_MASK) | (temp & TEMP_MASK);
     		header[4] = (header[4] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);

     		header[5] = (header[5] &= ~TEMP_MASK) | (temp & TEMP_MASK);
     		header[5] = (header[5] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);

+    		header[6] = (header[6] &= ~TEMP_MASK) | (temp & TEMP_MASK);
+    		header[6] = (header[6] &= ~(TEMP_MASK << 16)) | ((temp & TEMP_MASK) << 16);
+

     		for(int index = 0; index < header.length; index++) fpgaToData.get(fpga).add(header[index]);
     	
     	}

import org.lcsim.geometry.Detector; import org.lcsim.geometry.IDDecoder; import org.lcsim.util.Driver; import org.lcsim.util.aida.AIDA; public class EcalMonitoringPlots extends Driver implements Resettable {

- aida.tree().cd("/"); - hitCountPlot = aida.histogram2D(detector.getDetectorName() + " : " + rawCalorimeterHitCollectionName + " : Hit Count", 47, -23.5, 23.5, 11, -5.5, 5.5); - - // Create the plotter regions. - plotter.createRegion(); - plotter.style().statisticsBoxStyle().setVisible(false); - IPlotterStyle style = plotter.region(0).style(); - style.setParameter("hist2DStyle","colorMap"); - style.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow"); - plotter.region(0).plot(hitCountPlot); - ((PlotterRegion)plotter.region(0)).getPlot().setAllowUserInteraction(false); - ((PlotterRegion)plotter.region(0)).getPlot().setAllowPopupMenus(false); - plotter.show(); - } -

+ aida.tree().cd("/"); + hitCountPlot = aida.histogram2D(detector.getDetectorName() + " : " + rawCalorimeterHitCollectionName + " : Hit Count", 47, -23.5, 23.5, 11, -5.5, 5.5); + + // Create the plotter regions. + plotter.createRegion(); + plotter.style().statisticsBoxStyle().setVisible(false); + IPlotterStyle style = plotter.region(0).style(); + style.setParameter("hist2DStyle", "colorMap"); + style.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow"); + plotter.region(0).plot(hitCountPlot); + ((PlotterRegion) plotter.region(0)).getPlot().setAllowUserInteraction(false); + ((PlotterRegion) plotter.region(0)).getPlot().setAllowPopupMenus(false); + plotter.show(); + } +

- List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName); - for (RawCalorimeterHit hit : hits) { - dec.setID(hit.getCellID()); - hitCountPlot.fill(dec.getValue("ix"), dec.getValue("iy")); - } - ++eventn; - } - - public void endOfData() { - if (plotter != null) { - plotter.hide(); - plotter.destroyRegions(); - } - if (hitCountPlot != null) - hitCountPlot.reset(); - } - - public void reset() { - plotter.hide(); - hitCountPlot.reset(); - detectorChanged(detector); - }

+ if (event.hasCollection(RawCalorimeterHit.class, rawCalorimeterHitCollectionName)) { + List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName); + for (RawCalorimeterHit hit : hits) { + dec.setID(hit.getCellID()); + hitCountPlot.fill(dec.getValue("ix"), dec.getValue("iy")); + } + ++eventn; + } + if (event.hasCollection(RawTrackerHit.class, rawCalorimeterHitCollectionName)) { + List<RawTrackerHit> hits = event.get(RawTrackerHit.class, rawCalorimeterHitCollectionName); + for (RawTrackerHit hit : hits) { + dec.setID(hit.getCellID()); + hitCountPlot.fill(dec.getValue("ix"), dec.getValue("iy")); + } + ++eventn; + } + } + + public void endOfData() { + if (plotter != null) { + plotter.hide(); + plotter.destroyRegions(); + } + if (hitCountPlot != null) { + hitCountPlot.reset(); + } + } + + public void reset() { + plotter.hide(); + hitCountPlot.reset(); + detectorChanged(detector); + }

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

SensorOccupancyPlotsDriver.java 1.12 -> 1.13

diff -u -r1.12 -r1.13
--- SensorOccupancyPlotsDriver.java	13 Apr 2012 00:06:55 -0000	1.12
+++ SensorOccupancyPlotsDriver.java	27 Apr 2012 22:13:53 -0000	1.13
@@ -21,156 +21,158 @@

 import org.lcsim.util.aida.AIDA;
 
 /**

- * This Driver makes plots of sensor occupancies across a run.  It is intended to be
- * used with the monitoring system.  It will currently only run on a test run detector,
- * as the number of sensors, and hence plotter regions, is hardcoded to 20.
- *

+ * This Driver makes plots of sensor occupancies across a run. It is intended to
+ * be used with the monitoring system. It will currently only run on a test run
+ * detector, as the number of sensors, and hence plotter regions, is hardcoded
+ * to 20.
+ *

  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: SensorOccupancyPlotsDriver.java,v 1.12 2012/04/13 00:06:55 jeremy Exp $

+ * @version $Id: SensorOccupancyPlotsDriver.java,v 1.12 2012/04/13 00:06:55
+ * jeremy Exp $

  *
  */
 public class SensorOccupancyPlotsDriver extends Driver implements Resettable {

-    private String rawTrackerHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
-    private String trackerName = "Tracker";
-    
-    private AIDA aida = AIDA.defaultInstance();
-    private IPlotter plotter;  
-    
-    private Detector detector;
-    private List<SiSensor> sensors;
-    private Map<SiSensor,int[]> occupancyMap;
-    private Map<SiSensor,Integer> sensorRegionMap;
-    
-    private int eventCount = 0;
-    private int eventRefreshRate = 1000;
-    
-    public SensorOccupancyPlotsDriver()
-    {}
-    
-    public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
-        this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
-    }
-    
-    public void setEventRefreshRate(int eventRefreshRate) {
-        this.eventRefreshRate = eventRefreshRate;
-    }
-    
-    private int computePlotterRegion(SiSensor sensor) {
-    	
-    	IIdentifierHelper helper = sensor.getIdentifierHelper();
-    	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
-        
-        // Compute the sensor's x and y grid coordinates and then translate to region number.
-        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);
-        return region;
-    }
-        
-    protected void detectorChanged(Detector detector) {
-               
-        // Setup the plotter.
-        IAnalysisFactory fac = aida.analysisFactory();
-        plotter = fac.createPlotterFactory().create(detector.getDetectorName() + " : HPS SVT Sensor Occupancy Plots");
-        IPlotterStyle pstyle = plotter.style();
-        pstyle.dataStyle().fillStyle().setColor("green");
-        pstyle.dataStyle().markerStyle().setColor("green");
-        pstyle.dataStyle().errorBarStyle().setVisible(false);
-        pstyle.statisticsBoxStyle().setVisible(false);            
-        
-        // Create regions.
-        plotter.createRegions(5, 4); 
-        
-        // Cache Detector object.
-        this.detector = detector;
-        
-        // Make a list of SiSensors in the SVT.
-        sensors = this.detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
-        
-        // Reset the data structure that keeps track of strip occupancies.
-        resetOccupancyMap();
-       
-        // 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.");
-        }
-
-        // Map a map of sensors to their region numbers in the plotter.
-        sensorRegionMap = new HashMap<SiSensor,Integer>();
-        for (SiSensor sensor : sensors) {                      
-            int region = computePlotterRegion(sensor);
-            sensorRegionMap.put(sensor,region);
-        }
-
-        // Setup the occupancy plots.
-        aida.tree().cd("/");
-        for (SiSensor sensor : sensors) {
-            IHistogram1D occupancyPlot = aida.histogram1D(sensor.getName(), 640, 0, 639);
-            occupancyPlot.reset();
-            int region = sensorRegionMap.get(sensor);
-            plotter.region(region).plot(occupancyPlot);
-            JASHist hist = ((PlotterRegion)plotter.region(region)).getPlot();
-            hist.setAllowUserInteraction(false);
-            hist.setAllowPopupMenus(false);
-        }
-        plotter.show();                
-    }
-            
-    public void process(EventHeader event) {
-            	    
-        // Get RawTrackerHit collection from event.
-        List<RawTrackerHit> rawTrackerHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);        
-        
-        // Increment strip hit count.
-        for (RawTrackerHit hit : rawTrackerHits) {
-            int[] strips = occupancyMap.get((SiSensor) hit.getDetectorElement());
-            strips[hit.getIdentifierFieldValue("strip")] += 1;
-        }
-        
-        // Plot strip occupancies.
-        if (eventCount % eventRefreshRate == 0) {
-            for (SiSensor sensor : sensors) {
-                IHistogram1D sensorHist = aida.histogram1D(sensor.getName());
-                sensorHist.reset();
-                int[] strips = occupancyMap.get(sensor);
-                for (int i = 0; i < strips.length; i++) {
-                    double stripOccupancy = (double) strips[i] / (double) (eventCount);
-                    if (stripOccupancy != 0) {
-                        sensorHist.fill(i, stripOccupancy);
-                    }
-                }
-            }
-        }
-        
-        // Increment event counter.
-        ++eventCount;
-    }    
-    
-    private void resetOccupancyMap() {
-        occupancyMap = new HashMap<SiSensor,int[]>();
-        for (SiSensor sensor : sensors) {
-            occupancyMap.put(sensor, new int[640]);
-        }
-    }
-
-    public void endOfData() {
-        if (plotter != null)
-            plotter.hide();
-    }
-    
-    public void reset() {
-        eventCount = 0;
-        resetOccupancyMap();
-    }

+	private String rawTrackerHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
+	private String trackerName = "Tracker";
+	private AIDA aida = AIDA.defaultInstance();
+	private IPlotter plotter;
+	private Detector detector;
+	private List<SiSensor> sensors;
+	private Map<SiSensor, int[]> occupancyMap;
+	private Map<SiSensor, Integer> sensorRegionMap;
+	private int eventCount = 0;
+	private int eventRefreshRate = 1000;
+
+	public SensorOccupancyPlotsDriver() {
+	}
+
+	public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
+		this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
+	}
+
+	public void setEventRefreshRate(int eventRefreshRate) {
+		this.eventRefreshRate = eventRefreshRate;
+	}
+
+	private int computePlotterRegion(SiSensor sensor) {
+
+		IIdentifierHelper helper = sensor.getIdentifierHelper();
+		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
+
+		// Compute the sensor's x and y grid coordinates and then translate to region number.
+		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);
+		return region;
+	}
+
+	protected void detectorChanged(Detector detector) {
+
+		// Setup the plotter.
+		IAnalysisFactory fac = aida.analysisFactory();
+		plotter = fac.createPlotterFactory().create(detector.getDetectorName() + " : HPS SVT Sensor Occupancy Plots");
+		IPlotterStyle pstyle = plotter.style();
+		pstyle.dataStyle().fillStyle().setColor("green");
+		pstyle.dataStyle().markerStyle().setColor("green");
+		pstyle.dataStyle().errorBarStyle().setVisible(false);
+		pstyle.statisticsBoxStyle().setVisible(false);
+
+		// Create regions.
+		plotter.createRegions(5, 4);
+
+		// Cache Detector object.
+		this.detector = detector;
+
+		// Make a list of SiSensors in the SVT.
+		sensors = this.detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
+
+		// Reset the data structure that keeps track of strip occupancies.
+		resetOccupancyMap();
+
+		// 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.");
+		}
+
+		// Map a map of sensors to their region numbers in the plotter.
+		sensorRegionMap = new HashMap<SiSensor, Integer>();
+		for (SiSensor sensor : sensors) {
+			int region = computePlotterRegion(sensor);
+			sensorRegionMap.put(sensor, region);
+		}
+
+		// Setup the occupancy plots.
+		aida.tree().cd("/");
+		for (SiSensor sensor : sensors) {
+			IHistogram1D occupancyPlot = aida.histogram1D(sensor.getName(), 640, 0, 639);
+			occupancyPlot.reset();
+			int region = sensorRegionMap.get(sensor);
+			plotter.region(region).plot(occupancyPlot);
+			JASHist hist = ((PlotterRegion) plotter.region(region)).getPlot();
+			hist.setAllowUserInteraction(false);
+			hist.setAllowPopupMenus(false);
+		}
+		plotter.show();
+	}
+
+	public void process(EventHeader event) {
+		if (event.hasCollection(RawTrackerHit.class, rawTrackerHitCollectionName)) {
+
+			// Get RawTrackerHit collection from event.
+			List<RawTrackerHit> rawTrackerHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);
+
+			// Increment strip hit count.
+			for (RawTrackerHit hit : rawTrackerHits) {
+				int[] strips = occupancyMap.get((SiSensor) hit.getDetectorElement());
+				strips[hit.getIdentifierFieldValue("strip")] += 1;
+			}
+
+			// Plot strip occupancies.
+			if (eventCount % eventRefreshRate == 0) {
+				for (SiSensor sensor : sensors) {
+					IHistogram1D sensorHist = aida.histogram1D(sensor.getName());
+					sensorHist.reset();
+					int[] strips = occupancyMap.get(sensor);
+					for (int i = 0; i < strips.length; i++) {
+						double stripOccupancy = (double) strips[i] / (double) (eventCount);
+						if (stripOccupancy != 0) {
+							sensorHist.fill(i, stripOccupancy);
+						}
+					}
+				}
+			}
+
+			// Increment event counter.
+			++eventCount;
+		}
+	}
+
+	private void resetOccupancyMap() {
+		occupancyMap = new HashMap<SiSensor, int[]>();
+		for (SiSensor sensor : sensors) {
+			occupancyMap.put(sensor, new int[640]);
+		}
+	}
+
+	public void endOfData() {
+		if (plotter != null) {
+			plotter.hide();
+		}
+	}
+
+	public void reset() {
+		eventCount = 0;
+		resetOccupancyMap();
+	}

\ No newline at end of file

- List<RawTrackerHit> rawTrackerHits = event.get(RawTrackerHit.class, inputCollection); - //FIXME: this check is necessary because hasCollection(type, name) doesn't seem to actually check type! - if (!rawTrackerHits.isEmpty() && RawTrackerHit.class.isInstance(rawTrackerHits.get(0))) {

List<RawTrackerHit> hits = event.get(RawTrackerHit.class, inputCollection); for (RawTrackerHit hit : hits) { Long daqId = idMap.physicalToDaqID(hit.getCellID()); int crate = HPSEcalDaqIDConverter.getCrate(daqId); int slot = HPSEcalDaqIDConverter.getSlot(daqId); int channel = HPSEcalDaqIDConverter.getChannel(daqId);

List<RawTrackerHit> hits = event.get(RawTrackerHit.class, inputCollection); for (RawTrackerHit hit : hits) { dec.setID(hit.getCellID()); int x = dec.getValue("ix"); int y = dec.getValue("iy");

- List<RawCalorimeterHit> rawCalHits = event.get(RawCalorimeterHit.class, inputCollection); - //FIXME: this check is necessary because hasCollection(type, name) doesn't seem to actually check type! - if (!rawCalHits.isEmpty() && RawCalorimeterHit.class.isInstance(rawCalHits.get(0))) {

//System.out.println("creating plot: " + "ECAL: Crate " + j + "; Slot " + i + " in region " + region); // IHistogram1D hist = aida.histogram1D("ECAL: x=" + i + "; y=" + j, 1000, 0, 16); }

- plotter.region(1).clear(); - plotter.region(1).plot(plots[x + 23][y + 5]); - ((PlotterRegion) plotter.region(1)).getPlot().setAllowUserInteraction(false); - ((PlotterRegion) plotter.region(1)).getPlot().setAllowPopupMenus(false);

+ plotter.region(2).clear(); + plotter.region(2).plot(plots[x + 23][y + 5]); + ((PlotterRegion) plotter.region(2)).getPlot().setAllowUserInteraction(false); + ((PlotterRegion) plotter.region(2)).getPlot().setAllowPopupMenus(false);

- - private String subdetectorName; - private String inputCollection; - private HPSEcalDaqIDConverter idMap; - private IPlotter plotter; - private AIDA aida; - private Detector detector; - private List<IHistogram1D> plots; - - public EcalDaqPlots() {} - - public void setSubdetectorName(String subdetectorName) { - this.subdetectorName = subdetectorName; - } - - public void setInputCollection(String inputCollection) { - this.inputCollection = inputCollection; - } - - public void detectorChanged(Detector detector) { - - this.detector = detector; - - if (subdetectorName == null) { - throw new RuntimeException("The subdetectorName parameter was not set."); - } - - if (inputCollection == null) { - throw new RuntimeException("The inputCollection parameter was not set."); - } - - Subdetector subdetector = detector.getSubdetector(subdetectorName); - idMap = new HPSEcalDaqIDConverter(); - idMap.fillDaqCellMap(subdetector); - - setupPlots(); - } - - private void setupPlots() { - plots = new ArrayList<IHistogram1D>(); - aida = AIDA.defaultInstance(); - aida.tree().cd("/"); - plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL DAQ Plots"); - IPlotterStyle pstyle = plotter.style(); - pstyle.dataStyle().fillStyle().setColor("orange"); - pstyle.dataStyle().markerStyle().setColor("orange"); - pstyle.dataStyle().errorBarStyle().setVisible(false); - plotter.createRegions(7, 4); - int region = 0; - for (int i=0; i<14; i++) { // slot - for (int j=1; j<3; j++) { // crate - //System.out.println("creating plot: " + "ECAL: Crate " + j + "; Slot " + i + " in region " + region); - IHistogram1D hist = aida.histogram1D("ECAL: Crate " + j + "; Slot " + i, 16, 0, 16); - plots.add(hist); - plotter.region(region).plot(hist); - JASHist jhist = ((PlotterRegion)plotter.region(region)).getPlot(); - jhist.setAllowUserInteraction(false); - jhist.setAllowPopupMenus(false); - region++; - } - } - plotter.show(); - } - - public void endOfData() { - if (plotter != null) - plotter.hide(); - } - - public void reset() { - if (plotter != null) { - plotter.hide(); - plotter.destroyRegions(); - for (IHistogram1D plot : plots) { - plot.reset(); - } - detectorChanged(detector); - } - } - - public void process(EventHeader event) { - List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, inputCollection); - for (RawCalorimeterHit hit : hits) { - Long daqId = idMap.physicalToDaqID(hit.getCellID()); - int crate = HPSEcalDaqIDConverter.getCrate(daqId); - int slot = HPSEcalDaqIDConverter.getSlot(daqId); - int channel = HPSEcalDaqIDConverter.getChannel(daqId); - //System.out.println("crate="+crate+"; slot="+slot+"; channel="+channel); - //System.out.println("filling plot: " + "ECAL: Crate " + crate + "; Slot " + slot); - aida.histogram1D("ECAL: Crate " + crate + "; Slot " + slot).fill(channel); - } - }

+ + private String subdetectorName; + private String inputCollection; + private HPSEcalDaqIDConverter idMap; + private IPlotter plotter; + private AIDA aida; + private Detector detector; + private List<IHistogram1D> plots; + + public EcalDaqPlots() { + } + + public void setSubdetectorName(String subdetectorName) { + this.subdetectorName = subdetectorName; + } + + public void setInputCollection(String inputCollection) { + this.inputCollection = inputCollection; + } + + public void detectorChanged(Detector detector) { + + this.detector = detector; + + if (subdetectorName == null) { + throw new RuntimeException("The subdetectorName parameter was not set."); + } + + if (inputCollection == null) { + throw new RuntimeException("The inputCollection parameter was not set."); + } + + Subdetector subdetector = detector.getSubdetector(subdetectorName); + idMap = new HPSEcalDaqIDConverter(); + idMap.fillDaqCellMap(subdetector); + + setupPlots(); + } + + private void setupPlots() { + plots = new ArrayList<IHistogram1D>(); + aida = AIDA.defaultInstance(); + aida.tree().cd("/"); + plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL DAQ Plots"); + IPlotterStyle pstyle = plotter.style(); + pstyle.dataStyle().fillStyle().setColor("orange"); + pstyle.dataStyle().markerStyle().setColor("orange"); + pstyle.dataStyle().errorBarStyle().setVisible(false); + plotter.createRegions(7, 4); + int region = 0; + for (int i = 0; i < 14; i++) { // slot + for (int j = 1; j < 3; j++) { // crate + //System.out.println("creating plot: " + "ECAL: Crate " + j + "; Slot " + i + " in region " + region); + IHistogram1D hist = aida.histogram1D("ECAL: Crate " + j + "; Slot " + i, 16, 0, 16); + plots.add(hist); + plotter.region(region).plot(hist); + JASHist jhist = ((PlotterRegion) plotter.region(region)).getPlot(); + jhist.setAllowUserInteraction(false); + jhist.setAllowPopupMenus(false); + region++; + } + } + plotter.show(); + } + + public void endOfData() { + if (plotter != null) { + plotter.hide(); + } + } + + public void reset() { + if (plotter != null) { + plotter.hide(); + plotter.destroyRegions(); + for (IHistogram1D plot : plots) { + plot.reset(); + } + detectorChanged(detector); + } + } + + public void process(EventHeader event) { + if (event.hasCollection(RawCalorimeterHit.class, inputCollection)) { + List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, inputCollection); + for (RawCalorimeterHit hit : hits) { + Long daqId = idMap.physicalToDaqID(hit.getCellID()); + int crate = HPSEcalDaqIDConverter.getCrate(daqId); + int slot = HPSEcalDaqIDConverter.getSlot(daqId); + int channel = HPSEcalDaqIDConverter.getChannel(daqId); + //System.out.println("crate="+crate+"; slot="+slot+"; channel="+channel); + //System.out.println("filling plot: " + "ECAL: Crate " + crate + "; Slot " + slot); + aida.histogram1D("ECAL: Crate " + crate + "; Slot " + slot).fill(channel); + } + } + if (event.hasCollection(RawTrackerHit.class, inputCollection)) { + List<RawTrackerHit> hits = event.get(RawTrackerHit.class, inputCollection); + for (RawTrackerHit hit : hits) { + Long daqId = idMap.physicalToDaqID(hit.getCellID()); + int crate = HPSEcalDaqIDConverter.getCrate(daqId); + int slot = HPSEcalDaqIDConverter.getSlot(daqId); + int channel = HPSEcalDaqIDConverter.getChannel(daqId); + //System.out.println("crate="+crate+"; slot="+slot+"; channel="+channel); + //System.out.println("filling plot: " + "ECAL: Crate " + crate + "; Slot " + slot); + aida.histogram1D("ECAL: Crate " + crate + "; Slot " + slot).fill(channel); + } + } + }

Commit in `hps-java/src/main/java/org/lcsim/hps` on MAIN
`users/meeg/EvioFileReader.java`	+13	-9	1.8 -> 1.9
`/HPSEcalAnalogPrintDriver.java`	+1	-6	1.2 -> 1.3
`/HPSEcalDigitalPrintDriver.java`	+1	-7	1.4 -> 1.5
`/HPSEcalRawTrackerHitPrintDriver.java`	+1	-6	1.2 -> 1.3
`/HPSGenericRawTrackerHitPrintDriver.java`	+4	-8	1.1 -> 1.2
`evio/LCSimTestRunEventBuilder.java`	+2	-1	1.13 -> 1.14
`/TestRunReconToEvio.java`	+17	-9	1.6 -> 1.7
`/SVTEvioReader.java`	+4	-4	1.2 -> 1.3
`/ECalEvioReader.java`	+2	-2	1.5 -> 1.6
`/EventConstants.java`	+1		1.8 -> 1.9
`/TestRunTriggeredReconToEvio.java`	+19	-10	1.7 -> 1.8
`recon/tracking/HPSSVTDataBuffer.java`	+9	-8	1.4 -> 1.5
`monitoring/EcalMonitoringPlots.java`	+61	-53	1.4 -> 1.5
`/SensorOccupancyPlotsDriver.java`	+149	-147	1.12 -> 1.13
`/EcalWindowPlots.java`	+2	-4	1.2 -> 1.3
`/EcalWindowPlotsXY.java`	+2	-4	1.1 -> 1.2
`/EcalPedestalPlots.java`	+28	-14	1.1 -> 1.2
`/EcalDaqPlots.java`	+109	-92	1.3 -> 1.4
	+425	-384