--- java/trunk/conditions/src/main/java/org/hps/conditions/BasicConditionsObjectFactory.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/BasicConditionsObjectFactory.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,7 +1,6 @@

 package org.hps.conditions;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

 
 /**
  * The basic implementation of the {@link ConditionsObjectFactory} interface.

@@ -50,10 +49,19 @@

         return (T)newObject;
     }   
     

+    /**
+     * Get the <code>ConditionsTableRegistry</code> that will be used by the factory to get
+     * table meta data.
+     * @return The conditions table registry.
+     */

     public ConditionsTableRegistry getTableRegistry() {
         return _tableRegistry;
     }
     

+    /**
+     * Get table meta data by name from the registry.
+     * @return The table meta data or null if does not exist.
+     */

     public ConditionsTableMetaData getTableMetaData(String name) {
         return _tableRegistry.getTableMetaData(name);
     }

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsConstants.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsConstants.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,55 +0,0 @@

-package org.hps.conditions;
-
-/**
- * Constants for HPS conditions system, such as conditions set key names.
- */
-public final class ConditionsConstants {
-    
-    /** Prevent instantiation of this class, which is only a holder of static constant values. */
-    private ConditionsConstants() {}
-    
-    /** Conditions key for ConditionsRecord. */
-    public static final String CONDITIONS_RECORD = "conditions_record";
-
-    /** Conditions key for combined ECal conditions. */
-    public static final String ECAL_CONDITIONS = "ecal_conditions";
-    
-    /** Table with ECal channel data. */
-    public static final String ECAL_CHANNELS = "ecal_channels";
-
-    /** Conditions key for ECal gain data. */
-    public static final String ECAL_GAINS = "ecal_gains";
-    
-    /** Conditions key for ECal bad channel set. */
-    public static final String ECAL_BAD_CHANNELS = "ecal_bad_channels";
-    
-    /** Conditions key for ECal calibration information. */
-    public static final String ECAL_CALIBRATIONS = "ecal_calibrations";
-    
-    /** Conditions key for combined ECal conditions. */
-    public static final String SVT_CONDITIONS = "svt_conditions";
-    
-    /** Table with SVT channel data. */
-    public static final String SVT_CHANNELS = "svt_channels";
-    
-    /** Table with the SVT DAQ map. */
-    public static final String SVT_DAQ_MAP = "svt_daq_map";
-            
-    /** Conditions key for SVT calibration data. */ 
-    public static final String SVT_CALIBRATIONS = "svt_calibrations";
-    
-    /** Conditions key for SVT bad channels. */
-    public static final String SVT_BAD_CHANNELS = "svt_bad_channels";
-    
-    /** Conditions key for SVT pulse parameters. */
-    public static final String SVT_PULSE_PARAMETERS = "svt_pulse_parameters";
-    
-    /** Conditions key for SVT gain data. */
-    public static final String SVT_GAINS = "svt_gains";
-    
-    /** Conditions key for SVT time shifts by sensor. */
-    public static final String SVT_TIME_SHIFTS = "svt_time_shifts";
-    
-    /** Conditions key for integrated beam current. */
-    public static final String BEAM_CURRENT = "beam_current";
-}

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -8,8 +8,8 @@

 import org.hps.conditions.svt.SvtConditionsLoader;
 import org.lcsim.util.Driver;
 

-import static org.hps.conditions.ConditionsConstants.SVT_CONDITIONS;
-import static org.hps.conditions.ConditionsConstants.ECAL_CONDITIONS;

+import static org.hps.conditions.ConditionsTableConstants.SVT_CONDITIONS;
+import static org.hps.conditions.ConditionsTableConstants.ECAL_CONDITIONS;

 
 /**
  * This {@link org.lcsim.util.Driver} loads conditions onto an HPS detector.

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -133,12 +133,7 @@

      */
     void setIsReadOnly();
     

-    /**
-     * Generic Exception type throw by methods in this interface.
-     */
-    public static final class ConditionsObjectException extends Exception {
-        public ConditionsObjectException(String message) {
-            super(message);
-        }
-    }    

