LISTSERV 16.5 - LCD-CVS Archives

updates and additions to monitoring framework; added ECal plots; added log to file and take screenshot commands; improved error handling; refactored MonitoringExample disconnect and error handling into methods out of event loop; added shutdown callback to cleanup ET connection

+package org.lcsim.hps.monitoring; + +import hep.aida.IHistogram2D; +import hep.aida.IPlotter; +import hep.aida.IPlotterStyle; +import hep.aida.ref.plotter.PlotterRegion; + +import java.util.List; + +import org.lcsim.event.EventHeader; +import org.lcsim.event.RawCalorimeterHit; +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 { + + String ecalName = "Ecal"; + String rawCalorimeterHitCollectionName = "EcalRawHits"; + + AIDA aida = AIDA.defaultInstance(); + IPlotter plotter; + IHistogram2D cellEnergyPlot; + + IDDecoder dec; + + Detector detector; + + public EcalMonitoringPlots() + {} + + public void setRawCalorimeterHitCollectionName(String rawCalorimeterHitCollectionName) { + this.rawCalorimeterHitCollectionName = rawCalorimeterHitCollectionName; + } + + public void setEcalName(String ecalName) { + this.ecalName = ecalName; + } + + protected void detectorChanged(Detector detector) { + + this.detector = detector; + + if (detector.getSubdetector(ecalName) == null) { + throw new RuntimeException("There is no subdetector called " + ecalName + " in this detector"); + } + + // Cache the IDDecoder for the ECal. + dec = detector.getSubdetector(ecalName).getReadout().getIDDecoder(); + + // Setup the plotter. + plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECal Plots"); + + // Setup plots. + aida.tree().cd("/"); + cellEnergyPlot = aida.histogram2D("Crystal Energy", 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(cellEnergyPlot); + ((PlotterRegion)plotter.region(0)).getPlot().setAllowUserInteraction(false); + ((PlotterRegion)plotter.region(0)).getPlot().setAllowPopupMenus(false); + plotter.show(); + } + + public void process(EventHeader event) { + List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName); + for (RawCalorimeterHit hit : hits) { + dec.setID(hit.getCellID()); + cellEnergyPlot.fill(dec.getValue("ix"), dec.getValue("iy")); + } + } + + public void reset() { + plotter.hide(); + cellEnergyPlot.reset(); + detectorChanged(detector); + } +}

+package org.lcsim.hps.monitoring; + +class MonitoringExitCallback extends Thread { + + EtConnection connection; + + MonitoringExitCallback(EtConnection connection) { + this.connection = connection; + } + + public void run() { + System.out.println(this.getClass().getSimpleName() + ".run"); + connection.cleanup(); + } +}

- private JTextField etNameField; - private JTextField hostField; - private JTextField portField; - private JCheckBox blockingField; - private JCheckBox verboseField; - private JTextField statNameField; - private JTextField chunkField; - private JTextField qSizeField; - private JTextField positionField; - private JTextField ppositionField; - private JComboBox waitComboBox; - private JTextField waitTimeField; - private JTextField prescaleField;

+ JTextField etNameField; + JTextField hostField; + JTextField portField; + JCheckBox blockingField; + JCheckBox verboseField; + JTextField statNameField; + JTextField chunkField; + JTextField qSizeField; + JTextField positionField; + JTextField ppositionField; + JComboBox waitComboBox; + JTextField waitTimeField; + JTextField prescaleField;

+ MonitoringExitCallback getShutdownCallback() { + return shutdownCallback; + } + + 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 { +

- // create station - /* - if (sys.stationExists(cn.statName)) { - System.out.println("removing existing station"); - EtStation stat = sys.stationNameToObject(cn.statName); - sys.removeStation(stat); - System.out.println("station removed"); - } - */

+ + c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 4; + c.anchor = GridBagConstraints.WEST; + JLabel jobComboBoxLabel = new JLabel("Log to File:"); + jobComboBoxLabel.setHorizontalAlignment(JLabel.LEFT); + add(jobComboBoxLabel, c); + + c = new GridBagConstraints(); + c.gridx = 1; + c.gridy = 4; + c.anchor = GridBagConstraints.EAST; + logCheckBox = new JCheckBox(); + logCheckBox.setEnabled(false); + add(logCheckBox, c); + + c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 5; + c.anchor = GridBagConstraints.WEST; + JLabel logFileBoxLabel = new JLabel("Log File:"); + logFileBoxLabel.setHorizontalAlignment(JLabel.LEFT); + logFileBoxLabel.setToolTipText("Full path of log file."); + add(logFileBoxLabel, c); + + c = new GridBagConstraints(); + c.gridx = 1; + c.gridy = 5; + c.anchor = GridBagConstraints.EAST; + logFileField = new JTextField("", 30); + logFileField.setHorizontalAlignment(JLabel.RIGHT); + logFileField.setEditable(false); + logFileField.setBackground(Color.WHITE); + add(logFileField, c);

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

MonitoringApplication.java 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- MonitoringApplication.java	3 Apr 2012 18:37:04 -0000	1.6
+++ MonitoringApplication.java	4 Apr 2012 23:26:07 -0000	1.7
@@ -4,25 +4,38 @@

 import static org.lcsim.hps.monitoring.MonitoringCommands.disconnectCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.exitCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.loadConnectionCmd;

+import static org.lcsim.hps.monitoring.MonitoringCommands.logCmd;

 import static org.lcsim.hps.monitoring.MonitoringCommands.resetConnectionSettingsCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.resetDriversCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.resetEventsCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.saveConnectionCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.savePlotsCmd;

+import static org.lcsim.hps.monitoring.MonitoringCommands.screenshotCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.terminalCmd;

+import java.awt.AWTException;
+import java.awt.Dimension;

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

+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;

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

+import java.awt.image.BufferedImage;

 import java.io.File;

+import java.io.FileOutputStream;

 import java.io.IOException;

+import java.io.PrintStream;

+import javax.imageio.ImageIO;

 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;

+import javax.swing.JOptionPane;

 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;

@@ -33,15 +46,13 @@

 
 public class MonitoringApplication extends JPanel implements ActionListener {

-	private JTabbedPane tabs;
-	
-	private ConnectionPanel connectionPanel;
-	private ConnectionStatusPanel connectionStatusPanel;
-	private EventPanel eventPanel;
-	private JobPanel jobPanel;	
-	
-	private JMenuBar menuBar;

+	JTabbedPane tabs;	
+	ConnectionPanel connectionPanel;
+	ConnectionStatusPanel connectionStatusPanel;
+	EventPanel eventPanel;
+	JobPanel jobPanel;

+	JMenuBar menuBar;

 	JMenuItem connectItem;
 	JMenuItem disconnectItem;
 	JMenuItem resetConnectionItem;

@@ -51,13 +62,29 @@

 	JMenuItem resetEventsItem;
 	JMenuItem savePlotsItem;
 	JMenuItem resetDriversItem;

+	JMenuItem logItem;
+	JMenuItem terminalItem;
+	JMenuItem screenshotItem;

-	private JobControlManager mgr = null;

+	JobControlManager mgr = null;
+	
+	// Saved references to original System PrintStreams.
+	PrintStream sysOut;
+	PrintStream sysErr;
+	
+	// Current PrintStreams for logging.
+	PrintStream logOut;
+	PrintStream logErr;
+	
+	static final String screenshotFormat = "png";

 		
 	public MonitoringApplication() {

-		
-		//super(new BorderLayout());

 		super(new GridBagLayout());

+		
+		// Save system's out and err.
+		sysOut = System.out;
+		sysErr = System.err;

 								
 		// Setup the menus.
 		createMenu();

@@ -155,46 +182,39 @@

 		
 		savePlotsItem = new JMenuItem("Save Plots to AIDA File...");
 		savePlotsItem.setMnemonic(KeyEvent.VK_P);

-		savePlotsItem.setActionCommand("savePlots");

+		savePlotsItem.setActionCommand(savePlotsCmd);

 		savePlotsItem.addActionListener(this);
 		savePlotsItem.setEnabled(false);
 		jobMenu.add(savePlotsItem);		
 		
 		resetDriversItem = new JMenuItem("Reset LCSim Drivers");
 		resetDriversItem.setMnemonic(KeyEvent.VK_D);

-		resetDriversItem.setActionCommand("resetDrivers");

+		resetDriversItem.setActionCommand(resetDriversCmd);

 		resetDriversItem.addActionListener(this);
 		resetDriversItem.setEnabled(false);
 		jobMenu.add(resetDriversItem);

-	}
-	
-	public void setJobControlManager(JobControlManager mgr) {
-		this.mgr = mgr;
-	}

-	synchronized 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();
-            }
-        }
-    }

+		logItem = new JMenuItem("Log to File...");
+		logItem.setMnemonic(KeyEvent.VK_F);
+		logItem.setActionCommand(logCmd);
+		logItem.addActionListener(this);
+		logItem.setEnabled(true);
+		jobMenu.add(logItem);
+		
+		terminalItem = new JMenuItem("Log to Terminal");
+		terminalItem.setMnemonic(KeyEvent.VK_T);
+		terminalItem.setActionCommand(terminalCmd);
+		terminalItem.addActionListener(this);
+		terminalItem.setEnabled(false);
+		jobMenu.add(terminalItem);
+		
+		screenshotItem = new JMenuItem("Take a screenshot...");
+		screenshotItem.setMnemonic(KeyEvent.VK_N);
+		screenshotItem.setActionCommand(screenshotCmd);
+		screenshotItem.addActionListener(this);
+		jobMenu.add(screenshotItem);
+	}

