--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtPulseParameters.java	2014-09-11 21:06:16 UTC (rev 1006)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtPulseParameters.java	2014-09-11 21:09:03 UTC (rev 1007)
@@ -1,75 +0,0 @@

-package org.hps.conditions.svt;
-
-import org.hps.conditions.AbstractConditionsObject;
-import org.hps.conditions.ConditionsObjectCollection;
-
-/**
- * This class represents the pulse parameters for an SVT channel.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public final class SvtPulseParameters extends AbstractConditionsObject {
-
-    public static class SvtPulseParametersCollection extends ConditionsObjectCollection<SvtPulseParameters> {
-    }
-
-    /**
-     * Get the SVT channel ID.
-     * @return The SVT channel ID.
-     */
-    int getChannelId() {
-        return getFieldValue(Integer.class, "svt_channel_id");
-    }
-
-    /**
-     * Get the amplitude.
-     * @return The amplifude.
-     */
-    double getAmplitude() {
-        return getFieldValue(Double.class, "amplitude");
-    }
-
-    /**
-     * Get the starting time.
-     * @return The starting time.
-     */
-    double getT0() {
-        return getFieldValue(Double.class, "t0");
-    }
-
-    /**
-     * Get the time shift.
-     * @return The time shift.
-     */
-    double getTimeShift() {
-        return getFieldValue(Double.class, "tp");
-    }
-
-    /**
-     * Get the chisq.
-     * @return The chisq.
-     */
-    double getChisq() {
-        return getFieldValue(Double.class, "chisq");
-    }
-
-    /**
-     * Convert this object to a human readable string.
-     * @return This object converted to a string.
-     */
-    public String toString() {
-        return "amp: " + getAmplitude() + ", t0: " + getT0() + ", shift: " + getTimeShift() + ", chisq: " + getChisq();
-    }
-
-    /**
-     * Convert this object to an array of doubles.
-     * @return This object converted to an array of doubles.
-     */
-    public double[] toArray() {
-        double[] values = new double[4];
-        values[0] = getAmplitude();
-        values[1] = getT0();
-        values[2] = getTimeShift();
-        values[3] = getChisq();
-        return values;
-    }
-}

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShift.java	2014-09-11 21:06:16 UTC (rev 1006)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtTimeShift.java	2014-09-11 21:09:03 UTC (rev 1007)
@@ -1,57 +0,0 @@

-package org.hps.conditions.svt;
-
-import org.hps.conditions.AbstractConditionsObject;
-import org.hps.conditions.ConditionsObjectCollection;
-import org.hps.conditions.ConditionsObjectException;
-import org.hps.util.Pair;
-
-/**
- * This class is a data holder for associating a time shift with a specific sensor by FPGA
- * and hybrid numbers.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public final class SvtTimeShift extends AbstractConditionsObject {
-
-    public static class SvtTimeShiftCollection extends ConditionsObjectCollection<SvtTimeShift> {
-
-        SvtTimeShiftCollection find(Pair<Integer, Integer> pair) {
-            SvtTimeShiftCollection timeShifts = new SvtTimeShiftCollection();
-            int fpga = pair.getFirstElement();
-            int hybrid = pair.getSecondElement();
-            for (SvtTimeShift timeShift : getObjects()) {
-                if (timeShift.getFpga() == fpga && timeShift.getHybrid() == hybrid) {
-                    try {
-                        timeShifts.add(timeShift);
-                    } catch (ConditionsObjectException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-            return timeShifts;
-        }
-    }
-
-    /**
-     * Get the FPGA number.
-     * @return The FPGA number.
-     */
-    int getFpga() {
-        return getFieldValue("fpga");
-    }
-
-    /**
-     * Get the hybrid number.
-     * @return The hybrid number.
-     */
-    int getHybrid() {
-        return getFieldValue("hybrid");
-    }
-
-    /**
-     * Get the time shift.
-     * @return The time shift.
-     */
-    double getTimeShift() {
-        return getFieldValue("time_shift");
-    }
-}