diff -u -r1.3 -r1.4
--- et_monitoring_app.sh	26 Mar 2012 21:08:20 -0000	1.3
+++ et_monitoring_app.sh	27 Mar 2012 03:18:21 -0000	1.4
@@ -19,7 +19,7 @@

 classpath=`pwd`/target/hps-java-1.1-SNAPSHOT-bin.jar
 
 # Run it.

-prod="java -classpath "$classpath" org.lcsim.hps.monitoring.MonitoringConsumer"

+prod="java -classpath "$classpath" org.lcsim.hps.monitoring.MonitoringExample"

 # -c 100"
 echo $prod
 exec $prod

diff -N JobPanel.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ JobPanel.java	27 Mar 2012 03:18:21 -0000	1.1
@@ -0,0 +1,73 @@

+package org.lcsim.hps.monitoring;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+class JobPanel extends JPanel {
+	
+	JTextField lcsimSteeringField;
+	JTextField detectorNameField;
+		
+	public JobPanel() {
+		
+		setLayout(new GridBagLayout());
+		
+		GridBagConstraints c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 0;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel lcsimSteeringLabel = new JLabel("LCSim Steering File:");
+        lcsimSteeringLabel.setHorizontalAlignment(JLabel.LEFT);
+        lcsimSteeringLabel.setToolTipText("Resource in jar pointing to LCSim steering file.");
+        add(lcsimSteeringLabel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 0;
+        c.anchor = GridBagConstraints.EAST;
+        lcsimSteeringField = new JTextField("", 30);
+        lcsimSteeringField.setHorizontalAlignment(JTextField.RIGHT);
+        lcsimSteeringField.setBackground(Color.WHITE);
+        add(lcsimSteeringField, c);		
+        
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 1;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel detectorLabel = new JLabel("Detector Name:");
+        detectorLabel.setHorizontalAlignment(JLabel.LEFT);
+        detectorLabel.setToolTipText("Name of detector in LCSim conditions system.");
+        add(detectorLabel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 1;
+        c.anchor = GridBagConstraints.EAST;
+        detectorNameField = new JTextField("", 20);
+        detectorNameField.setHorizontalAlignment(JTextField.RIGHT);
+        detectorNameField.setBackground(Color.WHITE);
+        add(detectorNameField, c);
+	}
+	
+	public void setSteeringFile(String steeringFile) {
+		lcsimSteeringField.setText(steeringFile);
+	}
+	
+	public void setDetectorName(String detectorName) {
+		detectorNameField.setText(detectorName);
+	}
+	
+	public String getSteeringFile() {
+		return lcsimSteeringField.getText();
+	}
+	
+	public String getDetectorName() {
+		return detectorNameField.getText();
+	}
+}

\ No newline at end of file

diff -N MonitoringApplication.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MonitoringApplication.java	27 Mar 2012 03:18:21 -0000	1.1
@@ -0,0 +1,210 @@

+package org.lcsim.hps.monitoring;
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+
+import org.lcsim.job.JobControlManager;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
+
+public class MonitoringApplication extends JPanel implements ActionListener {
+	
+	private JTabbedPane tabs;
+	
+	private ConnectionPanel connectionPanel;
+	private EventPanel eventPanel;
+	private JobPanel jobPanel;
+	
+	private JMenuBar menuBar;
+	
+	final String connectCmd = "connect";
+	final String disconnectCmd = "disconnect";
+	final String saveConnectionCmd = "saveConnection";
+	final String loadConnectionCmd = "loadConnection";
+	final String resetConnectionSettingsCmd = "resetConnectionSettings";
+	final String resetEventsCmd = "resetEvents";
+	final String savePlotsCmd = "savePlots";
+	final String resetDriversCmd = "resetDrivers";
+	final String exitCmd = "exit";
+	
+	private JobControlManager mgr = null;
+		
+	public MonitoringApplication() {
+		
+		super(new BorderLayout());
+						
+		//
+		// Menu bar.
+		//
+		
+		menuBar = new JMenuBar();
+		
+		JMenu connectionMenu = new JMenu("Connection");
+		menuBar.add(connectionMenu);
+		
+		JMenuItem connectItem = new JMenuItem("Connect");
+		connectItem.setMnemonic(KeyEvent.VK_C);
+		connectItem.setActionCommand(connectCmd);
+		connectItem.addActionListener(this);
+		connectionMenu.add(connectItem);
+		
+		JMenuItem disconnectItem = new JMenuItem("Disconnect");
+		disconnectItem.setMnemonic(KeyEvent.VK_D);
+		disconnectItem.setActionCommand(disconnectCmd);
+		disconnectItem.addActionListener(this);
+		connectionMenu.add(disconnectItem);
+		
+		JMenuItem resetConnectionItem = new JMenuItem("Reset Connection Settings");
+		resetConnectionItem.setMnemonic(KeyEvent.VK_R);
+		resetConnectionItem.setActionCommand(resetConnectionSettingsCmd);
+		resetConnectionItem.addActionListener(this);
+		connectionMenu.add(resetConnectionItem);
+				
+		JMenuItem connectionLoadItem = new JMenuItem("Load Connection...");
+		connectionLoadItem.setMnemonic(KeyEvent.VK_L);
+		connectionLoadItem.setActionCommand(loadConnectionCmd);
+		connectionLoadItem.addActionListener(this);
+		connectionMenu.add(connectionLoadItem);
+		
+		JMenuItem connectionSaveItem = new JMenuItem("Save Connection...");
+		connectionSaveItem.setMnemonic(KeyEvent.VK_S);
+		connectionSaveItem.setActionCommand(saveConnectionCmd);
+		connectionSaveItem.addActionListener(this);
+		connectionMenu.add(connectionSaveItem);
+		
+		JMenuItem exitItem = new JMenuItem("Exit");
+		exitItem.setMnemonic(KeyEvent.VK_X);
+		exitItem.setActionCommand(exitCmd);
+		exitItem.addActionListener(this);
+		connectionMenu.add(exitItem);
+		
+		JMenu eventMenu = new JMenu("Event");
+		menuBar.add(eventMenu);
+		
+		JMenuItem resetEventsItem = new JMenuItem("Reset Event Monitor");
+		resetEventsItem.setMnemonic(KeyEvent.VK_E);
+		resetEventsItem.setActionCommand(resetEventsCmd);
+		resetEventsItem.addActionListener(this);
+		eventMenu.add(resetEventsItem);		
+		
+		JMenu jobMenu = new JMenu("Job");
+		menuBar.add(jobMenu);
+		
+		JMenuItem savePlotsItem = new JMenuItem("Save Plots to AIDA File...");
+		savePlotsItem.setMnemonic(KeyEvent.VK_P);
+		savePlotsItem.setActionCommand("savePlots");
+		savePlotsItem.addActionListener(this);
+		jobMenu.add(savePlotsItem);		
+		
+		JMenuItem resetDriversItem = new JMenuItem("Reset LCSim Drivers");
+		resetDriversItem.setMnemonic(KeyEvent.VK_D);
+		resetDriversItem.setActionCommand("resetDrivers");
+		resetDriversItem.addActionListener(this);
+		jobMenu.add(resetDriversItem);
+		
+		//
+		// Create tabs for panels.
+		//
+		
+		tabs = new JTabbedPane();
+		
+		connectionPanel = new ConnectionPanel();
+		eventPanel = new EventPanel();
+		jobPanel = new JobPanel();
+		
+		tabs.addTab("Connection", connectionPanel);
+		tabs.addTab("Event Monitor", eventPanel);
+		tabs.addTab("Job Settings", jobPanel);
+				
+		add(tabs);
+	}
+	
+	public void setJobControlManager(JobControlManager mgr) {
+		this.mgr = mgr;
+	}
+		
+	synchronized private void savePlots() {
+        JFileChooser fc = new JFileChooser();
+        int r = fc.showSaveDialog(this);
+        if (r == JFileChooser.APPROVE_OPTION) {
+            File fileName = fc.getSelectedFile();
+            try {
+                AIDA.defaultInstance().saveAs(fileName);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+	
+	synchronized private void resetDrivers() {
+		 for (Driver driver : mgr.getDriverExecList()) {
+			 if (driver instanceof Resettable) {
+				 ((Resettable) driver).reset();
+			 }
+		 }
+	 }
+		
+	public void actionPerformed(ActionEvent e) {
+        String cmd = e.getActionCommand();    
+        if (connectCmd.equals(cmd)) {
+            connectionPanel.actionPerformed(e);
+        } else if (disconnectCmd.equals(cmd)) {
+            connectionPanel.actionPerformed(e);
+        } else if (saveConnectionCmd.equals(cmd)) {
+        	connectionPanel.actionPerformed(e);
+        } else if (loadConnectionCmd.equals(cmd)) {
+        	connectionPanel.actionPerformed(e);        	
+        } else if (resetConnectionSettingsCmd.equals(cmd)) {
+        	connectionPanel.actionPerformed(e);        
+        } else if (resetEventsCmd.equals(cmd)) {
+        	eventPanel.actionPerformed(e);        
+        } else if (savePlotsCmd.equals(cmd)) {
+        	savePlots();
+        } else if (resetDriversCmd.equals(cmd)) {
+        	resetDrivers();
+        // Quit.
+        } else if (exitCmd.equals(cmd)) {
+        	exit();
+        }
+    }
+	
+	private void exit() {
+		System.exit(0);
+	}
+			
+	ConnectionPanel getConnectionPanel() {
+		return connectionPanel;
+	}
+	
+	EventPanel getEventPanel() {
+		return eventPanel;
+	}
+	
+	JobPanel getJobPanel() {
+		return jobPanel;
+	}
+			
+	void start() {
+        JFrame frame = new JFrame("HPS Monitoring");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        this.setOpaque(true);
+        frame.setContentPane(this);
+        frame.setJMenuBar(menuBar);
+                       
+        frame.pack();
+        frame.setVisible(true);
+    }
+}

\ No newline at end of file

diff -u -r1.4 -r1.5
--- ConnectionParameters.java	26 Mar 2012 21:08:20 -0000	1.4
+++ ConnectionParameters.java	27 Mar 2012 03:18:21 -0000	1.5
@@ -4,17 +4,12 @@

 import java.net.InetAddress;
 import java.net.UnknownHostException;
 

-import org.jlab.coda.et.EtAttachment;

 import org.jlab.coda.et.EtConstants;

-import org.jlab.coda.et.EtStation;
-import org.jlab.coda.et.EtStationConfig;
-import org.jlab.coda.et.EtSystem;
-import org.jlab.coda.et.EtSystemOpenConfig;

 
 /**
  * Connection parameters for ET system consumer.
  */

-public class ConnectionParameters {

+class ConnectionParameters {

 
     public String etName = "ETBuffer";
     public String host = null;

@@ -27,6 +22,13 @@

     public int position = 1;
     public int pposition = 0;
     public int flowMode = EtConstants.stationSerial;

+    public WaitMode waitMode = WaitMode.SLEEP;
+    public int waitTime = 20000000; // wait time in microseconds
+    
+    public enum WaitMode {
+    	SLEEP,
+    	WAIT
+    }

                
     public ConnectionParameters() {
         // Set the default host.

@@ -52,7 +54,9 @@

                 "       -c     number of events in one get/put array\n" +
                 "       -q     queue size if creating nonblocking station\n" +
                 "       -pos   position of created station in station list (1,2,...)\n" +

-                "       -ppos  position of created station within a group of parallel stations (-1=end, -2=head)\n\n" +

+                "       -ppos  position of created station within a group of parallel stations (-1=end, -2=head)\n" +
+                "       -w     wait for events for specified time period in microseconds rather than sleeping" +
+                "       -t     time to wait for events before timing out\n\n" +

                 "        This consumer works by making a direct connection\n" +
                 "        to the ET system's tcp server port.\n");
     }

@@ -130,8 +134,17 @@

 
                 } catch (NumberFormatException ex) {
                     throw new ConnectionParametersException("Did not specify a proper parallel position number.");

-                }
-            } else {

+                }                
+            } else if (args[i].equalsIgnoreCase("-w")) {
+            	waitMode = WaitMode.WAIT;
+            } else if (args[i].equalsIgnoreCase("-t")) {
+            	waitTime = Integer.parseInt(args[++i]);
+            	if (waitTime < 0) {
+            		throw new ConnectionParametersException("Invalid wait time specified.");
+            	}
+            } 
+            
+            else {

                 throw new ConnectionParametersException("Arguments included invalid command line parameter:" + args[i]);
             }
         }

@@ -160,6 +173,8 @@

     	buf.append("position: " + position + '\n');
     	buf.append("pposition: " + pposition + '\n');
     	buf.append("flowMode: " + flowMode + '\n');

+    	buf.append("waitMode: " + waitMode + '\n');
+    	buf.append("waitTime: " + waitTime + '\n');

     	return buf.toString();
     }
 }

