diff -N BadChannelConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ BadChannelConverter.java	4 Oct 2013 01:43:47 -0000	1.1
@@ -0,0 +1,99 @@

+package org.lcsim.hps.conditions;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.lcsim.conditions.ConditionsManager;
+
+/**
+ * This class creates a list of {@link EcalBadChannel} objects from the conditions database.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class BadChannelConverter extends DatabaseConditionsConverter<ChannelCollection> {
+
+    /**
+     * Create the collection from the conditions database. 
+     * @param manager The conditions manager.
+     * @param name The name of the conditions set.
+     */
+    public ChannelCollection getData(ConditionsManager manager, String name) {
+
+        // Collection to be returned to caller.
+        ChannelCollection badChannels = new ChannelCollection();
+
+        // Get the ConditionsRecord with the meta-data, which will use the
+        // current run number from the manager.
+        ConditionsRecord record = ConditionsRecord.find(manager, name);
+
+        // 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();
+
+        // References to database objects.
+        Statement statement = null;
+        ResultSet resultSet = null;
+        Connection connection = null;
+
+        try {
+
+            // Get a connection from the manager.
+            connection = ConnectionManager.createConnection();
+
+            // Get the name of the current database being used.
+            String database = ConnectionManager.getConnectionParameters().getDatabase();
+            
+            // Select the correct field name.
+            String idFieldName = "ecal_channel_id";
+            if (name == "svt_bad_channels") {
+                idFieldName = "svt_channel_id";
+            }
+
+            // Query for getting back bad channel records.
+            String query = "SELECT " + idFieldName + " FROM " 
+                    + database + "." + tableName + " WHERE " 
+                    + fieldName + " = " + fieldValue 
+                    + " ORDER BY id ASC";
+
+            // Execute the query and get the results.
+            statement = connection.createStatement();
+            resultSet = statement.executeQuery(query);
+
+            // Loop over the records.
+            while (resultSet.next()) {
+                int channelId = resultSet.getInt(1);
+                badChannels.add(channelId);
+            }
+        } catch (SQLException x) {
+            throw new RuntimeException("Database error.", x);
+        } finally {
+            // Cleanup the SQL statement.
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (Exception xx) {
+                }
+            }
+            // Cleanup the connection.
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (Exception x) {
+                }
+            }
+        }
+        return badChannels;
+    }
+
+    /**
+     * Get the type handled by this converter.
+     * 
+     * @return The type handled by this converter.
+     */
+    public Class<ChannelCollection> getType() {
+        return ChannelCollection.class;
+    }
+}

diff -u -r1.11 -r1.12
--- DatabaseConditionsReader.java	2 Oct 2013 23:19:54 -0000	1.11
+++ DatabaseConditionsReader.java	4 Oct 2013 01:43:47 -0000	1.12
@@ -12,13 +12,13 @@

 
 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.conditions.ConditionsReader;

-import org.lcsim.hps.conditions.ecal.EcalBadChannelConverter;

 import org.lcsim.hps.conditions.ecal.EcalCalibrationConverter;

-import org.lcsim.hps.conditions.ecal.EcalChannelConverter;

+import org.lcsim.hps.conditions.ecal.EcalChannelMapConverter;

 import org.lcsim.hps.conditions.ecal.EcalGainConverter;

-import org.lcsim.hps.conditions.svt.SvtBadChannelConverter;

+import org.lcsim.hps.conditions.svt.PulseParametersConverter;

 import org.lcsim.hps.conditions.svt.SvtCalibrationConverter;
 import org.lcsim.hps.conditions.svt.SvtChannelMapConverter;

+import org.lcsim.hps.conditions.svt.SvtGainConverter;

 
 /**
  * <p>

@@ -46,7 +46,7 @@

  * </p>
  * 
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: DatabaseConditionsReader.java,v 1.11 2013/10/02 23:19:54 jeremy Exp $ 

+ * @version $Id: DatabaseConditionsReader.java,v 1.12 2013/10/04 01:43:47 jeremy Exp $ 

  */
 public class DatabaseConditionsReader extends ConditionsReader {
         

@@ -206,13 +206,32 @@

      * @param manager The ConditionsManager.
      */
     private void registerConditionsConverters(ConditionsManager manager) {

+        
+        // ConditionsRecords with validity meta data.

         manager.registerConditionsConverter(new ConditionsRecordConverter());

+        
+        // SVT channel map.

         manager.registerConditionsConverter(new SvtChannelMapConverter());

+        
+        // SVT calibrations.

         manager.registerConditionsConverter(new SvtCalibrationConverter());

-        manager.registerConditionsConverter(new SvtBadChannelConverter());
-        manager.registerConditionsConverter(new EcalChannelConverter());

+        
+        // SVT gains.
+        manager.registerConditionsConverter(new SvtGainConverter());
+        
+        // SVT and ECAL bad channels.  Same converter can be used.
+        manager.registerConditionsConverter(new BadChannelConverter());
+        
+        // ECAL channel map.
+        manager.registerConditionsConverter(new EcalChannelMapConverter());
+        
+        // ECAL gains.

         manager.registerConditionsConverter(new EcalGainConverter());

-        manager.registerConditionsConverter(new EcalBadChannelConverter());

+                
+        // ECAL calibrations.

         manager.registerConditionsConverter(new EcalCalibrationConverter());

+        
+        // ECAL pulse parameters.
+        manager.registerConditionsConverter(new PulseParametersConverter());

     }
 }

diff -N EcalChannelMapConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ EcalChannelMapConverter.java	4 Oct 2013 01:43:47 -0000	1.1
@@ -0,0 +1,96 @@