+    // String getTableName();
+    
+    // String[] getFieldNames();

 }

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -5,8 +5,6 @@

 import java.util.Collections;
 import java.util.List;
 

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;
-

 public class ConditionsObjectCollection<T extends ConditionsObject> {
 
     List<T> objects = new ArrayList<T>();    

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectException.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectException.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -0,0 +1,23 @@

+package org.hps.conditions;
+
+/**
+ * Generic Exception type throw by methods of {@link ConditionsObject}
+ * or other associated classes such as converters and collections.
+ */
+@SuppressWarnings("serial")
+public final class ConditionsObjectException extends Exception {
+
+    ConditionsObject _object;
+
+    public ConditionsObjectException(String message) {
+        super(message);
+    }
+
+    public ConditionsObjectException(ConditionsObject object, String message) {
+        super(message);
+    }
+
+    public ConditionsObject getConditionsObject() {
+        return _object;
+    }
+}

\ No newline at end of file

--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -28,4 +28,8 @@

     protected void setObjectFactory(ConditionsObjectFactory objectFactory) {
         _objectFactory = objectFactory;
     }               

+    
+    public final ConditionsTableMetaData getTableMetaData(String tableName) {
+        return _objectFactory.getTableRegistry().getTableMetaData(tableName);
+    }

 }

\ No newline at end of file

--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsReader.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsReader.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -111,7 +111,7 @@

             
         // Register the converters on the manager.         
         // FIXME: This should really only happen once instead of being called here every time.

-        ConditionsConverterRegister.register(manager);

+        ConditionsConverterRegistery.register(manager);

                 
         // Open a connection to the database.
         connection = ConnectionManager.getConnectionManager().createConnection();

--- java/trunk/conditions/src/main/java/org/hps/conditions/beam/BeamCurrentCollection.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/beam/BeamCurrentCollection.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -0,0 +1,16 @@

+package org.hps.conditions.beam;
+
+import org.hps.conditions.ConditionsObjectCollection;
+import org.hps.conditions.ConditionsTableMetaData;
+
+public class BeamCurrentCollection extends ConditionsObjectCollection<BeamCurrent> {
+    
+    /**
+     * Class constructor.
+     */
+    BeamCurrentCollection(ConditionsTableMetaData tableMetaData, int collectionId, boolean isReadOnly) {
+        super(tableMetaData, collectionId, isReadOnly);
+    }
+    
+
+}

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -0,0 +1,11 @@

+package org.hps.conditions.ecal;
+
+import org.hps.conditions.AbstractConditionsObject;
+
+public class EcalBadChannel extends AbstractConditionsObject {
+    
+    int getChannelId() {
+        return getFieldValue("ecal_channel_id");
+    }
+    
+}

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelCollection.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelCollection.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,9 +1,18 @@

 package org.hps.conditions.ecal;
 

-import org.hps.conditions.ChannelCollection;

+import org.hps.conditions.ConditionsObjectCollection;
+import org.hps.conditions.ConditionsTableMetaData;

 
 /**
  * A collection of bad channel IDs in the ECAL.
  */

