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

diff -u -r1.10 -r1.11
--- EcalHitPlots.java	5 Jun 2013 19:03:48 -0000	1.10
+++ EcalHitPlots.java	25 Oct 2013 20:12:30 -0000	1.11
@@ -5,12 +5,11 @@

 import hep.aida.IPlotter;
 
 import java.util.List;

-import org.lcsim.event.CalorimeterHit;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.ecal.ECalUtils;
 import org.lcsim.util.Driver;

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

diff -u -r1.9 -r1.10
--- TriggerPlots.java	5 Jun 2013 19:03:48 -0000	1.9
+++ TriggerPlots.java	25 Oct 2013 20:12:30 -0000	1.10
@@ -5,12 +5,11 @@

 import hep.aida.IPlotter;
 
 import java.util.List;

-import org.lcsim.event.CalorimeterHit;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.monitoring.Redrawable;
 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.ecal.HPSEcalCluster;

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

diff -u -r1.10 -r1.11
--- EcalEventMonitor.java	5 Jun 2013 19:03:48 -0000	1.10
+++ EcalEventMonitor.java	25 Oct 2013 20:12:30 -0000	1.11
@@ -4,16 +4,16 @@

 import hep.aida.IPlotter;
 import hep.aida.IPlotterStyle;
 import hep.aida.ref.plotter.PlotterRegion;

+

 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;

-

 import java.util.List;

+

 import javax.swing.JCheckBox;

-import org.lcsim.event.CalorimeterHit;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.recon.ecal.HPSEcalCluster;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

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

diff -u -r1.10 -r1.11
--- EcalClusterPlots.java	5 Jun 2013 19:03:48 -0000	1.10
+++ EcalClusterPlots.java	25 Oct 2013 20:12:30 -0000	1.11
@@ -5,14 +5,13 @@

 import hep.aida.IPlotter;
 
 import java.util.List;

+

 import org.apache.commons.math.stat.StatUtils;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;

-

 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.ecal.ECalUtils;
 import org.lcsim.util.Driver;

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

diff -u -r1.7 -r1.8
--- EcalWindowPlots.java	25 Feb 2013 22:39:24 -0000	1.7
+++ EcalWindowPlots.java	25 Oct 2013 20:12:30 -0000	1.8
@@ -3,17 +3,18 @@

 import hep.aida.IHistogram1D;
 import hep.aida.IPlotter;
 import hep.aida.IPlotterStyle;

+

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

-

 import java.util.List;

+

 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.monitoring.AIDAFrame;

+import org.lcsim.hps.monitoring.deprecated.AIDAFrame;

 import org.lcsim.hps.recon.ecal.EcalConditions;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

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

diff -u -r1.3 -r1.4
--- EcalWindowEventPlots.java	5 Jun 2013 19:03:48 -0000	1.3
+++ EcalWindowEventPlots.java	25 Oct 2013 20:12:30 -0000	1.4
@@ -1,16 +1,19 @@

 package org.lcsim.hps.monitoring.ecal;
 

-import hep.aida.*;

+import hep.aida.IHistogram1D;
+import hep.aida.IPlotter;
+

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

-

 import java.util.List;

-import javax.swing.*;

+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;

 
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 

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

diff -u -r1.4 -r1.5
--- EcalWindowPlotsXY.java	8 May 2012 15:49:31 -0000	1.4
+++ EcalWindowPlotsXY.java	25 Oct 2013 20:12:30 -0000	1.5
@@ -3,10 +3,11 @@

 import hep.aida.IHistogram1D;
 import hep.aida.IPlotter;
 import hep.aida.IPlotterStyle;

+

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

-

 import java.util.List;

+

 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 

@@ -15,7 +16,7 @@

 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.compact.Subdetector;

-import org.lcsim.hps.monitoring.AIDAFrame;

+import org.lcsim.hps.monitoring.deprecated.AIDAFrame;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 

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

diff -u -r1.13 -r1.14
--- EcalPedestalPlots.java	5 Jun 2013 19:03:48 -0000	1.13
+++ EcalPedestalPlots.java	25 Oct 2013 20:12:30 -0000	1.14
@@ -1,21 +1,26 @@

 package org.lcsim.hps.monitoring.ecal;
 

-import hep.aida.*;

+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
+

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

-

 import java.util.List;

-import javax.swing.*;

+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;
 import org.lcsim.detector.identifier.Identifier;
 import org.lcsim.event.CalorimeterHit;

-

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.base.BaseRawCalorimeterHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.monitoring.Redrawable;
 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.ecal.ECalUtils;