--- java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -24,10 +24,6 @@

      * Class that maps field names to values.
      */
     public static final class FieldValueMap extends LinkedHashMap<String, Object> {

-        //@SuppressWarnings("unchecked")
-        //public <T> T getFieldValue(String key) {
-        //    return (T)this.getFieldValue(key);
-        //}

     }      
     
     /**

@@ -212,6 +208,11 @@

     public <T> T getFieldValue(Class<T> klass, String field) {
         return klass.cast(_fieldValues.get(field));
     }

+    
+    @SuppressWarnings("unchecked")
+    public <T> T getFieldValue(String field) {
+        return (T)_fieldValues.get(field);
+    }

 
     public void setConnectionManager(ConnectionManager connectionManager) throws ConditionsObjectException {
         if (_connectionManager != null)

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -83,13 +83,20 @@

     void setFieldValues(FieldValueMap fieldValues);
     
     /**

-     * Get a field value, cast to the given type.

+     * Get a field value, cast to the given class.

      * @param field The field value.
      * @return The field value casted to type T.
      */
     public <T> T getFieldValue(Class<T> klass, String field);
     
     /**

+     * Get a field value with implicit return type.
+     * @param field The field's name.
+     * @return The field value cast to type.
+     */
+    public <T> T getFieldValue(String field);
+    
+    /**

      * Set the ConnectionManager of this object.
      * This cannot be reset once set.
      * @param connectionManager The ConnectionManager.

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -16,6 +16,9 @@

     boolean _isDirty;
     boolean _isNew;
     

+    protected ConditionsObjectCollection() {
+    }
+    

     public ConditionsObjectCollection(ConditionsTableMetaData tableMetaData, int collectionId, boolean isReadOnly) {
         _tableMetaData = tableMetaData;
         _collectionId = collectionId;

@@ -38,9 +41,11 @@

             throw new IllegalArgumentException("Collection already contains this object.");
         }
         try {

-            object.setCollectionId(getCollectionId());

+            // Only assign a collection ID to the object if this collection has a valid ID.
+            if (getCollectionId() != -1)
+                object.setCollectionId(getCollectionId());

         } catch (ConditionsObjectException x) {

-            throw new IllegalArgumentException("The object has already been assigned to a collection.", x);

+            throw new IllegalArgumentException("Error assigning collection ID to object.", x);

         }
         objects.add(object);
         if (!isNew())

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -15,7 +15,8 @@

     /**
      * Class constructor.
      */

-    public ConditionsRecordConverter() {

+    public ConditionsRecordConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);

     }
         
     /**

--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -11,6 +11,10 @@

 	    
     protected ConditionsObjectFactory _objectFactory;
     

+    public DatabaseConditionsConverter(ConditionsObjectFactory objectFactory) {
+        _objectFactory = objectFactory;
+    }
+    

     /**
      * Get the the {@link ConnectionManager} associated with this converter.
      * For now, this calls the singleton method of the ConnectionManager

--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsReader.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsReader.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -50,10 +50,7 @@

     
     /** The current run number to determine if conditions are already loaded. */
     private int currentRun = Integer.MIN_VALUE;

-    
-    /** Converter for making ConditionsRecord objects from the database. */
-    ConditionsRecordConverter conditionsRecordConverter = new ConditionsRecordConverter();
-    

+        

     /** The logger for printing messages. */
     static Logger logger = null;
 

--- java/trunk/conditions/src/main/java/org/hps/conditions/beam/BeamCurrentConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/beam/BeamCurrentConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -4,6 +4,7 @@

 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;

@@ -14,12 +15,10 @@

  */
 public class BeamCurrentConverter extends DatabaseConditionsConverter<BeamCurrent> {
     

-    /**
-     * Class constructor.
-     */
-    public BeamCurrentConverter() {

+    public BeamCurrentConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);

     }

-

