Commit in java/trunk/conditions/src/main/java/org/hps/conditions on MAIN
TableConstants.java+6414 -> 415
ecal/EcalConverterRegistry.java+8-1414 -> 415
    /EcalTimeShift.java+33added 415
+47-1
1 added + 2 modified, total 3 files
work in progress on adding ECAL time shifts to conditions database (not complete yet)

java/trunk/conditions/src/main/java/org/hps/conditions
TableConstants.java 414 -> 415
--- java/trunk/conditions/src/main/java/org/hps/conditions/TableConstants.java	2014-03-28 21:55:19 UTC (rev 414)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/TableConstants.java	2014-03-28 23:32:05 UTC (rev 415)
@@ -1,9 +1,15 @@
 package org.hps.conditions;
 
 /**
+ * <p>
  * This is a static set of constants defining default table names and lookup key values for conditions data.
  * The actual table names for the conditions data are defined externally in an XML configuration file read by the 
  * {@link DatabaseConditionsManager}.
+ * </p>
+ * <p>
+ * It is possible that the key and table names are defined differently in the XML configuration, e.g. if the 
+ * name of the key is not exactly the same as the table name, but usually they are the same value.
+ * </p> 
  */
 public final class TableConstants {
     

java/trunk/conditions/src/main/java/org/hps/conditions/ecal
EcalConverterRegistry.java 414 -> 415
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConverterRegistry.java	2014-03-28 21:55:19 UTC (rev 414)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConverterRegistry.java	2014-03-28 23:32:05 UTC (rev 415)
@@ -5,9 +5,10 @@
 import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
 import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
 import org.hps.conditions.ecal.EcalGain.EcalGainCollection;
+import org.hps.conditions.ecal.EcalTimeShift.EcalTimeShiftCollection;
 
 /**
- * This is a set of data converters for ECAL conditions in the database.
+ * This is a set of data converters for ECAL conditions objects.
  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class EcalConverterRegistry {
@@ -39,4 +40,10 @@
             return EcalGainCollection.class;
         }
     }
+    
+    public static final class EcalTimeShiftConverter extends ConditionsObjectConverter<EcalTimeShift> {
+        public Class getType() {
+            return EcalTimeShiftCollection.class;
+        }
+    }
 }

java/trunk/conditions/src/main/java/org/hps/conditions/ecal
EcalTimeShift.java added at 415
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java	2014-03-28 23:32:05 UTC (rev 415)
@@ -0,0 +1,33 @@
+package org.hps.conditions.ecal;
+
+import org.hps.conditions.AbstractConditionsObject;
+import org.hps.conditions.ConditionsObjectCollection;
+
+/**
+ * This class represents a time shift calibration value for an ECAL channel.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class EcalTimeShift extends AbstractConditionsObject {
+    
+    /**
+     * A collection of {@link EcalTimeShift} objects.
+     */
+    public static class EcalTimeShiftCollection extends ConditionsObjectCollection<EcalTimeShift> {
+    }
+    
+    /**
+     * Get the channel ID.
+     * @return The ECAL channel ID.
+     */
+    public int getChannelId() {
+        return getFieldValue("ecal_channel_id");
+    }
+    
+    /**
+     * Get the time shift in nanoseconds.
+     * @return The time shift in nanoseconds.
+     */
+    public double getTimeShift() {
+        return getFieldValue("time_shift");
+    }
+}
SVNspam 0.1