+package org.lcsim.hps.conditions.ecal;
+
+import static org.lcsim.hps.conditions.ConditionsConstants.ECAL_CHANNELS;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.hps.conditions.ConnectionManager;
+import org.lcsim.hps.conditions.DatabaseConditionsConverter;
+
+/**
+ * This class creates the {@link EcalChannelMap} from the conditions table containing the channel data.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class EcalChannelMapConverter extends DatabaseConditionsConverter<EcalChannelMap> {
+
+    /**
+     * Load the data from the conditions database.
+     * @param manager The conditions manager.
+     * @param name The name of the conditions set. 
+     */
+     public EcalChannelMap getData(ConditionsManager manager, String name) {
+                  
+         // Collection to be returned to caller.
+         EcalChannelMap channels = new EcalChannelMap();
+                          
+         // References to database objects.
+         Statement statement = null;
+         ResultSet resultSet = null;
+         Connection connection = null;
+         
+         try {
+             
+             // Get a connection from the manager.
+             connection = ConnectionManager.createConnection();
+             
+             // Get the name of the current database being used.
+             String database = ConnectionManager.getConnectionParameters().getDatabase();
+             
+             // Assign default key name if none was given. 
+             if (name == null)
+                 name = ECAL_CHANNELS;
+                                       
+             // Query to retrieve channel data.
+             String query = "SELECT id, x, y, crate, slot, channel FROM "  
+                     + database + "." + name;
+                                      
+             // Execute the query and get the results.
+             statement = connection.createStatement();
+             resultSet = statement.executeQuery(query);
+                 
+             // Loop over the records.
+             while(resultSet.next()) {    
+                 
+                 int id = resultSet.getInt(1);
+                 int x = resultSet.getInt(2);
+                 int y = resultSet.getInt(3);
+                 int crate = resultSet.getInt(4);
+                 int slot = resultSet.getInt(5);
+                 int channel = resultSet.getInt(6);
+                 
+                 EcalChannel channelData = new EcalChannel(id, crate, slot, channel, x, y);
+                 channels.put(channelData.getId(), channelData);
+             }            
+         } catch (SQLException x) {
+             throw new RuntimeException("Database error.", x);
+         } finally {
+             // Cleanup the SQL statement.
+             if (statement != null) {
+                 try {
+                     statement.close();
+                 } catch (Exception xx) {
+                 }
+             }            
+             // Cleanup the connection.
+             if (connection != null) {
+                 try {
+                     connection.close();
+                 } catch (Exception x) {
+                 }
+             }
+         }        
+         return channels;
+    }
+
+     /**
+      * Get the type that this converter handles.
+      * @return The type handled by this converter.
+      */
+    public Class<EcalChannelMap> getType() {
+        return EcalChannelMap.class;
+    }
+}

