hps-java/scripts

diff -u -r1.8 -r1.9
--- et_evio_file_producer_test.sh	2 Apr 2012 18:59:12 -0000	1.8
+++ et_evio_file_producer_test.sh	8 Apr 2012 23:48:11 -0000	1.9
@@ -23,8 +23,5 @@

 
 # Run it.
 prod="java -classpath $classpath org.lcsim.hps.evio.EvioFileProducer -e ${eviofile} -f ETBuffer -host $(hostname) -s 4000"

-# -d 1"
-#-s 5000"
-# -d 10"

 echo $prod
 exec $prod

hps-java/scripts

diff -u -r1.5 -r1.6
--- et_monitoring_app.sh	2 Apr 2012 18:59:12 -0000	1.5
+++ et_monitoring_app.sh	8 Apr 2012 23:48:11 -0000	1.6
@@ -19,7 +19,7 @@

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

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

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

 # -c 100"
 echo $prod
 exec $prod

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

diff -u -r1.8 -r1.9
--- ConnectionParameters.java	3 Apr 2012 18:37:04 -0000	1.8
+++ ConnectionParameters.java	8 Apr 2012 23:48:11 -0000	1.9
@@ -1,6 +1,5 @@

 package org.lcsim.hps.monitoring;
 

-import java.io.File;

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

@@ -23,8 +22,8 @@

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

-    Mode waitMode = Mode.SLEEP; 
-    int waitTime = 20000000; // microseconds