\ No newline at end of file

diff -u -r1.1 -r1.2
--- EventPanel.java	26 Mar 2012 21:08:20 -0000	1.1
+++ EventPanel.java	27 Mar 2012 03:18:21 -0000	1.2
@@ -3,42 +3,27 @@

 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

-import java.awt.Insets;

 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

-import java.io.File;
-import java.io.IOException;

 import java.text.DecimalFormat;
 

-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;

 import javax.swing.JLabel;

+import javax.swing.JOptionPane;

 import javax.swing.JPanel;
 import javax.swing.JTextField;
 

-import org.lcsim.job.JobControlManager;
-import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
-
-public class EventPanel extends JPanel implements ActionListener {

+class EventPanel extends JPanel implements ActionListener {

 
     private JTextField eventCounterField;
     private JTextField elapsedTimeField;
     private JTextField avgEventRateField;
     private JTextField refreshField;
     private JTextField badEventsField;

-    private DecimalFormat rateFormat = new DecimalFormat("#.##");
-
-    private JButton resetButton;
-    private JButton saveButton;
-    private JButton quitButton;

-    private static JobControlManager jobMgr;    
-    private static EventPanel monitoringGui;

+    private DecimalFormat rateFormat = new DecimalFormat("#.##");

-    // Refresh every 1000 events by default.
-    private int eventRefresh = 1000;

+    private static final int defaultEventRefresh = 1000;
+    private int eventRefresh = defaultEventRefresh;

     
     private long jobStartTime;
     private int eventCount;

@@ -47,7 +32,7 @@

     EventPanel() {
 
         setLayout(new GridBagLayout());

-

+        

         GridBagConstraints c = new GridBagConstraints();
 
         // Panel for labels and values.

@@ -69,7 +54,7 @@

         c.gridx = 0;
         c.gridy = 0;
         c.anchor = GridBagConstraints.WEST;

-        JLabel eventLabel = new JLabel("Events Processed: ");

+        JLabel eventLabel = new JLabel("Events Processed:");

         eventLabel.setHorizontalAlignment(JLabel.LEFT);
         fieldsPanel.add(eventLabel, c);
 

@@ -133,6 +118,9 @@

         c.anchor = GridBagConstraints.EAST;
         refreshField = new JTextField(Integer.toString(eventRefresh), 4);
         refreshField.setHorizontalAlignment(JTextField.RIGHT);

+        refreshField.setEditable(true);
+        refreshField.addActionListener(this);
+        refreshField.setActionCommand("eventRefreshEdit");

         fieldsPanel.add(refreshField, c);
         
         c = new GridBagConstraints();

@@ -151,59 +139,15 @@

         badEventsField.setHorizontalAlignment(JTextField.RIGHT);
         badEventsField.setEditable(false);
         badEventsField.setBackground(Color.WHITE);

-        fieldsPanel.add(badEventsField, c);        
-                
-        // Button padding.
-        Insets buttonInsets = new Insets(1, 1, 1, 1);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 0;
-        c.fill = GridBagConstraints.BOTH;
-        c.insets = buttonInsets;
-        resetButton = new JButton("Reset");
-        resetButton.setActionCommand("reset");
-        resetButton.addActionListener(this);
-        resetButton.setToolTipText("Reset the GUI and the plots.");
-        buttonsPanel.add(resetButton, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 0;
-        c.fill = GridBagConstraints.BOTH;
-        c.insets = buttonInsets;
-        saveButton = new JButton("Save Plots");
-        saveButton.setActionCommand("save");
-        saveButton.addActionListener(this);
-        saveButton.setToolTipText("Save the plots to an AIDA file.");
-        buttonsPanel.add(saveButton, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 2;
-        c.gridy = 0;
-        c.fill = GridBagConstraints.BOTH;
-        c.insets = buttonInsets;
-        quitButton = new JButton("Quit");
-        quitButton.setActionCommand("quit");
-        quitButton.addActionListener(this);
-        quitButton.setToolTipText("Quit the job.");
-        buttonsPanel.add(quitButton, c);

+        fieldsPanel.add(badEventsField, c);

     }

-    
-    public static EventPanel getMonitoringGui() {
-        return EventPanel.monitoringGui;
-    }
-   
-    public void setJobControlManager(JobControlManager jobMgr) {
-        EventPanel.jobMgr = jobMgr;
-    }
-    

+           

     public int getEventCount() {
         return eventCount;
     }
     
     public int getEventRefresh() {

-        return Integer.parseInt(refreshField.getText());

+    	return eventRefresh;

     }
     
     public void updateEventCount() {

@@ -251,15 +195,7 @@

     private void resetElapsedTime() {
         elapsedTimeField.setText("0");
     }   

-    
-    private void resetDrivers() {
-        for (Driver driver : jobMgr.getDriverExecList()) {
-            if (driver instanceof Resettable) {
-                ((Resettable) driver).reset();
-            }
-        }
-    }
-    

+        

     private void resetJobStartTime() {
         jobStartTime = System.currentTimeMillis();
     }

@@ -272,63 +208,35 @@

     	this.badEventCount = 0;
     	this.badEventsField.setText("0");
     }

-
-    public static void createAndShow() {
-        JFrame frame = new JFrame("HPS Monitoring GUI");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        monitoringGui = new EventPanel();
-        monitoringGui.setOpaque(true);
-        frame.setContentPane(monitoringGui);
-
-        frame.pack();
-        frame.setVisible(true);
-    }
-

+ 

     public void actionPerformed(ActionEvent e) {
         String cmd = e.getActionCommand();

-        if ("reset".equals(cmd)) {

+        if ("resetEvents".equals(cmd)) {

             reset();

-        } else if ("save".equals(cmd)) {
-            save();
-        } else if ("quit".equals(cmd)) {
-            quit();

+        } else if ("eventRefreshEdit".equals(cmd)) {
+        	eventRefreshEdit();

         }
     }

-
-    private void reset() {
-        resetDrivers();

+    
+    private void eventRefreshEdit() {
+    	int newEventRefresh;
+    	try {
+    		newEventRefresh = Integer.parseInt(refreshField.getText());
+    		if (newEventRefresh < 1) 
+    			throw new NumberFormatException();
+    		this.eventRefresh = newEventRefresh;
+    	} catch (NumberFormatException e) {
+    		JOptionPane.showMessageDialog(this, "The value " + refreshField.getText() + " is not valid for this field.");
+    		eventRefresh = defaultEventRefresh;
+    		refreshField.setText(Integer.toString(eventRefresh));
+    	}
+    }
+        
+	synchronized private void reset() {

         resetEventCount();
         resetBadEventCount();
         resetAverageEventRate();
         resetElapsedTime();
         resetJobStartTime();
     }

-
-    private void save() {
-        JFileChooser fc = new JFileChooser();
-        int r = fc.showSaveDialog(EventPanel.this);
-        if (r == JFileChooser.APPROVE_OPTION) {
-            File fileName = fc.getSelectedFile();
-            try {
-                AIDA.defaultInstance().saveAs(fileName);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else {
-            System.out.println("Save operation was cancelled.");
-        }
-    }
-
-    private void quit() {
-        System.exit(0);
-    }
-    
-    public static void main(String[] args) {
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                createAndShow();
-            }
-        });
-    }

 }

\ No newline at end of file

diff -u -r1.4 -r1.5
--- SensorOccupancyPlotsDriver.java	25 Mar 2012 08:55:11 -0000	1.4
+++ SensorOccupancyPlotsDriver.java	27 Mar 2012 03:18:21 -0000	1.5
@@ -43,11 +43,16 @@

     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

+    
+    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 for 5x4 region layout and then translate to region number.

         int ix = (layer - 1) / 2;
         int iy = 0;
         if (module > 0) {

@@ -56,10 +61,11 @@

         if (layer % 2 == 0) {
             iy += 1;
         }

-        int region = iy * 4 + ix;

+        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) {
         
         // If called > 1 then destroy plots that might be currently up.

@@ -93,27 +99,12 @@

         // 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);

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

             sensorRegionMap.put(sensor,region);
         }
                

+        // Reset the data structure that keeps track of strip occupancies.

         resetOccupancyMap();
 
         // Setup the occupancy plots.

diff -N MonitoringConsumer.java
--- MonitoringConsumer.java	26 Mar 2012 21:08:20 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,168 +0,0 @@

-package org.lcsim.hps.monitoring;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.List;
-
-import org.freehep.record.loop.event.RecordSuppliedEvent;
-import org.jlab.coda.et.EtAttachment;
-import org.jlab.coda.et.EtEvent;
-import org.jlab.coda.et.EtSystem;
-import org.jlab.coda.et.enums.Mode;
-import org.jlab.coda.et.enums.Modify;
-import org.jlab.coda.et.exception.EtTimeoutException;
-import org.jlab.coda.jevio.EvioEvent;
-import org.jlab.coda.jevio.EvioReader;
-import org.lcsim.event.EventHeader;
-import org.lcsim.hps.evio.LCSimEventBuilder;
-import org.lcsim.job.JobControlManager;
-import org.lcsim.util.Driver;
-import org.lcsim.util.DriverAdapter;
-
-/**
- * This class is an example of an event consumer for an ET system.
- * 
- * Based on Carl Timmer's apps.Consumer class from jevio 4.0 release.
- *
- * @author Jeremy McCormick
- */
-// TODO Move the code that wraps Driver and event loop into the JobControlManager.
-// TODO Integrate the ConnectionPanel so that it can be used for changing connection parameters.
-public class MonitoringConsumer {
-    
-    // TODO Next two should be job options or at least CL options.
-    private static final String detectorName = "HPS-Test-JLAB-v4pt0";
-    //private static final String lcsimXml = "/org/lcsim/hps/steering/EtTest.lcsim";
-    private static final String lcsimXml = "/org/lcsim/hps/steering/EtSensorOccupancy.lcsim";
-
-    private EventPanel gui;
-    //private int eventCount;
-    
-    private JobControlManager jobMgr; 
-                       
-    public MonitoringConsumer() 
-    {}
-    
-    public static void main(String [] args) {
-        MonitoringConsumer app = new MonitoringConsumer();
-        //app.run(args);
-        app.run();        
-    }
-                
-    public void run() {
-                        
-        // Wait for connection settings via GUI.
-        ConnectionPanel.main(new String[]{});
-        try { Thread.sleep(1000); } catch (InterruptedException e) {}
-        ConnectionPanel connectionPanel = ConnectionPanel.getConnectionPanel();
-        while (!connectionPanel.connectPressed()) {
-        	try { Thread.sleep(1000); } catch (InterruptedException e)  {};
-        }        
-        ConnectionParameters cn = connectionPanel.getConnectionParameters();
-        
-        try {        	
-        	
-        	// Setup connection to ET system.
-        	EtConnection et = EtConnection.makeEtConnection(cn);
-        	EtSystem sys = et.getEtSystem();
-        	EtAttachment att = et.getEtAttachment();   
-        	
-            // Show monitoring GUI.
-            EventPanel.main(new String[]{});
-            Thread.sleep(2000);
-            gui = EventPanel.getMonitoringGui();
-            gui.setJobControlManager(jobMgr);             
-                        
-            // Job manager to run LCSim.
-            jobMgr = new JobControlManager();
-            jobMgr.checkInputFiles(false);
-            InputStream is = (new MonitoringConsumer()).getClass().getResourceAsStream(lcsimXml);
-            jobMgr.setup(is);
-            
-            // Get list of Drivers.
-            List<Driver> drivers = jobMgr.getDriverExecList();
-            
-            // Wrap Drivers with DriverAdapter.
-            Driver topDriver = new Driver();
-            for (Driver driver : drivers) {
-                topDriver.add(driver);
-            }
-            DriverAdapter driverAdapter = new DriverAdapter(topDriver);
-                                    
-            // Call wrapper to startOfData() on DriverAdapter.
-            driverAdapter.configure(null);
-                        
-            // Make the builder for creating LCSim events from EVIO data.
-            LCSimEventBuilder eventBuilder = new LCSimEventBuilder(detectorName);
-            eventBuilder.setDebug(false);
-                                                
-            // Start job timer.
-            gui.updateJobStartTime();
-
-            // array of events
-            EtEvent[] mevs = null;
-            //int eventCount = 0;
-            while (true) { // event loop
-                try {
-                    //if (debug)
-                    //    System.out.println("waiting for EtEvents");
-                    //mevs = sys.getEvents(att, Mode.SLEEP, Modify.NOTHING, 0, cn.chunk);                    
-                    mevs = sys.getEvents(att, Mode.TIMED, Modify.NOTHING, 20000000, cn.chunk);
-                    //eventCount += mevs.length;
-                    //if (debug) {
-                    //    System.out.println("event count <" + eventCount + ">");
-                    //    System.out.println("got " + mevs.length + " EtEvents");
-                   // }
-                } catch (EtTimeoutException e) {
-                    System.out.println("ET Consumer timed out.");
-                    driverAdapter.finish(null);
-                    System.out.println("Press ENTER to exit ...");
-                    System.console().readLine();
-                    System.exit(0);
-                }
-                                           
-                // Loop over retrieved EtEvents.
-                for (EtEvent mev : mevs) {
-                    
-                    // Update GUI's event count.
-                    gui.updateEventCount();                    
-                    
-                    // Get EvioEvent and check for errors.
-                    ByteBuffer buf = mev.getDataBuffer();
-                    EvioReader reader = new EvioReader(buf);
-                    EvioEvent evioEvent = null;
-                    try {
-                        evioEvent = reader.parseNextEvent();
-                    } catch (java.nio.BufferUnderflowException e) {
-                    	// Error will be caught by subsequent check on null event.
-                    }
-                    if (evioEvent == null) {
-                    	gui.updateBadEventCount();
-                        continue;
-                    }
-                   
-                    // Create LCSim event from EVIO data.
-                    EventHeader lcsimEvent = eventBuilder.makeLCSimEvent(evioEvent);
-
-                    // Make a new event for DriverAdapter.
-                    RecordSuppliedEvent loopEvent = new RecordSuppliedEvent(new Object(), lcsimEvent);
-
-                    // Call process methods via Driver Adapter.
-                    driverAdapter.recordSupplied(loopEvent);
-
-                    // Update the average event rate.
-                    gui.updateAverageEventRate();                    
-                    
-                    // Update elapsed time.
-                    gui.updateElapsedTime();
-                }
-                // Put events back into the ET system.
-                sys.putEvents(att, mevs);                
-            }
-        }
-        catch (Exception ex) {
-            System.out.println("Error using ET system as consumer.");
-            ex.printStackTrace();
-        }
-    }    
-}

\ No newline at end of file