diff -u -r1.4 -r1.5
--- EcalCalibrationCollection.java	4 Oct 2013 06:02:19 -0000	1.4
+++ EcalCalibrationCollection.java	15 Oct 2013 23:45:56 -0000	1.5
@@ -7,6 +7,9 @@

  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class EcalCalibrationCollection extends LinkedHashMap<Integer,EcalCalibration> {

+    /**
+     * Class constructor.
+     */

     EcalCalibrationCollection() {        
     }
 }

diff -u -r1.5 -r1.6
--- EcalGain.java	15 Oct 2013 23:24:47 -0000	1.5
+++ EcalGain.java	15 Oct 2013 23:45:56 -0000	1.6
@@ -2,8 +2,7 @@

 
 /**
  * This class is a simplistic representation of gain values from the ECAL

- * conditions database.    
- * 

+ * conditions database.     

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

diff -u -r1.3 -r1.4
--- SvtCalibrationCollection.java	4 Oct 2013 02:03:33 -0000	1.3
+++ SvtCalibrationCollection.java	15 Oct 2013 23:45:56 -0000	1.4
@@ -8,6 +8,9 @@

  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class SvtCalibrationCollection extends LinkedHashMap<Integer,SvtCalibration> {

+    /**
+     * Class constructor.
+     */

     SvtCalibrationCollection() {        
     }
 }

diff -u -r1.10 -r1.11
--- SvtConditions.java	15 Oct 2013 23:14:47 -0000	1.10
+++ SvtConditions.java	15 Oct 2013 23:45:56 -0000	1.11
@@ -6,15 +6,14 @@

 /**
  * 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.

+ * 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.10 2013/10/15 23:14:47 jeremy Exp $

+ * @version $Id: SvtConditions.java,v 1.11 2013/10/15 23:45:56 jeremy Exp $

  */
 public class SvtConditions {
     

+    /** SVT conditions data. */

     private Map<SvtChannel, ChannelConstants> channelData = new HashMap<SvtChannel, ChannelConstants>();
     private SvtChannelMap channelMap = null;
     private SvtDaqMap daqMap = null;

@@ -90,7 +89,8 @@

             
     /**
      * Convert this object to a human readable string.  This method prints a formatted table 

-     * independently of how its member objects implement their string conversion. 

+     * of channel data independently of how its member objects implement their string conversion method. 
+     * For now, it does not print the time shifts by sensor as all other information is by channel.

      * @return This object converted to a string, without the DAQ map.
      */
     public String toString() {

diff -u -r1.13 -r1.14
--- SvtConditionsLoader.java	15 Oct 2013 23:14:47 -0000	1.13
+++ SvtConditionsLoader.java	15 Oct 2013 23:45:56 -0000	1.14
@@ -8,7 +8,7 @@

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

- * Load {@link SvtConditions} data onto <code>HpsSiSensor</code> objects.

+ * This class loads {@link SvtConditions} data onto <code>HpsSiSensor</code> objects.

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

@@ -44,20 +44,24 @@

                 throw new RuntimeException("Failed to find DAQ pair for sensor: " + sensor.getName());
             }
             

-            // Set FPGA value.

+            // Set FPGA value from DAQ map.

             sensor.setFpgaNumber(daqPair.getFirstElement());
             

-            // Set hybrid value.

+            // Set hybrid value from DAQ map.

             sensor.setHybridNumber(daqPair.getSecondElement());
             

-            // Find the channels for this sensor.

+            // Find all the channels for this sensor.

             Collection<SvtChannel> channels = channelMap.find(daqPair);
                         

-            // Loop over channels.

+            // Loop over the channels of the sensor.

             for (SvtChannel channel : channels) {

-                // Put conditions data onto the sensor object:

+                // Get conditions data for this channel.

                 ChannelConstants constants = conditions.getChannelConstants(channel);
                 int channelNumber = channel.getChannel();

+                
+                //
+                // Set conditions data for this channel on the sensor object:
+                //

                 if (constants.isBadChannel()) {
                     sensor.setBadChannel(channelNumber);
                 }

diff -u -r1.2 -r1.3
--- SvtDaqMap.java	11 Oct 2013 00:07:24 -0000	1.2
+++ SvtDaqMap.java	15 Oct 2013 23:45:56 -0000	1.3
@@ -9,7 +9,6 @@

  * This class establishes the mapping between layer numbers and DAQ pair (FPGA, hybrid)
  * for the top and bottom halves of the detector. 
  * @author Jeremy McCormick <[log in to unmask]>

- *

  */
 public class SvtDaqMap {
 

diff -u -r1.5 -r1.6
--- SvtGainConverter.java	15 Oct 2013 23:14:47 -0000	1.5
+++ SvtGainConverter.java	15 Oct 2013 23:45:56 -0000	1.6
@@ -11,7 +11,6 @@

 /**
  * This class creates a {@link SvtGainCollection} from the conditions database.
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: SvtGainConverter.java,v 1.5 2013/10/15 23:14:47 jeremy Exp $

  */
 public class SvtGainConverter extends DatabaseConditionsConverter<SvtGainCollection> {
     

diff -u -r1.1 -r1.2
--- SvtTimeShiftConverter.java	15 Oct 2013 23:14:47 -0000	1.1
+++ SvtTimeShiftConverter.java	15 Oct 2013 23:45:56 -0000	1.2
@@ -11,7 +11,6 @@

 /**
  * This class creates a {@link SvtGainCollection} from the conditions database.
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: SvtTimeShiftConverter.java,v 1.1 2013/10/15 23:14:47 jeremy Exp $

  */
 public class SvtTimeShiftConverter extends DatabaseConditionsConverter<SvtTimeShiftCollection> {