--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditions.java	2014-04-03 16:30:49 UTC (rev 440)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditions.java	2014-04-03 16:33:33 UTC (rev 441)
@@ -97,9 +97,11 @@

         buff.append("   ");
         buff.append("noise");
         buff.append("      ");

+        buff.append("time_shift");
+        buff.append(" ");

         buff.append("bad");
         buff.append('\n');

-        for (int i=0; i<80; i++) {

+        for (int i=0; i<91; i++) {

             buff.append("-");
         }        
         buff.append('\n');

@@ -112,7 +114,8 @@

             double gain = constants.getGain().getGain();
             double pedestal = constants.getCalibration().getPedestal();
             double noise = constants.getCalibration().getNoise();

-            boolean bad = constants.isBadChannel();

+            double timeShift = constants.getTimeShift().getTimeShift();
+            boolean bad = constants.isBadChannel();            

             
             // Channel data.
             buff.append(String.format("%-5d %-6d %-6d %-8d %-6d %-6d", 

@@ -120,7 +123,7 @@

                     channel.getX(), channel.getY()));
             
             // Constants.

-            buff.append(String.format("%-10.4f %-10.4f %-10.4f ", gain, pedestal, noise));

+            buff.append(String.format("%-10.4f %-10.4f %-10.4f %-11.4f", gain, pedestal, noise, timeShift));

             
             // Bad channel.
             buff.append(bad);

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-04-03 16:30:49 UTC (rev 440)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-04-03 16:33:33 UTC (rev 441)
@@ -4,12 +4,14 @@

 import static org.hps.conditions.TableConstants.ECAL_CALIBRATIONS;
 import static org.hps.conditions.TableConstants.ECAL_CHANNELS;
 import static org.hps.conditions.TableConstants.ECAL_GAINS;

+import static org.hps.conditions.TableConstants.ECAL_TIME_SHIFTS;

 
 import org.hps.conditions.ecal.EcalBadChannel.EcalBadChannelCollection;
 import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
 import org.hps.conditions.ecal.EcalChannel.ChannelId;
 import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
 import org.hps.conditions.ecal.EcalGain.EcalGainCollection;

+import org.hps.conditions.ecal.EcalTimeShift.EcalTimeShiftCollection;

 import org.lcsim.conditions.ConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;
 

@@ -63,6 +65,16 @@

             conditions.getChannelConstants(channel).setCalibration(calibration);
         }       
         

+        // Add time shifts.
+        EcalTimeShiftCollection timeShifts =
+                manager.getCachedConditions(EcalTimeShiftCollection.class, ECAL_TIME_SHIFTS).getCachedData();
+        for (EcalTimeShift timeShift : timeShifts.getObjects()) {
+            ChannelId channelId = new ChannelId();
+            channelId.id = timeShift.getChannelId();
+            EcalChannel channel = channelMap.findChannel(channelId);
+            conditions.getChannelConstants(channel).setTimeShift(timeShift);
+        }
+        

         // Return the conditions object to caller.
         return conditions;
     }