diff -u -r1.1 -r1.2
--- EcalCalibration.java	1 Oct 2013 00:34:29 -0000	1.1
+++ EcalCalibration.java	4 Oct 2013 01:43:47 -0000	1.2
@@ -7,10 +7,7 @@

  * @author Jeremy McCormick <[log in to unmask]>
  */
 class EcalCalibration {

-   
-    /** The database ID of the ecal channel. */
-    private int id;
-    

+       

     /** The pedestal value. */
     private double pedestal;
     

@@ -22,20 +19,11 @@

      * @param id
      * @param gain
      */

-    EcalCalibration(int id, double pedestal, double noise) {
-        this.id = id;

+    EcalCalibration(double pedestal, double noise) {

         this.pedestal = pedestal;
         this.noise = noise;
     }

-    
-    /**
-     * Get the database ID of the ecal channel.
-     * @return The database ID.
-     */
-    public int getId() {
-        return id;
-    }
-    

+        

     /**
      * Get the pedestal value.
      * @return The gain value.

diff -u -r1.1 -r1.2
--- EcalCalibrationCollection.java	1 Oct 2013 00:34:29 -0000	1.1
+++ EcalCalibrationCollection.java	4 Oct 2013 01:43:47 -0000	1.2
@@ -1,10 +1,10 @@

 package org.lcsim.hps.conditions.ecal;
 

-import java.util.ArrayList;

+import java.util.LinkedHashMap;

 
 /**
  * This class represents a list of {@link EcalCalibration} objects.
  * @author Jeremy McCormick <[log in to unmask]>
  */

-public class EcalCalibrationCollection extends ArrayList<EcalCalibration> {

+public class EcalCalibrationCollection extends LinkedHashMap<Integer,EcalCalibration> {

 }

diff -u -r1.2 -r1.3
--- EcalGain.java	25 Sep 2013 22:36:52 -0000	1.2
+++ EcalGain.java	4 Oct 2013 01:43:47 -0000	1.3
@@ -10,10 +10,7 @@

  * @author Jeremy McCormick <[log in to unmask]>
  */
 class EcalGain {

-   
-    /** The database ID. */
-    private int id;
-    

+       

     /** The gain value. */
     private double gain;
     

@@ -22,20 +19,11 @@

      * @param id
      * @param gain
      */

-    EcalGain(int id, double gain) {
-        this.id = id;

+    EcalGain(double gain) {

         this.gain = gain;
     }
     
     /**

-     * Get the database ID.
-     * @return The database ID.
-     */
-    public int getId() {
-        return id;
-    }
-    
-    /**

      * Get the gain value.
      * @return The gain value.
      */

diff -N EcalBadChannelConverter.java
--- EcalBadChannelConverter.java	1 Oct 2013 00:34:29 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@

-package org.lcsim.hps.conditions.ecal;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.ConditionsRecord;
-import org.lcsim.hps.conditions.ConnectionManager;
-import org.lcsim.hps.conditions.DatabaseConditionsConverter;
-
-/**
- * This class creates a list of {@link EcalBadChannel} objects from the conditions database.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class EcalBadChannelConverter extends DatabaseConditionsConverter<EcalBadChannelCollection> {
-
-    /**
-     * Create the collection from the conditions database. 
-     * @param manager The conditions manager.
-     * @param name The name of the conditions set.
-     */
-    public EcalBadChannelCollection getData(ConditionsManager manager, String name) {
-
-        // Collection to be returned to caller.
-        EcalBadChannelCollection badChannels = new EcalBadChannelCollection();
-
-        // Get the ConditionsRecord with the meta-data, which will use the
-        // current run number from the manager.
-        ConditionsRecord record = ConditionsRecord.find(manager, name);
-
-        // 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();
-
-        // References to database objects.
-        Statement statement = null;
-        ResultSet resultSet = null;
-        Connection connection = null;
-
-        try {
-
-            // Get a connection from the manager.
-            connection = ConnectionManager.createConnection();
-
-            // Get the name of the current database being used.
-            String database = ConnectionManager.getConnectionParameters().getDatabase();
-
-            String query = "SELECT ecal_channel_id FROM " 
-                    + database + "." + tableName + " WHERE " 
-                    + fieldName + " = " + fieldValue 
-                    + " ORDER BY id ASC";
-
-            // Execute the query and get the results.
-            statement = connection.createStatement();
-            resultSet = statement.executeQuery(query);
-
-            // Loop over the records.
-            while (resultSet.next()) {
-                int channelId = resultSet.getInt(1);
-                badChannels.add(channelId);
-            }
-        } catch (SQLException x) {
-            throw new RuntimeException("Database error.", x);
-        } finally {
-            // Cleanup the SQL statement.
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (Exception xx) {
-                }
-            }
-            // Cleanup the connection.
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (Exception x) {
-                }
-            }
-        }
-        return badChannels;
-    }
-
-    /**
-     * Get the type handled by this converter.
-     * 
-     * @return The type handled by this converter.
-     */
-    public Class<EcalBadChannelCollection> getType() {
-        return EcalBadChannelCollection.class;
-    }
-}

diff -N EcalChannelConverter.java
--- EcalChannelConverter.java	25 Sep 2013 22:36:52 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,91 +0,0 @@

-package org.lcsim.hps.conditions.ecal;
-
-import static org.lcsim.hps.conditions.ConditionsConstants.ECAL_CHANNELS;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.ConnectionManager;
-import org.lcsim.hps.conditions.DatabaseConditionsConverter;
-
-/**
- * This class creates the {@link EcalChannelMap} from the conditions table containing the channel data.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class EcalChannelConverter extends DatabaseConditionsConverter<EcalChannelMap> {
-
-    /**
-     * Load the data from the conditions database.
-     * @param manager The conditions manager.
-     * @param name The name of the conditions set. 
-     */
-     public EcalChannelMap getData(ConditionsManager manager, String name) {
-                  
-         // Collection to be returned to caller.
-         EcalChannelMap channels = new EcalChannelMap();
-                          
-         // References to database objects.
-         Statement statement = null;
-         ResultSet resultSet = null;
-         Connection connection = null;
-         
-         try {
-             
-             // Get a connection from the manager.
-             connection = ConnectionManager.createConnection();
-             
-             // Get the name of the current database being used.
-             String database = ConnectionManager.getConnectionParameters().getDatabase();
-                                       
-             String query = "SELECT id, x, y, crate, slot, channel FROM "  
-                     + database + "." + ECAL_CHANNELS;
-                                      
-             // Execute the query and get the results.
-             statement = connection.createStatement();
-             resultSet = statement.executeQuery(query);
-                 
-             // Loop over the records.
-             while(resultSet.next()) {    
-                 
-                 int id = resultSet.getInt(1);
-                 int x = resultSet.getInt(2);
-                 int y = resultSet.getInt(3);
-                 int crate = resultSet.getInt(4);
-                 int slot = resultSet.getInt(5);
-                 int channel = resultSet.getInt(6);
-                 
-                 EcalChannel channelData = new EcalChannel(id, crate, slot, channel, x, y);
-                 channels.put(channelData.getId(), channelData);
-             }            
-         } catch (SQLException x) {
-             throw new RuntimeException("Database error.", x);
-         } finally {
-             // Cleanup the SQL statement.
-             if (statement != null) {
-                 try {
-                     statement.close();
-                 } catch (Exception xx) {
-                 }
-             }            
-             // Cleanup the connection.
-             if (connection != null) {
-                 try {
-                     connection.close();
-                 } catch (Exception x) {
-                 }
-             }
-         }        
-         return channels;
-    }
-
-     /**
-      * Get the type that this converter handles.
-      * @return The type handled by this converter.
-      */
-    public Class<EcalChannelMap> getType() {
-        return EcalChannelMap.class;
-    }
-}

diff -N PulseParameters.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PulseParameters.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,66 @@

+package org.lcsim.hps.conditions.svt;
+
+/**
+ * This class represents the pulse parameters for an SVT channel.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class PulseParameters {
+    
+    double amplitude = Double.NaN;
+    double t0 = Double.NaN;
+    double tp = Double.NaN;
+    double chisq = Double.NaN;
+
+    /**
+     * Full qualified class constructor.
+     * @param amplitude The amplitude.
+     * @param t0 The start time.
+     * @param tp The shaping time.
+     * @param chisq The chisq of the measurement.
+     */
+    PulseParameters(double amplitude, double t0, double tp, double chisq) {
+        this.amplitude = amplitude;
+        this.t0 = t0;
+        this.tp = tp;
+        this.chisq = chisq;
+    }
+    
+    /**
+     * Get the amplitude.
+     * @return The amplifude.
+     */
+    double getAmplitude() {
+        return amplitude;
+    }
+    
+    /**
+     * Get the starting time.
+     * @return The starting time.
+     */
+    double getT0() {
+        return t0;
+    }
+    
+    /**
+     * Get the time shift.
+     * @return The time shift.
+     */
+    double getTimeShift() {
+        return tp;
+    }
+    
+    /**
+     * Get the chisq.
+     * @return The chisq.
+     */
+    double getChisq() {
+        return chisq;
+    }
+    
+    /**
+     * Convert this object to a human readable string.
+     */
+    public String toString() {
+        return "amp: " + amplitude + ", t0: " + t0 + ", shift: " + tp + ", chisq: " + chisq;
+    }
+}

diff -N PulseParametersCollection.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PulseParametersCollection.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,10 @@