-	synchronized void resetDrivers() {
-		if (mgr != null) {
-			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)) {

@@ -213,15 +233,118 @@

         	savePlots();
         } else if (resetDriversCmd.equals(cmd)) {
         	resetDrivers();

-        } else if (exitCmd.equals(cmd)) {

+        } else if (logCmd.equals(cmd)) {
+        	chooseLogFile();
+        } else if (terminalCmd.equals(cmd)) {
+        	logToTerminal();
+        } else if (screenshotCmd.equals(cmd)) {
+        	screenshot();
+        }
+        else if (exitCmd.equals(cmd)) {

         	exit();
         }
     }

-	private void exit() {
-		System.exit(0);

+	void setJobControlManager(JobControlManager mgr) {
+		this.mgr = mgr;
+	}
+	
+	void showDialog(String m) {
+		JOptionPane.showMessageDialog(this, m);
+	}
+	
+	/**
+	 * Sets up the frame to run the application.  
+	 * This should be called using Runnable.run() (see MonitoringExample).
+	 */
+	void start() {
+        JFrame frame = new JFrame("HPS Monitoring");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        this.setOpaque(true);
+        frame.setContentPane(this);
+        frame.setJMenuBar(menuBar);
+        frame.setResizable(false);                       
+        frame.pack();
+        frame.setVisible(true);
+    }
+	
+	ConnectionPanel getConnectionPanel() {
+		return connectionPanel;
+	}
+	
+	EventPanel getEventPanel() {
+		return eventPanel;
+	}
+	
+	JobPanel getJobPanel() {
+		return jobPanel;

+	ConnectionStatusPanel getConnectionStatusPanel() {
+		return connectionStatusPanel;
+	}
+						
+	private synchronized 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();
+            }
+        }
+    }
+	
+	private synchronized void resetDrivers() {
+		if (mgr != null) {
+			for (Driver driver : mgr.getDriverExecList()) {
+				if (driver instanceof Resettable) {
+					try {
+						((Resettable) driver).reset();
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				} 
+			}
+		}
+	 }
+	
+	private void chooseLogFile() {
+		JFileChooser fc = new JFileChooser();
+		fc.setDialogTitle("Log File");
+		int r = fc.showSaveDialog(this);
+		if (r == JFileChooser.APPROVE_OPTION) {
+			File logFile = fc.getSelectedFile();
+			if (logFile.exists()) {
+				JOptionPane.showMessageDialog(this, "Log file already exists.");
+			} else {			
+				try {
+					if (!logFile.createNewFile()) throw new IOException();
+					jobPanel.logFileField.setText(logFile.getPath());
+					jobPanel.logCheckBox.setSelected(true);
+					PrintStream ps = new PrintStream(new FileOutputStream(logFile.getPath()));
+					System.setOut(ps);
+					System.setErr(ps);
+					terminalItem.setEnabled(true);
+					logItem.setEnabled(false);
+				} catch (IOException e) {
+					JOptionPane.showMessageDialog(this, "Error creating log file.");
+				}
+			}
+		}
+	}
+	
+	private synchronized void logToTerminal() {
+		System.setOut(sysOut);
+		System.setErr(sysErr);
+		jobPanel.logFileField.setText("");
+		jobPanel.logCheckBox.setSelected(false);
+		terminalItem.setEnabled(false);
+		logItem.setEnabled(true);
+	}
+

 	synchronized void disconnect() {		
 		
 		// Enable or disable appropriate menu items.

@@ -231,10 +354,15 @@

 		connectionLoadItem.setEnabled(true);		
 		savePlotsItem.setEnabled(false);
 		resetDriversItem.setEnabled(false);

+		logItem.setEnabled(true);
+		terminalItem.setEnabled(true);

 		
 		// Re-enable the ConnectionPanel.
 		connectionPanel.enableConnectionPanel(true);

+		// Need to reset this or won't get into GUI hook at top of loop.
+		connectionPanel.setConnectRequested(false);
+

 		// Re-enable the JobPanel.
 		jobPanel.enableJobPanel(true);

@@ -246,7 +374,7 @@

 	}
 	
 	synchronized void connect() {

 		// Enable or disable appropriate menu items.
 		connectItem.setEnabled(false);
 		disconnectItem.setEnabled(true);

@@ -254,42 +382,48 @@

 		connectionLoadItem.setEnabled(false);
 		savePlotsItem.setEnabled(true);
 		resetDriversItem.setEnabled(true);

+		logItem.setEnabled(false);
+		terminalItem.setEnabled(false);

 		
 		// Disable JobPanel.
 		jobPanel.enableJobPanel(false);

+		// Reset this on connect.
+		connectionPanel.setConnectRequested(false);
+

 		// Set status.
 		connectionStatusPanel.setStatus(ConnectionStatus.CONNECTED);
 	}

-			
-	ConnectionPanel getConnectionPanel() {
-		return connectionPanel;
-	}
-	
-	EventPanel getEventPanel() {
-		return eventPanel;

+				
+	private void exit() {
+		System.exit(0);

-	
-	JobPanel getJobPanel() {
-		return jobPanel;

+		
+	private void screenshot() {
+		JFileChooser fc = new JFileChooser();
+		fc.setDialogTitle("Save Screenshot");
+		int r = fc.showSaveDialog(this);
+		if (r == JFileChooser.APPROVE_OPTION) {
+			String fileName = fc.getSelectedFile().getPath();
+			int extIndex = fileName.lastIndexOf(".");
+			if ((extIndex == -1) || !(fileName.substring(extIndex+1, fileName.length())).toLowerCase().equals(screenshotFormat)) {
+				fileName = fileName + "." + screenshotFormat;
+			} 
+			takeScreenshot(fileName);
+		}

-	ConnectionStatusPanel getConnectionStatusPanel() {
-		return connectionStatusPanel;

+	private void takeScreenshot(String fileName) {
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		Rectangle screenRectangle = new Rectangle(screenSize);
+		try {
+			Robot robot = new Robot();			
+			BufferedImage image = robot.createScreenCapture(screenRectangle);
+			ImageIO.write(image, screenshotFormat, new File(fileName));
+		} catch (AWTException e) {
+			showDialog(e.getMessage());
+		} catch (IOException e) {
+			showDialog(e.getMessage());
+		}

-			
-	/**
-	 * Sets up the frame to run the application.  
-	 * This should be called using Runnable.run() (see MonitoringExample).
-	 */
-	void start() {
-        JFrame frame = new JFrame("HPS Monitoring");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        this.setOpaque(true);
-        frame.setContentPane(this);
-        frame.setJMenuBar(menuBar);
-        frame.setResizable(false);                       
-        frame.pack();
-        frame.setVisible(true);
-    }

\ No newline at end of file

*/ // 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.

Commit in `hps-java/src/main/java/org/lcsim/hps/monitoring` on MAIN
`EcalMonitoringPlots.java`	+84		added 1.1
`MonitoringExitCallback.java`	+15		added 1.1
`ConnectionPanel.java`	+24	-16	1.10 -> 1.11
`EtConnection.java`	+39	-21	1.4 -> 1.5
`EventPanel.java`	+1	-1	1.3 -> 1.4
`JobPanel.java`	+47	-8	1.2 -> 1.3
`MonitoringApplication.java`	+205	-71	1.6 -> 1.7
`MonitoringApplicationMain.java`	+1	-1	1.1 -> 1.2
`MonitoringCommands.java`	+6	-1	1.2 -> 1.3
`MonitoringExample.java`	+127	-149	1.8 -> 1.9
`SensorOccupancyPlotsDriver.java`	+19	-12	1.9 -> 1.10
	+568	-280