22 modified files
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -17,7 +17,7 @@
import javax.swing.JLabel;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
+import org.hps.util.AIDAFrame;
import org.lcsim.hps.recon.ecal.EcalConditions;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalClusterPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalClusterPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -7,16 +7,18 @@
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.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.ECalUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import org.hps.util.Resettable;
+import org.hps.recon.ecal.ECalUtils;
+
public class EcalClusterPlots extends Driver implements Resettable {
//AIDAFrame plotterFrame;
@@ -197,4 +199,4 @@
public void endOfData() {
//plotterFrame.dispose();
}
-}
\ No newline at end of file
+}
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalDaqPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalDaqPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,11 +14,12 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.compact.Subdetector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.EcalConditions;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import org.hps.util.Resettable;
+import org.hps.conditions.deprecated.EcalConditions;
+
public class EcalDaqPlots extends Driver implements Resettable {
private String subdetectorName = "Ecal";
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalEventMonitor.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalEventMonitor.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,10 +14,11 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import org.hps.recon.ecal.HPSEcalCluster;
+
public class EcalEventMonitor extends Driver implements ItemListener {
String inputCollectionName = "EcalCalHits";
@@ -124,4 +125,4 @@
}
}
}
-}
\ No newline at end of file
+}
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalEvsX.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalEvsX.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -15,10 +15,11 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.subdetector.HPSEcal3;
import org.lcsim.geometry.subdetector.HPSEcal3.NeighborMap;
-import org.lcsim.hps.recon.ecal.EcalConditions;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import org.hps.conditions.deprecated.EcalConditions;
+
public class EcalEvsX extends Driver {
String inputCollection = "EcalClusters";
@@ -179,4 +180,4 @@
plotter.destroyRegions();
}
}
-}
\ No newline at end of file
+}
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalHitPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalHitPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -12,11 +12,12 @@
import org.lcsim.event.GenericObject;
import org.lcsim.geometry.Detector;
import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.ECalUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import org.hps.util.Resettable;
+import org.hps.recon.ecal.ECalUtils;
+
public class EcalHitPlots extends Driver implements Resettable {
//AIDAFrame plotterFrame;
@@ -265,4 +266,4 @@
public void endOfData() {
//plotterFrame.dispose();
}
-}
\ No newline at end of file
+}
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalMonitoringPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalMonitoringPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -11,8 +11,8 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Redrawable;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Redrawable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalPedestalPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalPedestalPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -21,8 +21,8 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Redrawable;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Redrawable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.ecal.ECalUtils;
import org.lcsim.hps.recon.ecal.EcalConditions;
import org.lcsim.util.Driver;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalWindowPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalWindowPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,7 +14,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
+import org.hps.util.AIDAFrame;
import org.lcsim.hps.recon.ecal.EcalConditions;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalWindowPlotsXY.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/EcalWindowPlotsXY.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -16,7 +16,7 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.compact.Subdetector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
+import org.hps.util.AIDAFrame;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/TriggerPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/ecal/TriggerPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -11,8 +11,8 @@
import org.lcsim.event.GenericObject;
import org.lcsim.geometry.Detector;
import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.monitoring.deprecated.Redrawable;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Redrawable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/BasicMonitoringPlotsDriver.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/BasicMonitoringPlotsDriver.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -6,12 +6,12 @@
import java.util.List;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/PedestalPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/PedestalPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -7,6 +7,7 @@
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
import hep.aida.ref.histogram.DataPoint;
+
import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.util.HashMap;
@@ -14,12 +15,13 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
-import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTEventInfo.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTEventInfo.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -11,7 +11,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitPulsePlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitPulsePlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -20,7 +20,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitRecoCorrelations.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitRecoCorrelations.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -22,7 +22,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitReconstructionPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTHitReconstructionPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -23,7 +23,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTPulseFitPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTPulseFitPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,7 +14,7 @@
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
import org.lcsim.hps.recon.tracking.HPSSVTConstants;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTSimpleEventDisplay.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SVTSimpleEventDisplay.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -11,7 +11,7 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.util.Driver;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -17,7 +17,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.Resettable;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/TrackTimePlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/TrackTimePlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,8 +14,8 @@
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
import org.lcsim.geometry.Detector;
import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.tracking.SvtUtils;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.util.Driver;
java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt
--- java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/TrackingReconstructionPlots.java 2014-03-26 03:10:17 UTC (rev 366)
+++ java/trunk/monitoring-drivers/src/main/java/org/lcsim/monitoring/drivers/svt/TrackingReconstructionPlots.java 2014-03-26 03:29:40 UTC (rev 367)
@@ -14,8 +14,8 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.hps.recon.vertexing.HelixConverter;
import org.lcsim.hps.recon.vertexing.StraightLineTrack;
SVNspam 0.1