hps-java/scripts

diff -u -r1.2 -r1.3
--- et_monitoring_app.sh	25 Mar 2012 07:28:50 -0000	1.2
+++ et_monitoring_app.sh	26 Mar 2012 21:08:20 -0000	1.3
@@ -19,6 +19,7 @@

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

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

+prod="java -classpath "$classpath" org.lcsim.hps.monitoring.MonitoringConsumer"
+# -c 100"

 echo $prod
 exec $prod

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

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

+package org.lcsim.hps.monitoring;
+
+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.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 {
+
+    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;
+   
+    // Refresh every 1000 events by default.
+    private int eventRefresh = 1000;
+    
+    private long jobStartTime;
+    private int eventCount;
+    private int badEventCount;
+    
+    EventPanel() {
+
+        setLayout(new GridBagLayout());
+
+        GridBagConstraints c = new GridBagConstraints();
+
+        // Panel for labels and values.
+        c.gridx = 0;
+        c.gridy = 0;
+        JPanel fieldsPanel = new JPanel();
+        fieldsPanel.setLayout(new GridBagLayout());
+        add(fieldsPanel, c);
+
+        // Panel for control buttons.
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 1;
+        JPanel buttonsPanel = new JPanel();
+        buttonsPanel.setLayout(new GridBagLayout());
+        add(buttonsPanel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 0;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel eventLabel = new JLabel("Events Processed: ");
+        eventLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(eventLabel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 0;
+        c.anchor = GridBagConstraints.EAST;
+        eventCounterField = new JTextField("0", 6);
+        eventCounterField.setHorizontalAlignment(JTextField.RIGHT);
+        eventCounterField.setEditable(false);
+        eventCounterField.setBackground(Color.WHITE);
+        fieldsPanel.add(eventCounterField, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 1;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel timeLabel = new JLabel("Elapsed Time [ms]:");
+        timeLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(timeLabel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 1;
+        c.anchor = GridBagConstraints.EAST;
+        elapsedTimeField = new JTextField("0", 10);
+        elapsedTimeField.setHorizontalAlignment(JTextField.RIGHT);
+        elapsedTimeField.setEditable(false);
+        elapsedTimeField.setBackground(Color.WHITE);
+        fieldsPanel.add(elapsedTimeField, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 2;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel avgRateLabel = new JLabel("Average Event Rate [Hz]:");
+        avgRateLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(avgRateLabel, c);
+
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 2;
+        c.anchor = GridBagConstraints.EAST;
+        avgEventRateField = new JTextField("0", 6);
+        avgEventRateField.setHorizontalAlignment(JTextField.RIGHT);
+        avgEventRateField.setEditable(false);
+        avgEventRateField.setBackground(Color.WHITE);
+        fieldsPanel.add(avgEventRateField, c);
+        
+        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);
+        
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 4;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel badEventsLabel = new JLabel("Bad Events:");
+        badEventsLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(badEventsLabel, c);
+        
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 4;
+        c.anchor = GridBagConstraints.EAST;
+        badEventsField = new JTextField("0", 4);
+        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);
+    }
+    
+    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());
+    }
+    
+    public void updateEventCount() {
+        ++eventCount;
+        if (updateEvent()) {
+            eventCounterField.setText(Integer.toString(eventCount));
+        }
+    }
+    
+    public void updateBadEventCount() {
+    	++badEventCount;
+    	badEventsField.setText(Integer.toString(badEventCount));
+    }
+    
+    public void updateJobStartTime() {
+        this.jobStartTime = System.currentTimeMillis();
+    }
+    
+    public boolean updateEvent() {
+        return (eventCount % getEventRefresh()) == 0; 
+    }
+    
+    public void updateAverageEventRate() {
+        if (updateEvent()) {
+            double jobTime = System.currentTimeMillis() - jobStartTime;
+            if (jobTime > 0) {
+                double jobSeconds = jobTime / 1000;
+                double eventsPerSecond = eventCount / jobSeconds;
+                avgEventRateField.setText(rateFormat.format(eventsPerSecond));
+            }
+        }
+    }
+        
+    public void updateElapsedTime() {    
+        if (updateEvent()) {
+            this.elapsedTimeField.setText(Long.toString(System.currentTimeMillis() - jobStartTime));
+        }
+    }
+        
+    private void resetEventCount() {
+        eventCount = 0;
+        eventCounterField.setText("0");
+    }
+    
+    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();
+    }
+    
+    private void resetAverageEventRate() {
+        avgEventRateField.setText("0");
+    }
+    
+    private void resetBadEventCount() {
+    	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)) {
+            reset();
+        } else if ("save".equals(cmd)) {
+            save();
+        } else if ("quit".equals(cmd)) {
+            quit();
+        }
+    }
+
+    private void reset() {
+        resetDrivers();
+        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

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

diff -u -r1.3 -r1.4
--- ConnectionParameters.java	25 Mar 2012 08:55:11 -0000	1.3
+++ ConnectionParameters.java	26 Mar 2012 21:08:20 -0000	1.4
@@ -1,9 +1,15 @@

 package org.lcsim.hps.monitoring;
 

+import java.io.File;

 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.

@@ -21,7 +27,7 @@

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

-    

+               

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

@@ -50,7 +56,10 @@

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

-

+    
+    public void loadPropertiesFile(File propFile) {    	
+    }
+    

     /**
      * Setup this ConnectionParameters object from command line arguments.
      * 

@@ -137,4 +146,20 @@

             super(msg);
         }
     }

+               
+    public String toString() {
+    	StringBuffer buf = new StringBuffer();
+    	buf.append("etName: " + etName + '\n');
+    	buf.append("host: " + host + '\n');
+    	buf.append("port: " + port + '\n');
+    	buf.append("blocking: " + blocking + '\n');
+    	buf.append("verbose: " + verbose + '\n');
+    	buf.append("statName: " + statName + '\n');
+    	buf.append("chunk: " + chunk + '\n');
+    	buf.append("qSize: " + qSize + '\n');
+    	buf.append("position: " + position + '\n');
+    	buf.append("pposition: " + pposition + '\n');
+    	buf.append("flowMode: " + flowMode + '\n');
+    	return buf.toString();
+    }

 }

\ No newline at end of file

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

diff -u -r1.3 -r1.4
--- MonitoringConsumer.java	25 Mar 2012 08:55:11 -0000	1.3
+++ MonitoringConsumer.java	26 Mar 2012 21:08:20 -0000	1.4
@@ -6,12 +6,8 @@

 
 import org.freehep.record.loop.event.RecordSuppliedEvent;
 import org.jlab.coda.et.EtAttachment;

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

 import org.jlab.coda.et.EtEvent;

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

 import org.jlab.coda.et.EtSystem;

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

 import org.jlab.coda.et.enums.Mode;
 import org.jlab.coda.et.enums.Modify;
 import org.jlab.coda.et.exception.EtTimeoutException;

@@ -19,7 +15,6 @@

 import org.jlab.coda.jevio.EvioReader;
 import org.lcsim.event.EventHeader;
 import org.lcsim.hps.evio.LCSimEventBuilder;

-import org.lcsim.hps.monitoring.ConnectionParameters.ConnectionParametersException;

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 import org.lcsim.util.DriverAdapter;

@@ -40,57 +35,44 @@

     //private static final String lcsimXml = "/org/lcsim/hps/steering/EtTest.lcsim";
     private static final String lcsimXml = "/org/lcsim/hps/steering/EtSensorOccupancy.lcsim";
 

-    private MonitoringGui gui;

+    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(args);
+        app.run();        

     }
                 

-    public void run(String[] args) {
-        
-        boolean debug = false;

+    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();

-        // Create ET system connection parameters.
-        ConnectionParameters cn = new ConnectionParameters();
-        try {
-            cn.setup(args);
-        } catch (ConnectionParametersException e) {
-            e.printStackTrace();
-            ConnectionParameters.usage();
-            System.exit(1);
-        }
-
-        try {
-            // make a direct connection to ET system's tcp server
-            EtSystemOpenConfig config = new EtSystemOpenConfig(cn.etName, cn.host, cn.port);
-
-            // create ET system object with verbose debugging output
-            EtSystem sys = new EtSystem(config, EtConstants.debugInfo);
-            sys.open();
-
-            // configuration of a new station
-            EtStationConfig statConfig = new EtStationConfig();
-            statConfig.setFlowMode(cn.flowMode);
-            if (!cn.blocking) {
-                statConfig.setBlockMode(EtConstants.stationNonBlocking);
-                if (cn.qSize > 0) {
-                    statConfig.setCue(cn.qSize);
-                }
-            }
-
-            // create station
-            EtStation stat = sys.createStation(statConfig, cn.statName, cn.position, cn.pposition);
-
-            // attach to new station
-            EtAttachment att = sys.attach(stat);
-                                                                       

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

@@ -113,15 +95,7 @@

             // Make the builder for creating LCSim events from EVIO data.
             LCSimEventBuilder eventBuilder = new LCSimEventBuilder(detectorName);
             eventBuilder.setDebug(false);

-                                    
-            // Show GUI.
-            MonitoringGui.main(new String[]{});
-            Thread.sleep(2000);
-            gui = MonitoringGui.getMonitoringGui();
-            gui.setJobControlManager(jobMgr);             
-            
-            //ConnectionPanel.main(new String[]{});
-

+                                                

             // Start job timer.
             gui.updateJobStartTime();
 

@@ -160,13 +134,10 @@

                     try {
                         evioEvent = reader.parseNextEvent();
                     } catch (java.nio.BufferUnderflowException e) {

-                   //     if (debug)
-                        System.err.println("Caught underflow!");

+                    	// Error will be caught by subsequent check on null event.

                     }

-                    // We silently skip bad events (for now).

                     if (evioEvent == null) {

-                        //if (debug)
-                        System.err.println("Failed to build EVIO event.  Skipping this EtEvent!");

+                    	gui.updateBadEventCount();

                         continue;
                     }
                    

@@ -193,5 +164,5 @@

             System.out.println("Error using ET system as consumer.");
             ex.printStackTrace();
         }

-    }

+    }    

 }

\ No newline at end of file

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

diff -N MonitoringGui.java
--- MonitoringGui.java	25 Mar 2012 08:55:11 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,304 +0,0 @@

-package org.lcsim.hps.monitoring;
-
-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.JPanel;
-import javax.swing.JTextField;
-
-import org.lcsim.job.JobControlManager;
-import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
-
-public class MonitoringGui extends JPanel implements ActionListener {
-
-    private JTextField eventCounterField;
-    private JTextField elapsedTimeField;
-    private JTextField avgEventRateField;
-    private JTextField refreshField;
-    private DecimalFormat rateFormat = new DecimalFormat("#.##");
-
-    private JButton resetButton;
-    private JButton saveButton;
-    private JButton quitButton;
-    
-    private static JobControlManager jobMgr;    
-    private static MonitoringGui monitoringGui;
-   
-    // Refresh every 1000 events by default.
-    private int eventRefresh = 1000;
-    
-    private long jobStartTime;
-    private int eventCount;
-    
-    MonitoringGui() {
-
-        setLayout(new GridBagLayout());
-
-        GridBagConstraints c = new GridBagConstraints();
-
-        // Panel for labels and values.
-        c.gridx = 0;
-        c.gridy = 0;
-        JPanel fieldsPanel = new JPanel();
-        fieldsPanel.setLayout(new GridBagLayout());
-        add(fieldsPanel, c);
-
-        // Panel for control buttons.
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 1;
-        JPanel buttonsPanel = new JPanel();
-        buttonsPanel.setLayout(new GridBagLayout());
-        add(buttonsPanel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 0;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel eventLabel = new JLabel("Events Processed: ");
-        eventLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(eventLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 0;
-        c.anchor = GridBagConstraints.EAST;
-        eventCounterField = new JTextField("0", 6);
-        eventCounterField.setHorizontalAlignment(JTextField.RIGHT);
-        eventCounterField.setEditable(false);
-        eventCounterField.setBackground(Color.WHITE);
-        fieldsPanel.add(eventCounterField, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 1;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel timeLabel = new JLabel("Elapsed Time [ms]:");
-        timeLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(timeLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 1;
-        c.anchor = GridBagConstraints.EAST;
-        elapsedTimeField = new JTextField("0", 10);
-        elapsedTimeField.setHorizontalAlignment(JTextField.RIGHT);
-        elapsedTimeField.setEditable(false);
-        elapsedTimeField.setBackground(Color.WHITE);
-        fieldsPanel.add(elapsedTimeField, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 2;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel avgRateLabel = new JLabel("Average Event Rate [Hz]:");
-        avgRateLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(avgRateLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 2;
-        c.anchor = GridBagConstraints.EAST;
-        avgEventRateField = new JTextField("0", 6);
-        avgEventRateField.setHorizontalAlignment(JTextField.RIGHT);
-        avgEventRateField.setEditable(false);
-        avgEventRateField.setBackground(Color.WHITE);
-        fieldsPanel.add(avgEventRateField, c);
-        
-        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);
-        
-        // 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);
-    }
-    
-    public static MonitoringGui getMonitoringGui() {
-        return MonitoringGui.monitoringGui;
-    }
-   
-    public void setJobControlManager(JobControlManager jobMgr) {
-        MonitoringGui.jobMgr = jobMgr;
-    }
-    
-    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 updateJobStartTime() {
-        this.jobStartTime = System.currentTimeMillis();
-    }
-    
-    public boolean updateEvent() {
-        return (eventCount % getEventRefresh()) == 0; 
-    }
-    
-    public void updateAverageEventRate() {
-        if (updateEvent()) {
-            double jobTime = System.currentTimeMillis() - jobStartTime;
-            if (jobTime > 0) {
-                double jobSeconds = jobTime / 1000;
-                double eventsPerSecond = eventCount / jobSeconds;
-                avgEventRateField.setText(rateFormat.format(eventsPerSecond));
-            }
-        }
-    }
-        
-    public void updateElapsedTime() {    
-        if (updateEvent()) {
-            this.elapsedTimeField.setText(Long.toString(System.currentTimeMillis() - jobStartTime));
-        }
-    }
-        
-    private void resetEventCount() {
-        eventCount = 0;
-        eventCounterField.setText("0");
-    }
-    
-    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();
-    }
-    
-    private void resetAverageEventRate() {
-        avgEventRateField.setText("0");
-    }
-
-    public static void createAndShow() {
-        JFrame frame = new JFrame("HPS Monitoring GUI");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        monitoringGui = new MonitoringGui();
-        monitoringGui.setOpaque(true);
-        frame.setContentPane(monitoringGui);
-
-        frame.pack();
-        frame.setVisible(true);
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        String cmd = e.getActionCommand();
-        if ("reset".equals(cmd)) {
-            reset();
-        } else if ("save".equals(cmd)) {
-            save();
-        } else if ("quit".equals(cmd)) {
-            quit();
-        }
-    }
-
-    private void reset() {
-        resetDrivers();
-        resetEventCount();
-        resetAverageEventRate();
-        resetElapsedTime();
-        resetJobStartTime();
-    }
-
-    private void save() {
-        JFileChooser fc = new JFileChooser();
-        int r = fc.showSaveDialog(MonitoringGui.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