--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/ChannelConstants.java	2014-09-11 20:16:55 UTC (rev 1001)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/ChannelConstants.java	2014-09-11 20:54:57 UTC (rev 1002)
@@ -5,13 +5,13 @@

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

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

+ *

  */
 public final class ChannelConstants {
 
     private SvtCalibration calibration = null;
     private SvtGain gain = null;

-    private SvtPulseParameters pulseParameters = null;

+    private SvtShapeFitParameters shapeFitParameters = null;

     private boolean badChannel = false;
 
     /**

@@ -24,8 +24,8 @@

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

-    void setPulseParameters(SvtPulseParameters pulseParameters) {
-        this.pulseParameters = pulseParameters;

+    void setShapeFitParameters(SvtShapeFitParameters shapeFitParameters) {
+        this.shapeFitParameters = shapeFitParameters;

     }
 
     /**

@@ -61,11 +61,11 @@

     }
 
     /**

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

+     * Get the shape fit parameters.
+     * @return The shape fit parameters.

      */

-    public SvtPulseParameters getPulseParameters() {
-        return pulseParameters;

+    public SvtShapeFitParameters getShapeFitParameters() {
+        return shapeFitParameters;

     }
 
     /**

@@ -94,7 +94,7 @@

         buffer.append(", ");
         buffer.append(getGain());
         buffer.append(", ");

-        buffer.append(getPulseParameters());

+        buffer.append(getShapeFitParameters());

         return buffer.toString();
     }
 }

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-09-11 20:16:55 UTC (rev 1001)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	2014-09-11 20:54:57 UTC (rev 1002)
@@ -15,8 +15,8 @@

 import org.hps.conditions.svt.SvtChannel.SvtChannelCollection;
 import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;
 import org.hps.conditions.svt.SvtGain.SvtGainCollection;

-import org.hps.conditions.svt.SvtPulseParameters.SvtPulseParametersCollection;
-import org.hps.conditions.svt.SvtTimeShift.SvtTimeShiftCollection;

+import org.hps.conditions.svt.SvtShapeFitParameters.SvtShapeFitParametersCollection;
+import org.hps.conditions.svt.SvtT0Shift.SvtT0ShiftCollection;

 import org.lcsim.conditions.ConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;
 

@@ -26,7 +26,6 @@

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

- * $Id$

  */
 public final class SvtConditionsConverter implements ConditionsConverter<SvtConditions> {
 

@@ -81,23 +80,23 @@

     	// Get the calibrations from the conditions database
         SvtCalibrationCollection calibrations = manager.getCachedConditions(SvtCalibrationCollection.class, tableName).getCachedData();
         for (SvtCalibration calibration : calibrations.getObjects()) {

-            SvtChannel channel = conditions.getChannelMap().findChannel(calibration.getChannelId());

+            SvtChannel channel = conditions.getChannelMap().findChannel(calibration.getChannelID());

             conditions.getChannelConstants(channel).setCalibration(calibration);
         }
 
         // Get the table name containing the SVT pulse shape parameters from 
         // the database configuration.  If it doesn't exist, use the default value.

-        metaData = dbConditionsManager.findTableMetaData(SvtPulseParametersCollection.class);

+        metaData = dbConditionsManager.findTableMetaData(SvtShapeFitParametersCollection.class);

     	if(metaData != null){
     		tableName = metaData.getTableName();
     	} else { 
     		tableName = SVT_PULSE_PARAMETERS; 
     	}
         // Add pulse parameters by channel.

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

+        SvtShapeFitParametersCollection shapeFitParametersCollection = manager.getCachedConditions(SvtShapeFitParametersCollection.class, tableName).getCachedData();
+        for (SvtShapeFitParameters shapeFitParameters : shapeFitParametersCollection.getObjects()) {
+            SvtChannel channel = conditions.getChannelMap().findChannel(shapeFitParameters.getChannelID());
+            conditions.getChannelConstants(channel).setShapeFitParameters(shapeFitParameters);

         }
 
         // Get the table name containing the SVT bad channel map from the 

@@ -141,14 +140,14 @@

 
         // Get the table name containing the SVT t0 shifts. If it doesn't 
         // exist, use the default value. 

-        metaData = dbConditionsManager.findTableMetaData(SvtTimeShiftCollection.class);

+        metaData = dbConditionsManager.findTableMetaData(SvtT0ShiftCollection.class);

     	if(metaData != null){
     		tableName = metaData.getTableName();
     	} else { 
     		tableName = SVT_TIME_SHIFTS; 
     	}	
         // Set the t0 shifts by sensor.

-        SvtTimeShiftCollection t0Shifts = manager.getCachedConditions(SvtTimeShiftCollection.class, tableName).getCachedData();

+        SvtT0ShiftCollection t0Shifts = manager.getCachedConditions(SvtT0ShiftCollection.class, tableName).getCachedData();

         conditions.setTimeShifts(t0Shifts);
 
         return conditions;

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java	2014-09-11 20:16:55 UTC (rev 1001)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java	2014-09-11 20:54:57 UTC (rev 1002)
@@ -5,16 +5,16 @@

 
 import org.hps.conditions.svt.SvtChannel.SvtChannelCollection;
 import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;

-import org.hps.conditions.svt.SvtTimeShift.SvtTimeShiftCollection;

+import org.hps.conditions.svt.SvtT0Shift.SvtT0ShiftCollection;

 import org.lcsim.detector.tracker.silicon.HpsSiSensor;
 import org.lcsim.geometry.Detector;
 import org.hps.util.Pair;
 
 /**
  * This class puts {@link SvtConditions} data onto <code>HpsSiSensor</code> objects.

+ *

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

- * @version $Id$

  */
 public final class SvtDetectorSetup {
 

@@ -31,7 +31,7 @@

         List<HpsSiSensor> sensors = detector.getDetectorElement().findDescendants(HpsSiSensor.class);
         SvtChannelCollection channelMap = conditions.getChannelMap();
         SvtDaqMappingCollection daqMap = conditions.getDaqMap();

-        SvtTimeShiftCollection timeShifts = conditions.getTimeShifts();

+        SvtT0ShiftCollection t0Shifts = conditions.getT0Shifts();

 
         // Loop over sensors.
         for (HpsSiSensor sensor : sensors) {