+package org.lcsim.hps.conditions.svt;
+
+import java.util.LinkedHashMap;
+
+/**
+ * A collection of {@link PulseParameters} objects stored by SVT channel key.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class PulseParametersCollection extends LinkedHashMap<Integer,PulseParameters> {
+}

diff -N PulseParametersConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PulseParametersConverter.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,103 @@

+package org.lcsim.hps.conditions.svt;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.hps.conditions.ConditionsRecord;
+import org.lcsim.hps.conditions.ConnectionManager;
+import org.lcsim.hps.conditions.DatabaseConditionsConverter;
+
+/**
+ * This class creates a {@link PulseParametersCollection} object from the conditions database.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class PulseParametersConverter extends DatabaseConditionsConverter<PulseParametersCollection> {
+    
+    /**
+     * Get the pulse parameters by channel for this run by named conditions set.
+     * @param manager The current conditions manager.
+     * @param name The name of the conditions set.
+     * @return The channel constants data.
+     */
+    public PulseParametersCollection getData(ConditionsManager manager, String name) {
+        
+        // Get the ConditionsRecord with the meta-data, which will use the current run number from the manager.
+        ConditionsRecord record = ConditionsRecord.find(manager, name);
+               
+        // 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();
+                
+        // References to database objects.
+        Statement statement = null;
+        ResultSet resultSet = null;
+        Connection connection = null;
+
+        // Objects for building the return value.
+        PulseParametersCollection collection = new PulseParametersCollection();
+        
+        try {
+                                                 
+            // Get a connection from the manager.
+            connection = ConnectionManager.createConnection();
+            
+            // Get the name of the current database being used.
+            String database = ConnectionManager.getConnectionParameters().getDatabase();
+                                
+            // Construct the query to find matching calibration records using the ID field.
+            String query = "SELECT svt_channel_id, amplitude, t0, tp, chisq FROM "
+                    + database + "." + tableName 
+                    + " WHERE "
+                    + fieldName + " = " + fieldValue
+                    + " ORDER BY id ASC";
+            
+            // Execute the query and get the results.
+            statement = connection.createStatement();
+            resultSet = statement.executeQuery(query);
+                
+            // Loop over the calibration records.
+            while(resultSet.next()) {    
+                              
+                // Get the calibration data for a single channel.
+                int channelId = resultSet.getInt(1);
+                double amplitude = resultSet.getDouble(2);
+                double t0 = resultSet.getDouble(3);
+                double tp = resultSet.getDouble(4);
+                double chisq = resultSet.getDouble(5);
+                
+                collection.put(channelId, new PulseParameters(amplitude, t0, tp, chisq));
+            }            
+        } catch (SQLException x) {
+            throw new RuntimeException("Database error.", x);
+        } finally {
+            // Cleanup the SQL statement.
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (Exception xx) {
+                }
+            }            
+            // Cleanup the connection.
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (Exception x) {
+                }
+            }
+        }
+        // Return the collection of channel constants to caller.
+        return collection;
+    }
+
+    /**
+     * Get the type handled by this converter.     
+     * @return The type handled by this converter, which is <code>ConditionsRecordCollection</code>.
+     */
+    public Class<PulseParametersCollection> getType() {
+        return PulseParametersCollection.class;
+    }        
+}

diff -N SvtGain.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SvtGain.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,47 @@

+package org.lcsim.hps.conditions.svt;
+
+/**
+ * This class represents gain measurements for a single SVT channel.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class SvtGain {
+
+    double gain = Double.NaN;
+    double offset = Double.NaN;
+    
+    /**
+     * Full qualified class constructor.
+     * @param gain The gain of the channel.
+     * @param offset The gain's offset.
+     */
+    SvtGain(double gain, double offset) {
+        this.gain = gain;
+        this.offset = offset;
+    }
+    
+    /**
+     * Get the gain.
+     * @return The gain value.
+     */
+    double getGain() {
+        return gain;
+    }
+    
+    /**
+     * Get the offset.
+     * @return The offset value.
+     */
+    double getOffset() {
+        return offset;
+    }
+    
+    /**
+     * Convert this object to a human-readable string.
+     * @return This object converted to a string.
+     */
+    public String toString() {
+        //return "gain: " + gain + ", offset: " + offset;
+        return "" + gain + '\t' + offset;
+    }
+    
+}

diff -N SvtGainCollection.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SvtGainCollection.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,12 @@

+package org.lcsim.hps.conditions.svt;
+
+import java.util.LinkedHashMap;
+
+/**
+ * This class represents a list of {@link SvtGain} objects associated 
+ * with their SVT channel IDs from the database.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class SvtGainCollection extends LinkedHashMap<Integer, SvtGain> {
+
+}

diff -N SvtGainConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SvtGainConverter.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,106 @@

+package org.lcsim.hps.conditions.svt;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.hps.conditions.ConditionsRecord;
+import org.lcsim.hps.conditions.ConnectionManager;
+import org.lcsim.hps.conditions.DatabaseConditionsConverter;
+
+/**
+ * This class creates a {@link SvtCalibrationCollection} from the conditions database.
+ * @author Jeremy McCormick <[log in to unmask]>
+ * @version $Id: SvtGainConverter.java,v 1.1 2013/10/04 01:43:48 jeremy Exp $
+ */
+public class SvtGainConverter extends DatabaseConditionsConverter<SvtGainCollection> {
+    
+    /**
+     * Class constructor.
+     */
+    public SvtGainConverter() {
+    }
+
+    /**
+     * Get the SVT channel constants for this run by named set.
+     * @param manager The current conditions manager.
+     * @param name The name of the conditions set.
+     * @return The channel constants data.
+     */
+    public SvtGainCollection getData(ConditionsManager manager, String name) {
+        
+        // Get the ConditionsRecord with the meta-data, which will use the current run number from the manager.
+        ConditionsRecord record = ConditionsRecord.find(manager, name);
+               
+        // 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();
+                
+        // References to database objects.
+        Statement statement = null;
+        ResultSet resultSet = null;
+        Connection connection = null;
+
+        // Objects for building the return value.
+        SvtGainCollection collection = new SvtGainCollection();
+        
+        try {
+                                                 
+            // Get a connection from the manager.
+            connection = ConnectionManager.createConnection();
+            
+            // Get the name of the current database being used.
+            String database = ConnectionManager.getConnectionParameters().getDatabase();
+                                
+            // Construct the query to find matching calibration records using the ID field.
+            String query = "SELECT svt_channel_id, gain, offset FROM "
+                    + database + "." + tableName 
+                    + " WHERE "
+                    + fieldName + " = " + fieldValue
+                    + " ORDER BY svt_channel_id ASC";
+            
+            // Execute the query and get the results.
+            statement = connection.createStatement();
+            resultSet = statement.executeQuery(query);
+                
+            // Loop over the calibration records.
+            while(resultSet.next()) {                                 
+                // Create the object with this channel's gain parameters.
+                int channelId = resultSet.getInt(1);
+                double gain = resultSet.getDouble(2);
+                double offset = resultSet.getDouble(3);
+                collection.put(channelId, new SvtGain(gain, offset));
+            }            
+        } catch (SQLException x) {
+            throw new RuntimeException("Database error.", x);
+        } finally {
+            // Cleanup the SQL statement.
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (Exception xx) {
+                }
+            }            
+            // Cleanup the connection.
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (Exception x) {
+                }
+            }
+        }
+        // Return the collection of channel constants to caller.
+        return collection;
+    }
+
+    /**
+     * Get the type handled by this converter.     
+     * @return The type handled by this converter, which is <code>ConditionsRecordCollection</code>.
+     */
+    public Class<SvtGainCollection> getType() {
+        return SvtGainCollection.class;
+    }        
+}

