--- java/sandbox/ecal-readout-sim/src/main/java/org/hps/readout/ecal/EcalReadoutDriver.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/ecal-readout-sim/src/main/java/org/hps/readout/ecal/EcalReadoutDriver.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -5,7 +5,6 @@

 
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;

-import org.lcsim.hps.util.ClockSingleton;

 import org.lcsim.lcio.LCIOConstants;
 
 /**

--- java/sandbox/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -11,7 +11,6 @@

 
 import org.hps.recon.ecal.TriggerData;
 import org.lcsim.event.EventHeader;

-import org.lcsim.hps.util.ClockSingleton;

 import org.lcsim.lcio.LCIOWriter;
 
 /**

--- java/sandbox/tracking/src/main/java/org/hps/recon/tracking/SimpleSvtReadout.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/tracking/src/main/java/org/hps/recon/tracking/SimpleSvtReadout.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -11,6 +11,7 @@

 import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
 import org.hps.conditions.deprecated.HPSSVTConstants;
 import org.hps.conditions.deprecated.SvtUtils;

+import org.hps.readout.ecal.ClockSingleton;

 import org.hps.readout.ecal.ReadoutTimestamp;
 import org.hps.readout.ecal.TriggerableDriver;
 //--- lcsim ---//

@@ -23,7 +24,6 @@

 import org.lcsim.event.base.BaseLCRelation;
 import org.lcsim.event.base.BaseRawTrackerHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.util.ClockSingleton;

 import org.lcsim.hps.util.RandomGaussian;
 import org.lcsim.lcio.LCIOConstants;
 import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;

--- java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/Apv25Full.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/Apv25Full.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -2,9 +2,8 @@

 
 //--- Constants ---//
 import org.hps.conditions.deprecated.HPSSVTConstants;

-//--- hps-java ---//
-import org.lcsim.hps.util.ClockSingleton;
-import org.lcsim.hps.util.RingBuffer;

+import org.hps.readout.ecal.ClockSingleton;
+import org.hps.readout.ecal.RingBuffer;

 
 /**
  * 

--- java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSAPV25.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSAPV25.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -4,11 +4,11 @@

 import java.util.HashMap;
 import java.util.Map;
 

+import org.hps.readout.ecal.ClockSingleton;
+import org.hps.readout.ecal.RingBuffer;

 //--- org.lcsim ---//
 import org.hps.recon.tracking.apv25.HPSAPV25.APV25Channel.APV25AnalogPipeline;
 //--- hps-java ---//

-import org.lcsim.hps.util.ClockSingleton;
-import org.lcsim.hps.util.RingBuffer;

 import org.lcsim.util.aida.AIDA;
 
 /**

--- java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSSiSensorReadout.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSSiSensorReadout.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -21,6 +21,7 @@

 import org.apache.commons.math.distribution.NormalDistribution;
 import org.apache.commons.math.distribution.NormalDistributionImpl;
 import org.hps.conditions.deprecated.SvtUtils;

+import org.hps.readout.ecal.ClockSingleton;

 //--- hps-java ---//
 import org.hps.recon.tracking.apv25.HPSAPV25.APV25Channel.APV25AnalogPipeline;
 //--- org.lcsim ---//

@@ -29,7 +30,6 @@

 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.util.ClockSingleton;

 import org.lcsim.math.probability.Erf;
 import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
 import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeData;

--- java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/SvtReadout.java	2014-03-26 01:28:51 UTC (rev 356)
+++ java/sandbox/tracking/src/main/java/org/hps/recon/tracking/apv25/SvtReadout.java	2014-03-26 01:29:36 UTC (rev 357)
@@ -17,13 +17,13 @@

 
 import org.hps.conditions.deprecated.HPSSVTConstants;
 import org.hps.conditions.deprecated.SvtUtils;

+import org.hps.readout.ecal.ClockSingleton;

 //--- lcsim ---//
 import org.lcsim.detector.tracker.silicon.ChargeCarrier;
 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.util.ClockSingleton;

 import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
 import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeData;
 import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeDataCollection;