Author: [log in to unmask]
Date: Sat Jan 3 15:51:39 2015
New Revision: 1839
Log:
Remove import of removed Resettable interface.
Modified:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java
java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java
java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java
java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java
java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java
java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java Sat Jan 3 15:51:39 2015
@@ -13,7 +13,6 @@
import java.util.logging.Logger;
//===> import org.hps.conditions.deprecated.SvtUtils;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java Sat Jan 3 15:51:39 2015
@@ -16,7 +16,6 @@
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java Sat Jan 3 15:51:39 2015
@@ -18,7 +18,6 @@
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java Sat Jan 3 15:51:39 2015
@@ -16,7 +16,6 @@
import org.hps.conditions.deprecated.HPSSVTConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
-import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java Sat Jan 3 15:51:39 2015
@@ -11,7 +11,6 @@
import java.util.List;
import java.util.Map;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.SiSensor;
@@ -182,4 +181,4 @@
occupancyMap.put(sensor.getName(), new int[640]);
}
}
-}
+}
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java Sat Jan 3 15:51:39 2015
@@ -9,9 +9,7 @@
import java.util.List;
-//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.ecal.TriggerData;
-import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java Sat Jan 3 15:51:39 2015
@@ -25,7 +25,6 @@
import org.hps.recon.tracking.ShaperFitAlgorithm;
import org.hps.recon.tracking.StraightLineTrack;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java Sat Jan 3 15:51:39 2015
@@ -11,7 +11,6 @@
import org.hps.readout.ecal.TriggerData;
import org.hps.readout.ecal.SSPData;
import org.hps.recon.ecal.ECalUtils;
-import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -330,4 +329,4 @@
}
-
+
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java Sat Jan 3 15:51:39 2015
@@ -11,7 +11,6 @@
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.ecal.ECalUtils;
import org.hps.util.Redrawable;
-import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -29,8 +28,6 @@
* @author Andrea Celentano
*
*/
-// FIXME: Resettable and Redrawable are no longer handled by the monitoring application
-// so those hooks should be removed or the functionality achieved some other way.
public class EcalMonitoringPlots extends Driver implements Redrawable {
String inputCollection = "EcalReadoutHits";
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java Sat Jan 3 15:51:39 2015
@@ -1,24 +1,18 @@
package org.hps.users.celentan;
-
import java.util.List;
-
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
import org.hps.readout.ecal.TriggerData;
import org.hps.readout.ecal.SSPData;
import org.hps.recon.ecal.ECalUtils;
-import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
-
-
public class DummyDriverRaw extends Driver{
@@ -66,4 +60,4 @@
}
}
-}
+}
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java Sat Jan 3 15:51:39 2015
@@ -15,7 +15,6 @@
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
-import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java Sat Jan 3 15:51:39 2015
@@ -16,7 +16,6 @@
import java.util.logging.Logger;
import org.hps.readout.ecal.ReadoutTimestamp;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.SiSensor;
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java Sat Jan 3 15:51:39 2015
@@ -21,7 +21,6 @@
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
-import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java Sat Jan 3 15:51:39 2015
@@ -12,7 +12,6 @@
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.Resettable;
//--- org.lcsim ---//
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java Sat Jan 3 15:51:39 2015
@@ -24,7 +24,6 @@
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
import org.hps.util.Redrawable;
-import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java Sat Jan 3 15:51:39 2015
@@ -21,7 +21,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.readout.ecal.TriggerData;
import org.hps.util.Redrawable;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java Sat Jan 3 15:51:39 2015
@@ -22,7 +22,6 @@
import org.hps.recon.tracking.ShaperFitAlgorithm;
import org.hps.recon.tracking.StraightLineTrack;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java Sat Jan 3 15:51:39 2015
@@ -7,7 +7,6 @@
import java.util.List;
-import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.geometry.Detector;