\ No newline at end of file

diff -u -r1.4 -r1.5
--- ChannelConstants.java	2 Oct 2013 23:19:54 -0000	1.4
+++ ChannelConstants.java	4 Oct 2013 01:43:48 -0000	1.5
@@ -5,83 +5,97 @@

  * 
  * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: ChannelConstants.java,v 1.4 2013/10/02 23:19:54 jeremy Exp $

+ * @version $Id: ChannelConstants.java,v 1.5 2013/10/04 01:43:48 jeremy Exp $

  */

-class ChannelConstants {

+public class ChannelConstants {

-    private double pedestal = Double.NaN;
-    private double noise = Double.NaN;
-    private double tp = Double.NaN;
-    private double t0Shift = Double.NaN;
-    private double[][] pulseShape = null;

+    private SvtCalibration calibration = null;
+    private SvtGain gain = null;
+    private PulseParameters pulseParameters = null;

     private boolean badChannel = false;
 
     /**

-     * Default Ctor

+     * Class constructor.

      */
     ChannelConstants() {

-    }
-
-    ChannelConstants(double noise, double tp, double t0Shift, double[][] pulseShape, boolean badChannel) {
-        this.setPedestal(pedestal);
-        this.setNoise(noise);
-        this.setShapingTime(tp);
-        this.setT0Shift(t0Shift);
-        this.setPulseShape(pulseShape);
-        this.setBadChannel(badChannel);
-    }
-   
-    void setNoise(double noise) {
-        this.noise = noise;
-    }
-
-    void setPedestal(double pedestal) {
-        this.pedestal = pedestal;
-    }

+    }    

-    void setShapingTime(double tp) {
-        this.tp = tp;
-    }
-
-    void setT0Shift(double t0Shift) {
-        this.t0Shift = t0Shift;

+    /**
+     * Set the pulse parameters.
+     * @param pulseParameters The pulse parameters
+     */
+    void setPulseParameters(PulseParameters pulseParameters) {
+        this.pulseParameters = pulseParameters;

     }

-
-    void setPulseShape(double[][] pulseShape) {
-        this.pulseShape = pulseShape;

+    
+    /**
+     * Set the gain.
+     * @param gain The gain object.
+     */
+    void setGain(SvtGain gain) {
+        this.gain = gain;

     }
     

+    /**
+     * Set the calibration.
+     * @param calibration The calibration object.
+     */
+    void setCalibration(SvtCalibration calibration) {
+        this.calibration = calibration;
+    }      
+    
+    /**
+     * Set the bad channel flag.
+     * @param badChannel The bad channel flag value.
+     */

     void setBadChannel(boolean badChannel) {
         this.badChannel = badChannel;
     }

-
-    public double getNoise() {
-        return noise;
-    }
-
-    public double getPedestal() {
-        return pedestal;

+        
+    /**
+     * Check if this is a bad channel.
+     * @return True if channel is bad; false if not.
+     */
+    public boolean isBadChannel() {
+        return badChannel;

     }

-
-    public double getShapingTime() {
-        return tp;

+        
+    /**
+     * Get the pulse parameters.
+     * @return The pulse parameters.
+     */
+    public PulseParameters getPulseParameters() {
+        return pulseParameters;

     }

-
-    public double getT0Shift() {
-        return t0Shift;

+    
+    /**
+     * Get the gain.
+     * @return The gain.
+     */
+    public SvtGain getGain() {
+        return gain;

     }

-
-    public double[][] getPulseShape() {
-        return pulseShape;

+    
+    /**
+     * Get the calibration.
+     * @return The calibration.
+     */
+    public SvtCalibration getCalibration() {
+        return calibration;

     }
 

+    /**
+     * Convert this object to a string.
+     * @return This object converted to a string.
+     */

     public String toString() {
         StringBuffer buffer = new StringBuffer();        

-        buffer.append("pedestal: " + this.getPedestal() + ", ");
-        buffer.append("noise: " + this.getNoise() + ", ");
-        buffer.append("t0: " + this.getT0Shift() + ", ");
-        buffer.append("tp: " + this.getShapingTime());
-        // TODO: add print pulse shape here

+        buffer.append(getCalibration());
+        buffer.append(", ");
+        buffer.append(getGain());
+        buffer.append(", ");
+        buffer.append(getPulseParameters());

         return buffer.toString();
     }
 }

+

diff -u -r1.1 -r1.2
--- SvtCalibration.java	2 Oct 2013 23:19:54 -0000	1.1
+++ SvtCalibration.java	4 Oct 2013 01:43:48 -0000	1.2
@@ -1,26 +1,45 @@

 package org.lcsim.hps.conditions.svt;
 

+/**
+ * This class represents a noise and pedestal measurement for an SVT channel.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */

 class SvtCalibration {
     

-    int channelId;
-    double pedestal = Double.NaN;

     double noise = Double.NaN;

+    double pedestal = Double.NaN;

-    SvtCalibration(int channelId, double noise, double pedestal) {
-        this.channelId = channelId;

+    /**
+     * Fully qualified constructor.
+     * @param noise The noise value.
+     * @param pedestal The pedestal value.
+     */
+    SvtCalibration(double noise, double pedestal) {

         this.noise = noise;
         this.pedestal = pedestal;
     }

-    
-    public int getChannelId() {
-        return channelId;
-    }
-    

+        
+    /**
+     * Get the noise value.
+     * @return The noise value.
+     */

     public double getNoise() {
         return noise;
     }
     

+    /**
+     * Get the pedestal value.
+     * @return The pedestal value.
+     */

     public double getPedestal() {
         return pedestal;
     }

+    
+    /**
+     * Convert this object to a human readable string.
+     * @return This object converted to a string.
+     */
+    public String toString() {
+        return "noise: " + noise + ", pedestal: " + pedestal;
+    }

 }

diff -u -r1.1 -r1.2
--- SvtCalibrationCollection.java	2 Oct 2013 23:19:54 -0000	1.1
+++ SvtCalibrationCollection.java	4 Oct 2013 01:43:48 -0000	1.2
@@ -1,6 +1,11 @@

 package org.lcsim.hps.conditions.svt;
 

-import java.util.ArrayList;

+import java.util.LinkedHashMap;

-public class SvtCalibrationCollection extends ArrayList<SvtCalibration> {

+/**
+ * This class is a collection of {@link SvtCalibration} objects associated to their 
+ * SVT channel IDs from the database.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class SvtCalibrationCollection extends LinkedHashMap<Integer,SvtCalibration> {

 }

diff -u -r1.12 -r1.13
--- SvtCalibrationConverter.java	2 Oct 2013 23:19:54 -0000	1.12
+++ SvtCalibrationConverter.java	4 Oct 2013 01:43:48 -0000	1.13
@@ -11,10 +11,10 @@

 import org.lcsim.hps.conditions.DatabaseConditionsConverter;
 
 /**

- * Read SVT calibration data from the conditions database.

+ * This class creates a {@link SvtCalibrationCollection} from the conditions database.

  * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: SvtCalibrationConverter.java,v 1.12 2013/10/02 23:19:54 jeremy Exp $

+ * @version $Id: SvtCalibrationConverter.java,v 1.13 2013/10/04 01:43:48 jeremy Exp $

  */
 public class SvtCalibrationConverter extends DatabaseConditionsConverter<SvtCalibrationCollection> {
     

@@ -75,7 +75,7 @@

                 double noise = resultSet.getDouble(2);
                 double pedestal = resultSet.getDouble(3);
 

-                collection.add(new SvtCalibration(channelId, noise, pedestal));

+                collection.put(channelId, new SvtCalibration(noise, pedestal));

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

diff -u -r1.1 -r1.2
--- SvtChannel.java	2 Oct 2013 23:19:54 -0000	1.1
+++ SvtChannel.java	4 Oct 2013 01:43:48 -0000	1.2
@@ -1,13 +1,21 @@

 package org.lcsim.hps.conditions.svt;
 
 /**

- * This class represents SVT channel data including hybrid, FPGA, and channel numbers.

+ * This class represents SVT channel setup information, including hybrid, FPGA, and channel numbers.

  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class SvtChannel {
 

+    /** Channel data. */

     private int id, hybrid, fpga, channel;
     

+    /**
+     * Fully qualified constructor.
+     * @param id The database record ID from the channel table.
+     * @param fpga The FPGA number (0 to 6).
+     * @param hybrid The hybrid number (0 to 2).
+     * @param channel The channel number (0 to 639).
+     */

     SvtChannel(int id, int fpga, int hybrid, int channel) {
         this.id = id;
         this.fpga = fpga;

@@ -15,23 +23,61 @@

         this.channel = channel;
     }
     

+    /**
+     * Get the channel ID.
+     * @return The channel ID.
+     */

     public int getId() {
         return id;
     }
     

+    /**
+     * Get the hybrid number.
+     * @return The hybrid number.
+     */

     public int getHybrid() {
         return hybrid;
     }
     

+    /**
+     * Get the FPGA number.
+     * @return The FPGA number.
+     */

     public int getFpga() {
         return fpga;
     }
     

+    /**
+     * Get the channel number.  This is different from the ID.
+     * @return The channel number.
+     */

     public int getChannel() {
         return channel;
     }    
     

+    /**
+     * Convert this object to a human readable string.
+     * @return This object as a string.
+     */

     public String toString() {
         return "id: " + id + ", fpga: " + fpga + ", hybrid: " + hybrid + ", channel: " + channel;
     }

-}

+    
+    /**
+     * Implementation of equals.
+     * @return True if the object equals this one; false if not.
+     */
+    public boolean equals(Object o) {
+        if (o == null)
+            return false;
+        if (!(o instanceof SvtChannel))
+            return false;
+        if (o == this)
+            return true;
+        SvtChannel channel = (SvtChannel)o;
+        return id == channel.getId() 
+                && hybrid == channel.getHybrid() 
+                && fpga == channel.getFpga() 
+                && hybrid == channel.getHybrid();
+    }    
+}

\ No newline at end of file

diff -u -r1.1 -r1.2
--- SvtChannelMap.java	2 Oct 2013 23:19:54 -0000	1.1
+++ SvtChannelMap.java	4 Oct 2013 01:43:48 -0000	1.2
@@ -2,12 +2,26 @@

 
 import java.util.HashMap;
 

-public class SvtChannelMap extends HashMap<Integer, SvtChannel> {

+/**
+ * This class represents a map between channels and their database IDs from the channels table.
+ * It can be used to lookup information in the {@link SvtConditions} object.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class SvtChannelMap extends HashMap<Integer,SvtChannel> {

+    /**
+     * Constructor, which is package protected.  Users should not 
+     * create this class directly but retrieve it from the {@link SvtConditions}
+     * object instead.
+     */

     SvtChannelMap() {
     }

-    
-    public String toString() {

+               
+    /**
+     * Convert this object to a human readable string.
+     * @return This object converted to a string.
+     */
+    public String toString() {        

         StringBuffer buff = new StringBuffer();
         for (SvtChannel channel : values()) {
             buff.append(channel.toString() + '\n');

diff -u -r1.1 -r1.2
--- SvtChannelMapConverter.java	2 Oct 2013 23:19:54 -0000	1.1
+++ SvtChannelMapConverter.java	4 Oct 2013 01:43:48 -0000	1.2
@@ -11,10 +11,19 @@

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

+/**
+ * This class converts conditions database records into an {@link SvtChannelMap}.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */

 public class SvtChannelMapConverter extends DatabaseConditionsConverter<SvtChannelMap> {
 

+    /**
+     * Create the objects from the database.
+     * @param manager The current conditions manager.
+     * @param name The name of the conditions set.
+     */

     public SvtChannelMap getData(ConditionsManager manager, String name) {

-                                       

+                

         // References to database objects.
         Statement statement = null;
         ResultSet resultSet = null;

@@ -30,10 +39,14 @@

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

-                                

+            
+            // Assign default key name for channel data if none given.
+            if (name == null)
+                name = SVT_CHANNELS;
+            

             // Construct the query to find matching calibration records using the ID field.
             String query = "SELECT id, fpga, hybrid, channel FROM "

-                    + database + "." + SVT_CHANNELS;

+                    + database + "." + name;

             
             // Execute the query and get the results.
             statement = connection.createStatement();

@@ -70,6 +83,10 @@

         return channels;
     }
 

+    /**
+     * Get the type handled by this converter.
+     * @return The type handled by this converter.
+     */

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

diff -u -r1.7 -r1.8
--- SvtConditions.java	2 Oct 2013 23:19:54 -0000	1.7
+++ SvtConditions.java	4 Oct 2013 01:43:48 -0000	1.8
@@ -4,12 +4,14 @@

 import java.util.Map;
 
 /**

- * This class models all available SVT conditions data, including 
- * noise, pedestal, shaping time, and time shift by channel.

+ * This class contains all SVT conditions data by readout channel.
+ * {@link SvtChannel} objects from the {@linkSvtChannelMap} should be 
+ * used to lookup the conditions using the 
+ * {@link #getChannelConstants(SvtChannel)} method.

  * 
  * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: SvtConditions.java,v 1.7 2013/10/02 23:19:54 jeremy Exp $

+ * @version $Id: SvtConditions.java,v 1.8 2013/10/04 01:43:48 jeremy Exp $

  */
 public class SvtConditions {
     

@@ -17,83 +19,106 @@

     private SvtChannelMap channelMap = null;
     
     /**

-     * Class constructor.

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

      */

-    SvtConditions() {
-    }     
-    
-    void setChannelMap(SvtChannelMap channelMap) {

+    SvtConditions(SvtChannelMap channelMap) {

         this.channelMap = channelMap;

-    }
-    
-    ChannelConstants getChannelConstants(SvtChannel channel) {
-        return channelData.get(channel);
-    }
-    
-    void setNoise(SvtChannel channel, double noise) {
-        if (channelData.get(channel) == null)
-            channelData.put(channel, new ChannelConstants());
-        channelData.get(channel).setNoise(noise);
-    }
-    
-    void setPedestal(SvtChannel channel, double pedestal) {
-        if (channelData.get(channel) == null)
-            channelData.put(channel, new ChannelConstants());
-        channelData.get(channel).setPedestal(pedestal);
-    }
-    
-    void setShapingTime(SvtChannel channel, double tp) {
-        if (channelData.get(channel) == null)
-            channelData.put(channel, new ChannelConstants());
-        channelData.get(channel).setShapingTime(tp);
-    }
-    
-    void setT0Shift(SvtChannel channel, double t0) {
-        if (channelData.get(channel) == null)
-            channelData.put(channel, new ChannelConstants());
-        channelData.get(channel).setT0Shift(t0);
-    }
-    
-    void setPulseShape(SvtChannel channel, double[][] pulseShape) {
-        if (channelData.get(channel) == null)
-            channelData.put(channel, new ChannelConstants());
-        channelData.get(channel).setPulseShape(pulseShape);
-    }
-    
-    void setBadChannel(SvtChannel channel) {
-        if (channelData.get(channel) == null)

+    }     
+        
+    /**
+     * Get the conditions constants for a specific channel.  These will be
+     * created if they do not exist for the given channel, BUT only channels
+     * in the current channel map are allowed as an argument.
+     * @param channel The SVT channel.
+     * @return The conditions constants for the channel.
+     * @throws IllegalArgumentException if .
+     */
+    public ChannelConstants getChannelConstants(SvtChannel channel) {
+        // This channel must come from the map.
+        if (!channelMap.containsValue(channel)) {
+            System.err.println("Channel not found in map => " + channel);
+            throw new IllegalArgumentException("Channel was not found in map.");
+        }
+        // If channel has no data yet, then add it.
+        if (!channelData.containsKey(channel))

             channelData.put(channel, new ChannelConstants());

-        channelData.get(channel).setBadChannel(true);
-    }
-    

+        return channelData.get(channel);
+    }         
+        
+    /**
+     * Get the {@link SvtChannelMap} for this set of conditions.
+     * @return The SVT channel map.
+     */

     public SvtChannelMap getChannelMap() {
         return channelMap;
     }

-    
-    public double getNoise(SvtChannel channel) {
-        return channelData.get(channel).getNoise();
-    }
-    
-    public double getPedestal(SvtChannel channel) {
-        return channelData.get(channel).getPedestal();
-    }
-    
-    public double getShapingTime(SvtChannel channel) {
-        return channelData.get(channel).getShapingTime();
-    }
-    
-    public double getT0Shift(SvtChannel channel) {
-        return channelData.get(channel).getT0Shift();
-    }
-        

+            
+    /**
+     * Convert this object to a human readable string.  This method prints a formatted table 
+     * independently of how its member objects implement their string conversion.
+     * @return This object converted to a string.
+     */

     public String toString() {
         StringBuffer buff = new StringBuffer();

-        for (SvtChannel channel : channelMap.values()) {            
-            buff.append(channel);
-            buff.append(", ");
-            buff.append(channelData.get(channel));
-            buff.append('\n');

+        // Table header:
+        buff.append("id");
+        buff.append("     ");
+        buff.append("fpga");
+        buff.append("  ");
+        buff.append("hybrid");
+        buff.append("   ");
+        buff.append("channel");
+        buff.append("  ");
+        buff.append("noise");
+        buff.append("     ");
+        buff.append("pedestal");
+        buff.append("    ");
+        buff.append("gain");
+        buff.append("   ");
+        buff.append("offset");
+        buff.append("    ");
+        buff.append("amplitude");
+        buff.append("  ");
+        buff.append("t0");
+        buff.append("       ");
+        buff.append("shift");
+        buff.append("    ");
+        buff.append("chisq");
+        buff.append("      ");
+        buff.append("bad");
+        buff.append('\n'); 
+        for (int i=0; i<115; i++) {
+            buff.append("-");
+        }        
+        buff.append('\n');
+        // Loop over channels.
+        for (SvtChannel channel : channelMap.values()) {
+            
+            // Get the conditions for the channel.
+            ChannelConstants constants = getChannelConstants(channel);
+            SvtGain gain = constants.getGain();
+            PulseParameters pulse = constants.getPulseParameters();
+            SvtCalibration calibration = constants.getCalibration();
+            
+            // Channel data.
+            buff.append(String.format("%-6d %-5d %-8d %-8d ", channel.getId(), channel.getFpga(), channel.getHybrid(), channel.getChannel()));
+
+            // Calibration.
+            buff.append(String.format("%-9.4f %-11.4f ", calibration.getNoise(), calibration.getPedestal()));
+            
+            // Gain.
+            buff.append(String.format("%-6.4f %-9.4f ", gain.getGain(), gain.getOffset()));
+            
+            // Pulse shape.
+            buff.append(String.format("%-10.4f %-8.4f %-8.4f %-10.4f ", pulse.getAmplitude(), pulse.getT0(), pulse.getTimeShift(), pulse.getChisq()));
+            
+            // Bad channel.
+            buff.append(constants.isBadChannel());
+            
+            buff.append('\n');                                  

         }
         return buff.toString();
     }
 }

+

diff -N SvtBadChannelConverter.java
--- SvtBadChannelConverter.java	2 Oct 2013 23:19:54 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@

-package org.lcsim.hps.conditions.svt;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.ConditionsRecord;
-import org.lcsim.hps.conditions.ConnectionManager;
-import org.lcsim.hps.conditions.DatabaseConditionsConverter;
-
-/**
- * This class creates a list of bad channel IDs.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class SvtBadChannelConverter extends DatabaseConditionsConverter<SvtBadChannelCollection> {
-
-    /**
-     * Create the collection from the conditions database. 
-     * @param manager The conditions manager.
-     * @param name The name of the conditions set.
-     */
-    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.
-        ConditionsRecord record = ConditionsRecord.find(manager, name);
-
-        // 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();
-
-        // References to database objects.
-        Statement statement = null;
-        ResultSet resultSet = null;
-        Connection connection = null;
-
-        try {
-
-            // Get a connection from the manager.
-            connection = ConnectionManager.createConnection();
-
-            // Get the name of the current database being used.
-            String database = ConnectionManager.getConnectionParameters().getDatabase();
-
-            String query = "SELECT svt_channel_id FROM " 
-                    + database + "." + tableName + " WHERE " 
-                    + fieldName + " = " + fieldValue 
-                    + " ORDER BY id ASC";
-
-            // Execute the query and get the results.
-            statement = connection.createStatement();
-            resultSet = statement.executeQuery(query);
-
-            // Loop over the records.
-            while (resultSet.next()) {
-                int channelId = resultSet.getInt(1);
-                badChannels.add(channelId);
-            }
-        } catch (SQLException x) {
-            throw new RuntimeException("Database error.", x);
-        } finally {
-            // Cleanup the SQL statement.
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (Exception xx) {
-                }
-            }
-            // Cleanup the connection.
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (Exception x) {
-                }
-            }
-        }
-        return badChannels;
-    }
-
-    /**
-     * Get the type handled by this converter.
-     * 
-     * @return The type handled by this converter.
-     */
-    public Class<SvtBadChannelCollection> getType() {
-        return SvtBadChannelCollection.class;
-    }
-}

diff -N ConditionsLoaderTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ConditionsLoaderTest.java	4 Oct 2013 01:43:48 -0000	1.1
@@ -0,0 +1,64 @@

+package org.lcsim.hps.conditions;
+
+import junit.framework.TestCase;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
+import org.lcsim.hps.conditions.ecal.EcalConditions;
+import org.lcsim.hps.conditions.svt.SvtConditions;
+import org.lcsim.util.loop.LCSimConditionsManagerImplementation;
+
+/**
+ * This class tests the {@link ConditionsLoader} which loads SVT and ECAL conditions.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class ConditionsLoaderTest extends TestCase {
+    
+    /** An example detector from hps-detectors. */
+    private static final String detectorName = "HPS-conditions-test";
+    
+    /** The run number of the conditions set in the database. */
+    private static final int runNumber = 777;
+    
+    /** The number of channels that should be in the SVT channel map. */
+    private static final int SVT_CHANNELS = 12800;
+    
+    /** The number of channels that should be in the ECAL channel map. */
+    private static final int ECAL_CHANNELS = 442;
+    
+    public void test() {
+        
+        // Setup the conditions manager.        
+        ConditionsManager.setDefaultConditionsManager(new LCSimConditionsManagerImplementation());
+        ConditionsManager manager = ConditionsManager.defaultInstance();
+        try {
+            manager.setDetector(detectorName, runNumber);
+        } catch (ConditionsNotFoundException e) {
+            throw new RuntimeException(e);
+        }        
+        
+        // Load the SVT and ECAL conditions.
+        ConditionsLoader loader = new ConditionsLoader();
+        loader.load();
+        
+        // Check SVT conditions.
+        SvtConditions svt = loader.getSvtConditions();
+        System.out.println();
+        System.out.println("Printing SVT conditions ...");
+        System.out.println();
+        System.out.println(svt);
+        assertNotNull(svt);
+        assertEquals("Wrong number of SVT channels in map.", SVT_CHANNELS, svt.getChannelMap().size());
+                
+        // Check ECAL conditions.        
+        EcalConditions ecal = loader.getEcalConditions();
+        System.out.println();
+        System.out.println("Printing ECAL conditions ...");
+        System.out.println();
+        System.out.println(ecal);
+        assertNotNull(ecal);
+        assertEquals("Wrong number of ECAL channels in map.", ECAL_CHANNELS, ecal.getChannelMap().size());
+    }
+
+}
+