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

diff -u -r1.13 -r1.14
--- SensorOccupancyPlotsDriver.java	27 Apr 2012 22:13:53 -0000	1.13
+++ SensorOccupancyPlotsDriver.java	28 Apr 2012 22:03:39 -0000	1.14
@@ -39,8 +39,8 @@

 	private IPlotter plotter;
 	private Detector detector;
 	private List<SiSensor> sensors;

-	private Map<SiSensor, int[]> occupancyMap;
-	private Map<SiSensor, Integer> sensorRegionMap;

+	private Map<String, int[]> occupancyMap;
+	private Map<String, Integer> sensorRegionMap;

 	private int eventCount = 0;
 	private int eventRefreshRate = 1000;
 

@@ -106,10 +106,10 @@

 		}
 
 		// Map a map of sensors to their region numbers in the plotter.

-		sensorRegionMap = new HashMap<SiSensor, Integer>();

+		sensorRegionMap = new HashMap<String, Integer>();

 		for (SiSensor sensor : sensors) {
 			int region = computePlotterRegion(sensor);

-			sensorRegionMap.put(sensor, region);

+			sensorRegionMap.put(sensor.getName(), region);

 		}
 
 		// Setup the occupancy plots.

@@ -117,7 +117,7 @@

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

-			int region = sensorRegionMap.get(sensor);

+			int region = sensorRegionMap.get(sensor.getName());

 			plotter.region(region).plot(occupancyPlot);
 			JASHist hist = ((PlotterRegion) plotter.region(region)).getPlot();
 			hist.setAllowUserInteraction(false);

@@ -134,7 +134,7 @@

 
 			// Increment strip hit count.
 			for (RawTrackerHit hit : rawTrackerHits) {

-				int[] strips = occupancyMap.get((SiSensor) hit.getDetectorElement());

+				int[] strips = occupancyMap.get(hit.getDetectorElement().getName());

 				strips[hit.getIdentifierFieldValue("strip")] += 1;
 			}
 

@@ -143,7 +143,7 @@

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

-					int[] strips = occupancyMap.get(sensor);

+					int[] strips = occupancyMap.get(sensor.getName());

 					for (int i = 0; i < strips.length; i++) {
 						double stripOccupancy = (double) strips[i] / (double) (eventCount);
 						if (stripOccupancy != 0) {

@@ -159,9 +159,9 @@

 	}
 
 	private void resetOccupancyMap() {

-		occupancyMap = new HashMap<SiSensor, int[]>();

+		occupancyMap = new HashMap<String, int[]>();

 		for (SiSensor sensor : sensors) {

-			occupancyMap.put(sensor, new int[640]);

+			occupancyMap.put(sensor.getName(), new int[640]);

 		}
 	}