-public class EcalBadChannelCollection extends ChannelCollection {

+public class EcalBadChannelCollection extends ConditionsObjectCollection<EcalBadChannel> {
+    
+    public EcalBadChannelCollection() {        
+    }
+    
+    public EcalBadChannelCollection(ConditionsTableMetaData tableMetaData, int collectionId, boolean isReadOnly) {
+        super(tableMetaData, collectionId, isReadOnly);
+    }
+    

 }

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibrationConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibrationConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -3,6 +3,8 @@

 import java.sql.ResultSet;
 import java.sql.SQLException;
 

+import org.hps.conditions.AbstractConditionsObject.FieldValueMap;
+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConnectionManager;

@@ -28,9 +30,6 @@

      */
     public EcalCalibrationCollection getData(ConditionsManager manager, String name) {
 

-        // Collection to be returned to caller.
-        EcalCalibrationCollection calibrations = new EcalCalibrationCollection();
-

         // Get the ConditionsRecord with the meta-data, which will use the
         // current run number from the manager.
         ConditionsRecord record = ConditionsRecord.find(manager, name).get(0);

@@ -39,16 +38,19 @@

         // applicable conditions.
         String tableName = record.getTableName();
         String fieldName = record.getFieldName();

-        int fieldValue = record.getFieldValue();

+        int collectionId = record.getFieldValue();
+        
+        // Collection to be returned to caller.
+        EcalCalibrationCollection collection = new EcalCalibrationCollection(getTableMetaData(name), collectionId, true);

 
         // References to database objects.
         ResultSet resultSet = null;
         ConnectionManager connectionManager = getConnectionManager();
 
         // The query to get conditions.

-        String query = "SELECT ecal_channel_id, pedestal, noise FROM " 

+        String query = "SELECT id, ecal_channel_id, pedestal, noise FROM " 

                 + tableName + " WHERE " 

-                + fieldName + " = " + fieldValue + " ORDER BY ecal_channel_id ASC";

+                + fieldName + " = " + collectionId + " ORDER BY ecal_channel_id ASC";

 
         // Execute the query.
         resultSet = connectionManager.query(query);

@@ -56,22 +58,25 @@

         try {
             // Loop over the records.
             while (resultSet.next()) {

-                // Create calibration object from record.
-                int channelId = resultSet.getInt(1);
-                double pedestal = resultSet.getDouble(2);
-                double noise = resultSet.getDouble(3);
-                calibrations.put(channelId, new EcalCalibration(pedestal, noise));

+                int rowId = resultSet.getInt(1);                 
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("ecal_channel_id", resultSet.getInt(2));
+                fieldValues.put("pedestal", resultSet.getDouble(3));
+                fieldValues.put("noise", resultSet.getDouble(4));
+                EcalCalibration newObject = _objectFactory.createObject(EcalCalibration.class, tableName, rowId, fieldValues, true);                
+                collection.add(newObject);

             }
         } catch (SQLException x) {

-            throw new RuntimeException("Database error.", x);
-        } 

+            throw new RuntimeException("Database error", x);
+        } catch (ConditionsObjectException x) {
+            throw new RuntimeException("Error converting to " + getType().getSimpleName() + " object", x);
+        }

-        return calibrations;

+        return collection;

     }
 
     /**
      * Get the type handled by this converter.

-     * 

      * @return The type handled by this converter.
      */
     public Class<EcalCalibrationCollection> getType() {

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,6 +1,6 @@

 package org.hps.conditions.ecal;
 

-import static org.hps.conditions.ConditionsConstants.ECAL_CHANNELS;

+import static org.hps.conditions.ConditionsTableConstants.ECAL_CHANNELS;

 
 import java.sql.ResultSet;
 import java.sql.SQLException;

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,15 +1,15 @@

 package org.hps.conditions.ecal;
 

-import static org.hps.conditions.ConditionsConstants.ECAL_BAD_CHANNELS;
-import static org.hps.conditions.ConditionsConstants.ECAL_CALIBRATIONS;
-import static org.hps.conditions.ConditionsConstants.ECAL_CHANNELS;
-import static org.hps.conditions.ConditionsConstants.ECAL_GAINS;

+import static org.hps.conditions.ConditionsTableConstants.ECAL_BAD_CHANNELS;
+import static org.hps.conditions.ConditionsTableConstants.ECAL_CALIBRATIONS;
+import static org.hps.conditions.ConditionsTableConstants.ECAL_CHANNELS;
+import static org.hps.conditions.ConditionsTableConstants.ECAL_GAINS;

 
 import java.util.Map.Entry;
 

-import org.lcsim.conditions.ConditionsManager;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.DatabaseConditionsConverter;

+import org.lcsim.conditions.ConditionsManager;

 
 /**
  * This class loads all ecal conditions into an {@link EcalConditions} object

@@ -38,26 +38,24 @@

                                        
         // Add gains.
         EcalGainCollection gains = manager.getCachedConditions(EcalGainCollection.class, ECAL_GAINS).getCachedData();        

-        for (Entry<Integer,EcalGain> entry : gains.entrySet()) {
-            EcalChannel channel = channelMap.get(entry.getKey());
-            EcalGain gain = entry.getValue();

+        for (EcalGain gain : gains.getObjects()) {
+            EcalChannel channel = channelMap.get(gain.getChannelId());

             conditions.getChannelConstants(channel).setGain(gain);
         }
         
         // Add bad channels.
         EcalBadChannelCollection badChannels = manager.getCachedConditions(
                 EcalBadChannelCollection.class, ECAL_BAD_CHANNELS).getCachedData();

-        for (Integer badChannel : badChannels) {
-            EcalChannel channel = channelMap.get(badChannel);

+        for (EcalBadChannel badChannel : badChannels.getObjects()) {
+            EcalChannel channel = channelMap.get(badChannel.getChannelId());

             conditions.getChannelConstants(channel).setBadChannel(true);
         }
         
         // Add calibrations including pedestal and noise values.
         EcalCalibrationCollection calibrations = 
                 manager.getCachedConditions(EcalCalibrationCollection.class, ECAL_CALIBRATIONS).getCachedData();

-        for (Entry<Integer,EcalCalibration> entry : calibrations.entrySet()) {
-            EcalChannel channel = channelMap.get(entry.getKey());
-            EcalCalibration calibration = entry.getValue();

+        for (EcalCalibration calibration : calibrations.getObjects()) {
+            EcalChannel channel = channelMap.get(calibration.getChannelId());

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainCollection.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainCollection.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,14 +1,17 @@

 package org.hps.conditions.ecal;
 

-import java.util.LinkedHashMap;

+import org.hps.conditions.ConditionsObjectCollection;
+import org.hps.conditions.ConditionsTableMetaData;

 
 /**
  * This class maps ECAL channel IDs from the database to ECal gain parameters.
  */

-public class EcalGainCollection extends LinkedHashMap<Integer,EcalGain> {

+public class EcalGainCollection extends ConditionsObjectCollection<EcalGain> {
+    

     /**
      * Class constructor.
      */

-    EcalGainCollection() {        

+    EcalGainCollection(ConditionsTableMetaData tableMetaData, int collectionId, boolean isReadOnly) {
+        super(tableMetaData, collectionId, isReadOnly);

     }
 }

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -3,11 +3,14 @@

 import java.sql.ResultSet;
 import java.sql.SQLException;
 

-import org.lcsim.conditions.ConditionsManager;

+import org.hps.conditions.AbstractConditionsObject.FieldValueMap;
+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;

+import org.hps.conditions.ConditionsTableMetaData;

 import org.hps.conditions.ConnectionManager;
 import org.hps.conditions.DatabaseConditionsConverter;

+import org.lcsim.conditions.ConditionsManager;

 
 /**
  * This class creates an {@link EcalGainCollection} from the appropriate

@@ -27,9 +30,6 @@

      */
     public EcalGainCollection getData(ConditionsManager manager, String name) {
 

-        // Collection to be returned to caller.
-        EcalGainCollection gains = new EcalGainCollection();
-

         // Get the ConditionsRecord with the meta-data, which will use the
         // current run number from the manager.
         ConditionsRecord record = ConditionsRecord.find(manager, name).get(0);

@@ -38,35 +38,41 @@

         // applicable conditions.
         String tableName = record.getTableName();
         String fieldName = record.getFieldName();

-        int fieldValue = record.getFieldValue();

+        int collectionId = record.getFieldValue();
+        
+        // Objects for building the return value.
+        ConditionsTableMetaData tableMetaData = _objectFactory.getTableRegistry().getTableMetaData(tableName);
+        EcalGainCollection collection = 
+                new EcalGainCollection(tableMetaData, collectionId, true); 

 
         // References to database objects.
         ConnectionManager connectionManager = getConnectionManager();
 

-        // Get the name of the current database being used.
-        String database = connectionManager.getConnectionParameters().getDatabase();
-

         // Database query on ecal gain table.

-        String query = "SELECT ecal_channel_id, gain FROM " 

+        String query = "SELECT id, ecal_channel_id, gain FROM " 

                 + tableName + " WHERE " 

-                + fieldName + " = " + fieldValue + " ORDER BY id ASC";

+                + fieldName + " = " + collectionId + " ORDER BY id ASC";

 
         // Execute the query and get the results.
         ResultSet resultSet = connectionManager.query(query);
 
         try {
             // Loop over the records.

-            while (resultSet.next()) {
-                // Create gain object from database record.
-                int channelId = resultSet.getInt(1);
-                double gain = resultSet.getDouble(2);
-                gains.put(channelId, new EcalGain(gain));

+            while (resultSet.next()) {                
+                int rowId = resultSet.getInt(1);                 
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("ecal_channel_id", resultSet.getInt(2));
+                fieldValues.put("gain", resultSet.getDouble(3));
+                EcalGain newObject = _objectFactory.createObject(EcalGain.class, tableName, rowId, fieldValues, true);                
+                collection.add(newObject);

             }
         } catch (SQLException x) {
             throw new RuntimeException("Database error.", x);

-        } 

+        } catch (ConditionsObjectException x) {
+            throw new RuntimeException("Error converting to " + getType().getSimpleName() + " type.", x);
+        }

-        return gains;

+        return collection;

     }
 
     /**

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannelConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannelConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -4,7 +4,7 @@

 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConditionsRecordCollection;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -4,7 +4,7 @@

 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConditionsTableMetaData;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannelCollectionConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannelCollectionConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,14 +1,13 @@

 package org.hps.conditions.svt;
 

-import static org.hps.conditions.ConditionsConstants.SVT_CHANNELS;

+import static org.hps.conditions.ConditionsTableConstants.SVT_CHANNELS;

 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;

-import org.hps.conditions.ConditionsTableMetaData;

 import org.hps.conditions.ConnectionManager;
 import org.hps.conditions.DatabaseConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,15 +1,13 @@

 package org.hps.conditions.svt;
 

-import static org.hps.conditions.ConditionsConstants.SVT_BAD_CHANNELS;
-import static org.hps.conditions.ConditionsConstants.SVT_CALIBRATIONS;
-import static org.hps.conditions.ConditionsConstants.SVT_CHANNELS;
-import static org.hps.conditions.ConditionsConstants.SVT_DAQ_MAP;
-import static org.hps.conditions.ConditionsConstants.SVT_GAINS;
-import static org.hps.conditions.ConditionsConstants.SVT_PULSE_PARAMETERS;
-import static org.hps.conditions.ConditionsConstants.SVT_TIME_SHIFTS;

+import static org.hps.conditions.ConditionsTableConstants.SVT_BAD_CHANNELS;
+import static org.hps.conditions.ConditionsTableConstants.SVT_CALIBRATIONS;
+import static org.hps.conditions.ConditionsTableConstants.SVT_CHANNELS;
+import static org.hps.conditions.ConditionsTableConstants.SVT_DAQ_MAP;
+import static org.hps.conditions.ConditionsTableConstants.SVT_GAINS;
+import static org.hps.conditions.ConditionsTableConstants.SVT_PULSE_PARAMETERS;
+import static org.hps.conditions.ConditionsTableConstants.SVT_TIME_SHIFTS;

-import java.util.Map.Entry;
-

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.DatabaseConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -1,15 +1,15 @@

 package org.hps.conditions.svt;
 

-import static org.hps.conditions.ConditionsConstants.SVT_DAQ_MAP;

+import static org.hps.conditions.ConditionsTableConstants.SVT_DAQ_MAP;

 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 

-import org.lcsim.conditions.ConditionsManager;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConnectionManager;
 import org.hps.conditions.DatabaseConditionsConverter;

+import org.lcsim.conditions.ConditionsManager;

 import org.lcsim.hps.util.Pair;
 
 /**

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGainConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGainConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -4,7 +4,7 @@

 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConditionsTableMetaData;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtPulseParametersConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtPulseParametersConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -4,7 +4,7 @@

 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConditionsTableMetaData;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShiftConverter.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShiftConverter.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -4,7 +4,7 @@

 import java.sql.SQLException;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConnectionManager;

--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDatabaseObjectTest.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDatabaseObjectTest.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -7,7 +7,6 @@

 import junit.framework.TestCase;
 
 import org.hps.conditions.AbstractConditionsObject.FieldValueMap;

-import org.hps.conditions.ConditionsObject.ConditionsObjectException;

 
 /**
  * Test the basic functionality of a {@link ConditionsObject} on a dummy database.

--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-03-18 01:08:09 UTC (rev 309)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-03-18 01:25:21 UTC (rev 310)
@@ -13,7 +13,7 @@

 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.loop.LCSimLoop;
 

-import static org.hps.conditions.ConditionsConstants.BEAM_CURRENT;

+import static org.hps.conditions.ConditionsTableConstants.BEAM_CURRENT;

 
 /**
  * This test checks the beam current values by run.

@@ -72,7 +72,8 @@

         public void process(EventHeader event) {
             if (currentRun != event.getRunNumber()) {
                 currentRun = event.getRunNumber();

-                BeamCurrent beamCurrent = ConditionsManager.defaultInstance().getCachedConditions(BeamCurrent.class, BEAM_CURRENT).getCachedData();

+                BeamCurrentCollection collection = ConditionsManager.defaultInstance().getCachedConditions(BeamCurrentCollection.class, BEAM_CURRENT).getCachedData();
+                BeamCurrent beamCurrent = collection.get(0);

                 System.out.println("Run " + event.getRunNumber() + " has integrated beam current " + beamCurrent.getIntegratedBeamCurrent() + " nC.");
                 assertEquals("Wrong beam current for run.", beamCurrentAnswerKey.get(currentRun), beamCurrent.getIntegratedBeamCurrent());
             }