+    Mode waitMode = Mode.TIMED; 
+    int waitTime = 5000000; // wait time in microseconds

     int prescale = 1;
                    
     public ConnectionParameters() {

@@ -53,14 +52,17 @@

                 "       -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" +
                 "       -a     run in async mode which looks for immediate connection to ET system\n" +

+                "       -x     run in sleep mode\n" +

                 "       -t     time to wait for events before timing out\n\n" +
                 "       -e     set event prescaling where argument is every N events to read\n" +
                 "        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.

@@ -68,6 +70,7 @@

      * @param args
      * @return
      */

+    /*

     public void setup(String[] args) {
         for (int i = 0; i < args.length; i++) {
             if (args[i].equalsIgnoreCase("-f")) {

@@ -159,6 +162,7 @@

             throw new ConnectionParametersException("Missing required arguments.");
         }
     }

+    */

     
     public class ConnectionParametersException extends RuntimeException {
         ConnectionParametersException(String msg) {

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

diff -u -r1.1 -r1.2
--- ConnectionStatusPanel.java	27 Mar 2012 20:31:49 -0000	1.1
+++ ConnectionStatusPanel.java	8 Apr 2012 23:48:11 -0000	1.2
@@ -1,5 +1,6 @@

 package org.lcsim.hps.monitoring;
 

+import java.awt.Color;

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

@@ -7,21 +8,12 @@

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

+import org.lcsim.hps.monitoring.ConnectionStatus;
+

 class ConnectionStatusPanel extends JPanel {
 	
 	JTextField statusField;

-	
-	private static final String[] statuses = { "disconnected", "connected", "connecting", "timed out", "sleeping", "disconnecting" };
-	
-	static final class ConnectionStatus {
-		static final int DISCONNECTED = 0;
-		static final int CONNECTED = 1;
-		static final int CONNECTING = 2;
-		static final int TIMED_OUT = 3;
-		static final int SLEEPING = 4;
-		static final int DISCONNECTING = 5;
-	}
-	

+		

 	ConnectionStatusPanel() {
 		setLayout(new GridBagLayout());
 		

@@ -37,17 +29,19 @@

         c.gridx = 1;
         c.gridy = 0;
         c.anchor = GridBagConstraints.EAST;

-        statusField = new JTextField("", 12);

+        statusField = new JTextField("", 20);

         statusField.setHorizontalAlignment(JTextField.RIGHT);

+        statusField.setEditable(false);
+        statusField.setBackground(Color.WHITE);

         add(statusField, c);
         
         setStatus(ConnectionStatus.DISCONNECTED);
 	}
 	
 	public void setStatus(int idx) {

-		if (idx < 0 || idx > (statuses.length - 1)) {
-			throw new IllegalArgumentException("Invalid index value.  Must be between 0 and " + statuses.length + ".");

+		if (idx < 0 || idx > (ConnectionStatus.NUMBER_STATUSES - 1)) {
+			throw new IllegalArgumentException("Invalid index value.  Must be between 0 and " + (ConnectionStatus.NUMBER_STATUSES - 1) + ".");

 		}

-		statusField.setText(statuses[idx].toUpperCase());

+		statusField.setText(ConnectionStatus.toString(idx));

 	}
 }

\ No newline at end of file

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

diff -u -r1.2 -r1.3
--- EcalMonitoringPlots.java	5 Apr 2012 23:58:19 -0000	1.2
+++ EcalMonitoringPlots.java	8 Apr 2012 23:48:11 -0000	1.3
@@ -27,6 +27,8 @@

 	
 	Detector detector;
 	

+	int eventn = 0;
+	

 	public EcalMonitoringPlots() 
 	{}
 	

@@ -69,15 +71,18 @@

 	}	
 	
 	public void process(EventHeader event) {

-		List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName);				 
-		for (RawCalorimeterHit hit : hits) {
-			dec.setID(hit.getCellID());
-			hitCountPlot.fill(dec.getValue("ix"), dec.getValue("iy"));
-		}

+	    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() {
     	plotter.hide();

+    	plotter.destroyRegions();
+    	hitCountPlot.reset();

     }
 
     public void reset() {

@@ -85,4 +90,4 @@

     	hitCountPlot.reset();
     	detectorChanged(detector);
     }

-}

+}

\ No newline at end of file

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

diff -u -r1.5 -r1.6
--- EtConnection.java	4 Apr 2012 23:26:07 -0000	1.5
+++ EtConnection.java	8 Apr 2012 23:48:11 -0000	1.6
@@ -13,17 +13,19 @@

  */
 class EtConnection {
 	

+    ConnectionParameters param;

 	EtSystem sys;
 	EtAttachment att;
 	EtStation stat;

-	MonitoringExitCallback shutdownCallback;

-	EtConnection(EtSystem sys, EtAttachment att, EtStation stat) {

+	//boolean usable;
+	
+	private EtConnection(ConnectionParameters param, EtSystem sys, EtAttachment att, EtStation stat) {
+	    this.param = param;

 		this.sys = sys;
 		this.att = att;
 		this.stat = stat;

-		this.shutdownCallback = new MonitoringExitCallback(this);
-		Runtime.getRuntime().addShutdownHook(shutdownCallback);

+		//this.usable = true; // Assume objects come from static createEtConnection() call so should be valid.

 	}
 	
 	EtSystem getEtSystem() {

@@ -38,53 +40,68 @@

 		return stat;
 	}
 	

-	MonitoringExitCallback getShutdownCallback() {
-		return shutdownCallback;

+	ConnectionParameters getConnectionParameters() {
+	    return param;

 	}
 		
 	void cleanup() {

-		if (sys.alive()) {
-			try {
-				sys.detach(att);
-				sys.removeStation(stat);
-				sys.close();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	static EtConnection createEtConnection(ConnectionParameters cn) throws Exception {
-		
-		// make a direct connection to ET system's tcp server
-	    EtSystemOpenConfig config = new EtSystemOpenConfig(cn.etName, cn.host, cn.port);

+	    //System.out.println("cleanup");
+	    try {
+	        //System.out.println("alive");
+	        //System.out.println("wakeUpAll");
+	        sys.wakeUpAll(stat);
+	        //System.out.println("detach");
+	        sys.detach(att);
+	        //System.out.println("stat");
+	        sys.removeStation(stat);
+	        //System.out.println("close");
+	        sys.close();
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	    } 
+	    //finally {
+	    //    usable = false;
+	    //}
+	    System.out.println("done w/ cleanup");
+	}
+	
+	static EtConnection createEtConnection(ConnectionParameters cn) {
+	    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();

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

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

 	        }

-	    }
-	    // Set prescale.
-	    if (cn.prescale > 0) {
-	    	System.out.println("setting prescale to " + cn.prescale);
-	    	statConfig.setPrescale(cn.prescale);
-	    }

+	        // Set prescale.
+	        if (cn.prescale > 0) {
+	            System.out.println("setting prescale to " + cn.prescale);
+	            statConfig.setPrescale(cn.prescale);
+	        }
+
+	        // Create the station.
+	        EtStation stat = sys.createStation(statConfig, cn.statName, cn.position, cn.pposition);

-	    // Create the station.
-	    EtStation stat = sys.createStation(statConfig, cn.statName, cn.position, cn.pposition);
-	     
-	    // attach to new station
-	    EtAttachment att = sys.attach(stat);
-	    
-	    // Return new connection.
-	    return new EtConnection(sys, att, stat);

+	        // attach to new station
+	        EtAttachment att = sys.attach(stat);
+
+	        // Return new connection.
+	        return new EtConnection(cn, sys, att, stat);
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return null;
+	    }

 	}       
 }

\ No newline at end of file

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

diff -u -r1.4 -r1.5
--- EventPanel.java	4 Apr 2012 23:26:07 -0000	1.4
+++ EventPanel.java	8 Apr 2012 23:48:12 -0000	1.5
@@ -11,23 +11,30 @@

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

+import javax.swing.SwingUtilities;

 
 class EventPanel extends JPanel implements ActionListener {
 

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

+    private JTextField eventCounterField; // number of events in this job, can be reset via menu
+    private JTextField elapsedTimeField; // elapsed time between job start or reset command
+    private JTextField avgEventRateField; // average event rate in this job or between resets
+    private JTextField refreshField; // number of events to wait before updating GUI
+    private JTextField badEventsField; // number of bad events where event event processing failed
+    private JTextField sessionSuppliedField; // number of events supplied in this session, ignored by reset command
+    private JTextField totalSuppliedField; // number of events supplied since app started (this is never reset by any user command)

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

-    private static final int defaultEventRefresh = 1000;

+    private static final int defaultEventRefresh = 100;

     private int eventRefresh = defaultEventRefresh;
     
     private long jobStartTime;
     private int eventCount;
     private int badEventCount;

+    private int sessionSupplied;
+    private int totalSupplied;
+    
+    boolean updateEvent = true;

     
     EventPanel() {
 

@@ -72,7 +79,7 @@

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

-        JLabel timeLabel = new JLabel("Elapsed Time [ms]:");

+        JLabel timeLabel = new JLabel("Elapsed Time [seconds]:");

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

@@ -140,53 +147,103 @@

         badEventsField.setEditable(false);
         badEventsField.setBackground(Color.WHITE);
         fieldsPanel.add(badEventsField, c);

+        
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 5;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel sessionSuppliedLabel = new JLabel("Session Supplied Events:");
+        sessionSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(sessionSuppliedLabel, c);
+        
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 5;
+        c.anchor = GridBagConstraints.EAST;
+        sessionSuppliedField = new JTextField("0", 8);
+        sessionSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
+        sessionSuppliedField.setEditable(false);
+        sessionSuppliedField.setBackground(Color.WHITE);
+        fieldsPanel.add(sessionSuppliedField, c);
+        
+        c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 6;
+        c.anchor = GridBagConstraints.WEST;
+        JLabel totalSuppliedLabel = new JLabel("Total Supplied Events:");
+        totalSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
+        fieldsPanel.add(totalSuppliedLabel, c);
+        
+        c = new GridBagConstraints();
+        c.gridx = 1;
+        c.gridy = 6;
+        c.anchor = GridBagConstraints.EAST;
+        totalSuppliedField = new JTextField("0", 8);
+        totalSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
+        totalSuppliedField.setEditable(false);
+        totalSuppliedField.setBackground(Color.WHITE);
+        fieldsPanel.add(totalSuppliedField, c);

     }

-           
-    public int getEventCount() {
-        return eventCount;

+            
+    private int getEventRefresh() {
+    	return eventRefresh;

     }
     

-    public int getEventRefresh() {
-    	return eventRefresh;

+    public void checkUpdateEvent() {
+        updateEvent = ((eventCount % getEventRefresh()) == 0);

     }
     

-    public void updateEventCount() {

+    void updateEventCount() {

         ++eventCount;

-        if (updateEvent()) {
-            eventCounterField.setText(Integer.toString(eventCount));

+        ++sessionSupplied;
+        ++totalSupplied;
+        checkUpdateEvent();
+        if (updateEvent) {
+            Runnable r = new Runnable() {
+                public void run() {
+                    eventCounterField.setText(Integer.toString(eventCount));
+                    sessionSuppliedField.setText(Integer.toString(sessionSupplied));
+                    totalSuppliedField.setText(Integer.toString(totalSupplied));
+                }
+            };
+            SwingUtilities.invokeLater(r);

         }
     }
     

-    public void updateBadEventCount() {

+    void updateBadEventCount() {

     	++badEventCount;

-    	badEventsField.setText(Integer.toString(badEventCount));
-    }
-    
-    public void updateJobStartTime() {
-        this.jobStartTime = System.currentTimeMillis();

+    	SwingUtilities.invokeLater(new Runnable() {
+    	    public void run() {
+    	        badEventsField.setText(Integer.toString(badEventCount));
+    	    }
+    	});

     }
     

-    public boolean updateEvent() {
-        return (eventCount % getEventRefresh()) == 0; 
-    }
-    
-    public void updateAverageEventRate() {
-        if (updateEvent()) {

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

+                final double eventsPerSecond = eventCount / jobSeconds;
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        avgEventRateField.setText(rateFormat.format(eventsPerSecond));
+                    }
+                });

             }
         }
     }
         

-    public void updateElapsedTime() {    
-        if (updateEvent()) {
-            this.elapsedTimeField.setText(Long.toString(System.currentTimeMillis() - jobStartTime));

+    void updateElapsedTime() {    
+        if (updateEvent) {
+            SwingUtilities.invokeLater(new Runnable() {
+                public void run() {
+                    elapsedTimeField.setText(Long.toString((System.currentTimeMillis() - jobStartTime)/1000));                    
+                }
+            });            

         }
     }

- 

+    

     public void actionPerformed(ActionEvent e) {
         String cmd = e.getActionCommand();
         if (MonitoringCommands.resetEventsCmd.equals(cmd)) {

@@ -217,8 +274,7 @@

         resetElapsedTime();
         resetJobStartTime();
     }

-	
-    

+	    

 	private void resetEventCount() {
 		eventCount = 0;
 		eventCounterField.setText("0");

@@ -240,4 +296,9 @@

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

+	
+	void resetSessionSupplied() {
+	    this.sessionSupplied = 0;
+	    this.sessionSuppliedField.setText("0");
+	}

 }

\ No newline at end of file

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

diff -N MonitoringExample.java
--- MonitoringExample.java	6 Apr 2012 00:11:06 -0000	1.10
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,255 +0,0 @@

-package org.lcsim.hps.monitoring;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-import javax.swing.SwingUtilities;
-
-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.EvioException;
-import org.jlab.coda.jevio.EvioReader;
-import org.lcsim.event.EventHeader;
-import org.lcsim.hps.evio.LCSimEventBuilder;
-import org.lcsim.hps.evio.LCSimTestRunEventBuilder;
-import org.lcsim.hps.monitoring.ConnectionStatusPanel.ConnectionStatus;
-import org.lcsim.hps.monitoring.MonitoringApplication.JobParameters;
-import org.lcsim.job.JobControlManager;
-import org.lcsim.util.DriverAdapter;
-
-/**
- * This is an example monitoring application using the classes from the org.lcsim.hps.monitoring package. 
- * @author Jeremy McCormick
- */
-// TODO Allow interrupt of sleep mode using EtWakeUpException.  Probably need a separate thread to do this.  To
-//      set the connection status to "sleeping", would probably also need a separate thread that checks for this state.
-// TODO Calling 'Exit' on the GUI should disconnect the station properly from the ET server using a shutdown hook.
-public class MonitoringExample {
-    
-	// Default detector name.
-    static final String detectorName = "HPS-Test-JLAB-v4pt0";
-
-    // Default steering resource.
-    static final String steering = "/org/lcsim/hps/steering/TestRunMonitoring.lcsim";    
-    
-    // Default event builder.
-    static final String eventBuilderClassName = LCSimTestRunEventBuilder.class.getCanonicalName();
-    
-    // The LCSim job manager for running Drivers.
-    JobControlManager jobManager;
-    
-    // The driver adapter for wrapping event loop calls.
-    DriverAdapter driverAdapter;
-    
-    // The GUI monitoring application.
-    MonitoringApplication app;
-    
-    // The ET connection parameters.
-    EtConnection et;
-    
-    // LCSim event builder.
-    LCSimEventBuilder eventBuilder = null;
-                       
-    public MonitoringExample() 
-    {}
-        
-    public static void main(String [] args) {
-        MonitoringExample app = new MonitoringExample();
-        app.run();        
-    }
-    
-    final void createMonitoringApplication() {
-    	final MonitoringApplication app = new MonitoringApplication();
-		SwingUtilities.invokeLater(new Runnable() {
-			public void run() {
-				app.start();
-			}
-		});
-		this.app = app;
-    }
-                
-    void run()
-    {        	    	
-    	// Setup the MonitoringApplication GUI.
-    	createMonitoringApplication();
-    	
-    	// Push default settings to JobPanel.
-    	JobParameters jobParams = new JobParameters();
-    	jobParams.detectorName = detectorName;
-    	jobParams.steeringResource = steering;
-    	jobParams.eventBuilderClassName = eventBuilderClassName;
-    	app.setJobParameters(jobParams);
-    	    			    	
-    	// GUI loop.  The 'Exit' command will cause the applicatino to quit.
-    	while (true) {
-    		
-    		// Wait for connection request from GUI.
-    		while (!app.connectionRequested()) {
-    			try { Thread.sleep(1000); } catch (InterruptedException e)  {};
-    		}        
-    		ConnectionParameters cn = app.getConnectionParameters();
-    		    		    		
-    		// Make sure applicable menu items are enabled or disabled.
-    		app.setConnected();
-    		
-    		// Setup LCSim.
-    		try {
-    			setupLCSim();
-    		} catch (Exception e) {
-    			app.error(e, "Failed to setup LCSim.  You will be disconnected.");
-				continue;
-    		}
-    		
-    		// Try block is mostly for EtExceptions and friends.
-    		try {        	
-    			    			    			    			    			        			
-    			// Array of events.
-    			EtEvent[] mevs = null;
-    			
-    			// Parameters for getting events from ET server.
-    			Mode waitMode = cn.waitMode;
-    			int waitTime = cn.waitTime;
-    			int chunk = cn.chunk;
-    			
-    			// Setup connection to ET system.
-    			et = EtConnection.createEtConnection(cn);
-    			EtSystem sys = et.getEtSystem();
-    			EtAttachment att = et.getEtAttachment();
-    			
-    			// Set reference to EtConnection in GUI.
-    			app.setEtConnection(et);
-    			
-    			// Starts the job in the GUI, which is set of events processed in one session.
-    			app.startJob();
-    			
-    			// EtEvent loop.
-    			while (true) { 
-    				try {
-    					
-    					// Get EtEvents.
-    					mevs = sys.getEvents(att, waitMode, Modify.NOTHING, waitTime, chunk);
-    					
-    					// Loop over retrieved EtEvents.
-    					for (EtEvent mev : mevs) {
-    						                        					
-    						// Create EvioEvent from EtEvent and skip if failed.
-    						EvioEvent evioEvent = createEvioEvent(mev);
-    						if (evioEvent == null) {
-    							app.badEvent();
-    							continue;
-    						}
-    						
-    						// Start of event GUI hook.
-    						app.startEvent();
-    						    							    						
-    						// Create LCSim event from EVIO data.
-    						EventHeader lcsimEvent = eventBuilder.makeLCSimEvent(evioEvent);
-
-    						// Supply record to Driver Adapter.
-    						try {
-    							driverAdapter.recordSupplied(new RecordSuppliedEvent(new Object(), lcsimEvent));
-    						} catch (Exception e) {
-    							e.printStackTrace();
-    						}
-    						
-    						// End of event GUI hook.
-    						app.endEvent();
-    					}
-
-    					// Put events back into the ET system.
-    					sys.putEvents(att, mevs);   
-    					
-    					// User requested disconnect in GUI. 
-    					if (app.disconnectRequested()) {    						
-    						app.disconnect(ConnectionStatus.DISCONNECTING);
-    						break;
-    					}
-    				// The session timed out.
-    				} catch (EtTimeoutException e) {
-    					app.disconnect(ConnectionStatus.TIMED_OUT);
-    					break;
-    				}
-    			}
-    		// Top-level exception catcher.
-    		} catch (Exception e) {
-    			app.error(e, null);
-    		}
-    	}      
-    }
-
-	private EvioEvent createEvioEvent(EtEvent etEvent) throws IOException, EvioException {
-		ByteBuffer buf = etEvent.getDataBuffer();
-		EvioReader reader = new EvioReader(buf);
-		EvioEvent evioEvent = null;
-		try {
-			evioEvent = reader.parseNextEvent();
-		} catch (java.nio.BufferUnderflowException e) {
-			e.printStackTrace();
-		}
-		return evioEvent;
-	}
-
-	private void setupLCSim() {
-								
-		// Reset the DriverAdapter.
-		driverAdapter = null;
-		
-		if (!app.validSteering())
-			throw new RuntimeException("Invalid steering file or resource.");
-			
-		// Get steering resource or file.
-		String steering = app.getSteering();
-
-		// Try to setup LCSim.  If it fails, we get disconnected.
-		try {				
-			// Create job manager and configure based on steering type of resource or file.
-			jobManager = new JobControlManager();
-			jobManager.checkInputFiles(false);
-			if (app.getSteeringType() == JobPanel.RESOURCE) {
-				InputStream is = this.getClass().getResourceAsStream(steering);
-				jobManager.setup(is);
-			} else if (app.getSteeringType() == JobPanel.FILE) {
-				jobManager.setup(new File(steering));
-			} 
-
-			// Set job manager in GUI so resetting Drivers works.
-			app.setJobControlManager(jobManager);
-
-			// Make a DriverAdapter for wrapping the event loop calls.
-			driverAdapter = jobManager.getDriverAdapter();
-			
-			// Call startOfData() on DriverAdapter, which initializes conditions system.
-			driverAdapter.configure(null);
-
-			// Set reference to DriverAdapter in GUI so it can disconnect cleanly.
-			app.setDriverAdapter(driverAdapter);
-			
-		} catch (Exception e) {
-			throw new RuntimeException("Failed to setup LCSim.", e);
-		}
-		
-		// Reset reference to event builder.
-		eventBuilder = null;
-		
-		// Setup the EventBuilder class.
-		String eventBuilderClassName = app.getEventBuilderClassName();
-		try {
-			eventBuilder = (LCSimEventBuilder)Class.forName(eventBuilderClassName).newInstance();
-		} catch (Exception e) {			
-			throw new RuntimeException("Failed to create LCSimEventBuilder class.", e);
-		}			
-		if (eventBuilder == null)
-			throw new RuntimeException("LCSimEventBuilder points to null");
-		
-		// Set the detector name on the event builder so it can find conditions data.
-		eventBuilder.setDetectorName(app.getDetectorName());
-	}	
-}

\ No newline at end of file