+    

     /**
      * Get the conditions data.
      * @param manager The current conditions manager.

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -5,6 +5,7 @@

 
 import org.lcsim.conditions.ConditionsManager;
 import org.hps.conditions.ChannelCollection;

+import org.hps.conditions.ConditionsObjectFactory;

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

@@ -16,6 +17,10 @@

  */
 public class EcalBadChannelConverter extends DatabaseConditionsConverter<EcalBadChannelCollection> {
 

+    public EcalBadChannelConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Create the collection from the conditions database. 
      * @param manager The conditions manager.

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -6,6 +6,7 @@

 import java.sql.SQLException;
 
 import org.lcsim.conditions.ConditionsManager;

+import org.hps.conditions.ConditionsObjectFactory;

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

@@ -17,6 +18,10 @@

  */
 public class EcalChannelMapConverter extends DatabaseConditionsConverter<EcalChannelMap> {
 

+    public EcalChannelMapConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Load the data from the conditions database.
      * @param manager The conditions manager.

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsLoader.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsLoader.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -31,7 +31,7 @@

             crystal.reset();
             
             // Find the corresponding entry in the channel map for this crystal.

-            EcalChannel channel = channelMap.find(crystal.getX(), crystal.getY());            

+            EcalChannel channel = channelMap.find(crystal.getX(), crystal.getY());

             if (channel == null) {
                 throw new RuntimeException("EcalChannel not found for crystal: " + crystal.getName());
             }

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalGainConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -4,6 +4,7 @@

 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;

@@ -14,6 +15,11 @@

  */
 public class EcalGainConverter extends DatabaseConditionsConverter<EcalGainCollection> {
 

+    
+    public EcalGainConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Create the collection from the conditions database.
      * @param manager The conditions manager.

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/ChannelConstants.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/ChannelConstants.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -11,7 +11,7 @@

 
     private SvtCalibration calibration = null;
     private SvtGain gain = null;

-    private PulseParameters pulseParameters = null;

+    private SvtPulseParameters pulseParameters = null;

     private boolean badChannel = false;
 
     /**

@@ -24,7 +24,7 @@

      * Set the pulse parameters.
      * @param pulseParameters The pulse parameters
      */

-    void setPulseParameters(PulseParameters pulseParameters) {

+    void setPulseParameters(SvtPulseParameters pulseParameters) {

         this.pulseParameters = pulseParameters;
     }
     

@@ -64,7 +64,7 @@

      * Get the pulse parameters.
      * @return The pulse parameters.
      */

-    public PulseParameters getPulseParameters() {

+    public SvtPulseParameters getPulseParameters() {

         return pulseParameters;
     }
     

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -0,0 +1,11 @@

+package org.hps.conditions.svt;
+
+import org.hps.conditions.AbstractConditionsObject;
+
+public class SvtBadChannel extends AbstractConditionsObject {
+    
+    public int getChannelId() {
+        return getFieldValue("svt_channel_id");
+    }
+
+}

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannelConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannelConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -3,11 +3,15 @@

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

-import org.lcsim.conditions.ConditionsManager;

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

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

+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 SvtBadChannelCollection} representing bad readout channels

@@ -16,6 +20,10 @@

  */
 public class SvtBadChannelConverter extends DatabaseConditionsConverter<SvtBadChannelCollection> {
 

+    public SvtBadChannelConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Create the collection from the conditions database. 
      * @param manager The conditions manager.

@@ -23,15 +31,16 @@

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

-        // Collection to be returned to caller.
-        SvtBadChannelCollection badChannels = new SvtBadChannelCollection();
-

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

+        SvtBadChannelCollection collection = new SvtBadChannelCollection();
+        

         // Loop over ConditionsRecords.  For this particular type of condition, multiple
         // sets of bad channels are possible.

+        
+        // Collection to be returned to caller.

         for (ConditionsRecord record : records) {
         
             // Get the table name, field name, and field value defining the

@@ -40,23 +49,35 @@

             String fieldName = record.getFieldName();
             int fieldValue = record.getFieldValue();
 

+            ConditionsTableMetaData tableMetaData = _objectFactory.getTableRegistry().getTableMetaData(tableName);
+            

             // Query for getting back bad channel records.

-            String query = "SELECT svt_channel_id FROM " + tableName + " WHERE " 

+            String query = "SELECT id, svt_channel_id FROM " + tableName + " WHERE " 

                     + fieldName + " = " + fieldValue + " ORDER BY id ASC";
             ResultSet resultSet = ConnectionManager.getConnectionManager().query(query);
             
             // Loop over the records.
             try {
                 while (resultSet.next()) {

-                    int channelId = resultSet.getInt(1);
-                    badChannels.add(channelId);

+                    //int channelId = resultSet.getInt(1);
+                    //badChannels.add(channelId);
+                    int rowId = resultSet.getInt(1);
+                    
+                    FieldValueMap fieldValues = new FieldValueMap();
+                    fieldValues.put("svt_channel_id", resultSet.getInt(2));
+                    
+                    SvtBadChannel newObject = _objectFactory.createObject(SvtBadChannel.class, tableName, rowId, fieldValues, true);
+                    
+                    collection.add(newObject);

                 }
             } catch (SQLException x) {

-                throw new RuntimeException(x);
-            } 

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

         }
                

-        return badChannels;

+        return collection;

     }
 
     /**

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -3,10 +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.ConditionsObject.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 a {@link SvtCalibrationCollection} from the conditions

@@ -18,7 +22,8 @@

     /**
      * Class constructor.
      */

-    public SvtCalibrationConverter() {

+    public SvtCalibrationConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);

     }
 
     /**

@@ -37,19 +42,21 @@

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

-        int fieldValue = record.getFieldValue();

+        int collectionId = record.getFieldValue();

 
         // Objects for building the return value.

-        SvtCalibrationCollection collection = new SvtCalibrationCollection();

+        ConditionsTableMetaData tableMetaData = _objectFactory.getTableRegistry().getTableMetaData(tableName);
+        SvtCalibrationCollection collection = 
+                new SvtCalibrationCollection(tableMetaData, collectionId, true); 

 
         // Get a connection from the manager.
         ConnectionManager connectionManager = getConnectionManager();
 
         // Construct the query to find matching calibration records using the ID
         // field.

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

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

                 + tableName + " WHERE " 

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

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

 
         // Execute the query and get the results.
         ResultSet resultSet = connectionManager.query(query);

@@ -57,17 +64,23 @@

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

-
-                // Get the calibration data for a single channel.
-                int channelId = resultSet.getInt(1);
-                double noise = resultSet.getDouble(2);
-                double pedestal = resultSet.getDouble(3);
-
-                collection.put(channelId, new SvtCalibration(noise, pedestal));

+                
+                int rowId = resultSet.getInt(1);
+                
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("svt_channel_id", resultSet.getInt(2));
+                fieldValues.put("noise", resultSet.getDouble(3));
+                fieldValues.put("pedestal", resultSet.getDouble(4));
+                SvtCalibration newObject = _objectFactory.createObject(
+                        SvtCalibration.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 SvtCalibration object");
+        }

         
         // Return the collection of channel constants to caller.
         return collection;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -15,7 +15,7 @@

     
     /** SVT conditions data. */
     private Map<SvtChannel, ChannelConstants> channelData = new HashMap<SvtChannel, ChannelConstants>();

-    private SvtChannelMap channelMap = null;

+    private SvtChannelCollection channelMap = null;

     private SvtDaqMap daqMap = null;
     private SvtTimeShiftCollection timeShifts = null;
     

@@ -23,7 +23,7 @@

      * Class constructor, which takes a channel map.
      * @param channelMap The SVT channel map.
      */

-    SvtConditions(SvtChannelMap channelMap) {

+    SvtConditions(SvtChannelCollection channelMap) {

         this.channelMap = channelMap;
     }     
         

@@ -37,7 +37,7 @@

      */
     public ChannelConstants getChannelConstants(SvtChannel channel) {
         // This channel must come from the map.

-        if (!channelMap.containsValue(channel)) {

+        if (!channelMap.getObjects().contains(channel)) {

             System.err.println("Channel not found in map => " + channel);
             throw new IllegalArgumentException("Channel was not found in map.");
         }

@@ -48,10 +48,10 @@

     }         
         
     /**

-     * Get the {@link SvtChannelMap} for this set of conditions.

+     * Get the {@link SvtChannelCollection} for this set of conditions.

      * @return The SVT channel map.
      */

-    public SvtChannelMap getChannelMap() {

+    public SvtChannelCollection getChannelMap() {

         return channelMap;
     }
     

@@ -133,12 +133,12 @@

         }        
         buff.append('\n');
         // Loop over channels.

-        for (SvtChannel channel : channelMap.values()) {

+        for (SvtChannel channel : channelMap.getObjects()) {

             
             // Get the conditions for the channel.
             ChannelConstants constants = getChannelConstants(channel);
             SvtGain gain = constants.getGain();

-            PulseParameters pulse = constants.getPulseParameters();

+            SvtPulseParameters pulse = constants.getPulseParameters();

             SvtCalibration calibration = constants.getCalibration();
             
             // Channel data.

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -10,7 +10,7 @@

 
 import java.util.Map.Entry;
 

-import org.hps.conditions.ConditionsObject;

+import org.hps.conditions.ConditionsObjectFactory;

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

@@ -19,7 +19,11 @@

  * based on the current run number known by the conditions manager.
  */
 public class SvtConditionsConverter extends DatabaseConditionsConverter<SvtConditions> {

-                     

+      
+    public SvtConditionsConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Create and return the SVT conditions object.  
      * @param manager The current conditions manager.

@@ -28,7 +32,7 @@

     public SvtConditions getData(ConditionsManager manager, String name) {
                         
         // Get the SVT channel map.

-        SvtChannelMap channels = manager.getCachedConditions(SvtChannelMap.class, SVT_CHANNELS).getCachedData();

+        SvtChannelCollection channels = manager.getCachedConditions(SvtChannelCollection.class, SVT_CHANNELS).getCachedData();

         
         // Create the conditions object.
         SvtConditions conditions = new SvtConditions(channels);

@@ -39,22 +43,22 @@

                                                
         // Add calibrations by channel.
         SvtCalibrationCollection calibrations = manager.getCachedConditions(SvtCalibrationCollection.class, SVT_CALIBRATIONS).getCachedData();

-        for (Entry<Integer,SvtCalibration> entry : calibrations.entrySet()) {
-            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
-            conditions.getChannelConstants(channel).setCalibration(entry.getValue());
-        }  

+        for (SvtCalibration calibration : calibrations.getObjects()) {
+            SvtChannel channel = conditions.getChannelMap().findChannel(calibration.getChannelId());
+            conditions.getChannelConstants(channel).setCalibration(calibration);
+        }

         
         // Add pulse parameters by channel.

-        PulseParametersCollection pulseParameters = manager.getCachedConditions(PulseParametersCollection.class, SVT_PULSE_PARAMETERS).getCachedData();
-        for (Entry<Integer,PulseParameters> entry : pulseParameters.entrySet()) {
-            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
-            conditions.getChannelConstants(channel).setPulseParameters(entry.getValue());

+        SvtPulseParametersCollection pulseParametersCollection = manager.getCachedConditions(SvtPulseParametersCollection.class, SVT_PULSE_PARAMETERS).getCachedData();
+        for (SvtPulseParameters pulseParameters : pulseParametersCollection.getObjects()) {
+            SvtChannel channel = conditions.getChannelMap().findChannel(pulseParameters.getChannelId());
+            conditions.getChannelConstants(channel).setPulseParameters(pulseParameters);

         }
         
         // Add bad channels.
         SvtBadChannelCollection badChannels = manager.getCachedConditions(SvtBadChannelCollection.class, SVT_BAD_CHANNELS).getCachedData();        

-        for (Integer badChannel : badChannels) {
-            SvtChannel channel = conditions.getChannelMap().get(badChannel);

+        for (SvtBadChannel badChannel : badChannels.getObjects()) {
+            SvtChannel channel = conditions.getChannelMap().findChannel(badChannel.getChannelId());

             conditions.getChannelConstants(channel).setBadChannel(true);
         }
         

@@ -62,7 +66,7 @@

         SvtGainCollection gains = manager.getCachedConditions(SvtGainCollection.class, SVT_GAINS).getCachedData();
         for (SvtGain object : gains.getObjects()) {
             int channelId = object.getChannelID();

-            SvtChannel channel = conditions.getChannelMap().get(channelId);            

+            SvtChannel channel = conditions.getChannelMap().findChannel(channelId);            

             conditions.getChannelConstants(channel).setGain(object);
         }
         

@@ -80,4 +84,4 @@

     public Class<SvtConditions> getType() {
         return SvtConditions.class;
     }    

-}

+}

\ No newline at end of file

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -23,7 +23,7 @@

         
         // Find sensor objects.        
         List<HpsSiSensor> sensors = detector.getDetectorElement().findDescendants(HpsSiSensor.class);

-        SvtChannelMap channelMap = conditions.getChannelMap();

+        SvtChannelCollection channelMap = conditions.getChannelMap();

         SvtDaqMap daqMap = conditions.getDaqMap();
         SvtTimeShiftCollection timeShifts = conditions.getTimeShifts();
         

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMap.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMap.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -12,6 +12,8 @@

  */
 public class SvtDaqMap {
 

+    // fields: half, layer, fpga, hybrid
+    

     /**
      * Flag values for top or bottom half.
      * FIXME: This should probably be an enum but it is simpler to use int values for now.  

@@ -90,4 +92,4 @@

         }        
         return buff.toString();
     }    

-}

+}

\ No newline at end of file

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -6,6 +6,7 @@

 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;

@@ -17,6 +18,10 @@

  */
 public class SvtDaqMapConverter extends DatabaseConditionsConverter<SvtDaqMap> {
 

+    public SvtDaqMapConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);
+    }
+    

     /**
      * Create an {@link SvtDaqMap} object from the database.
      */

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGainConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGainConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -5,6 +5,7 @@

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

+import org.hps.conditions.ConditionsObjectFactory;

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

@@ -20,7 +21,8 @@

     /**
      * Class constructor.
      */

-    public SvtGainConverter() {

+    public SvtGainConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);

     }
 
     /**

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShiftConverter.java	2014-03-14 19:52:03 UTC (rev 300)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShiftConverter.java	2014-03-14 23:53:48 UTC (rev 301)
@@ -3,10 +3,13 @@

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

-import org.lcsim.conditions.ConditionsManager;

+import org.hps.conditions.AbstractConditionsObject.FieldValueMap;
+import org.hps.conditions.ConditionsObject.ConditionsObjectException;
+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;

 
 /**
  * This class creates a {@link SvtGainCollection} from the conditions database.

@@ -14,12 +17,10 @@

  */
 public class SvtTimeShiftConverter extends DatabaseConditionsConverter<SvtTimeShiftCollection> {
     

-    /**
-     * Class constructor.
-     */
-    public SvtTimeShiftConverter() {

+    public SvtTimeShiftConverter(ConditionsObjectFactory objectFactory) {
+        super(objectFactory);

     }

-

+    

     /**
      * Get the SVT channel constants for this run by named set.
      * @param manager The current conditions manager.

@@ -34,17 +35,19 @@

         // Get the table name, field name, and field value defining the applicable conditions.
         String tableName = record.getTableName();
         String fieldName = record.getFieldName();

-        int fieldValue = record.getFieldValue();

+        int collectionId = record.getFieldValue();

                 
         // Collection that will be returned. 

-        SvtTimeShiftCollection collection = new SvtTimeShiftCollection();

+        SvtTimeShiftCollection collection = 
+                new SvtTimeShiftCollection(_objectFactory.getTableRegistry().getTableMetaData(tableName), 
+                        collectionId, true);

         
         // Get the connection manager.
         ConnectionManager connectionManager = ConnectionManager.getConnectionManager();
                                                                                             
         // Construct the query to find matching records.

-        String query = "SELECT fpga, hybrid, time_shift FROM "
-                + tableName + " WHERE " + fieldName + " = " + fieldValue;

+        String query = "SELECT id, fpga, hybrid, time_shift FROM "
+                + tableName + " WHERE " + fieldName + " = " + collectionId;

             
         // Execute the query and get the results.
         ResultSet resultSet = connectionManager.query(query);

@@ -52,14 +55,21 @@

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

-                // Create the object with the sensor time shift.
-                int fpga = resultSet.getInt(1);
-                int hybrid = resultSet.getInt(2);
-                double timeShift = resultSet.getDouble(3);
-                collection.add(new SvtTimeShift(fpga, hybrid, timeShift));

+                int rowId = resultSet.getInt(1);
+
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("fpga", resultSet.getInt(2));
+                fieldValues.put("hybrid", resultSet.getInt(3));
+                fieldValues.put("time_shift", resultSet.getInt(4));
+                
+                SvtTimeShift newObject = _objectFactory.createObject(SvtTimeShift.class, tableName, rowId, fieldValues, true);
+                
+                collection.add(newObject);

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

+        } catch (ConditionsObjectException x) {
+            throw new RuntimeException("Error creating SvtTimeShift object.", x);

         }
         
         // Return collection to caller.