diff -u -r1.1 -r1.2
--- ChannelConstants.java	20 Sep 2013 08:52:42 -0000	1.1
+++ ChannelConstants.java	20 Sep 2013 21:55:09 -0000	1.2
@@ -1,121 +1,118 @@

 package org.lcsim.hps.conditions.svt;
 

-

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

- * @version $Id: ChannelConstants.java,v 1.1 2013/09/20 08:52:42 omoreno Exp $

+ * @version $Id: ChannelConstants.java,v 1.2 2013/09/20 21:55:09 jeremy Exp $

  */
 public class ChannelConstants {
 

-	private int fpga = -1; 
-	private int hybrid = -1; 
-	private int channel = -1;
-	
-	private double pedestal = Double.NaN;
-	private double noise = Double.NaN; 
-	private double tp = Double.NaN;
-	private double t0Shift = Double.NaN; 
-	private double[][] pulseShape = null; 
-	
-
-	/**
-	 * Default Ctor
-	 */
-	public ChannelConstants(){
-	}
-	
-	public ChannelConstants(int fpga, int hybrid, int channel, 
-			double pedestal, double noise, double tp, double t0Shift, double[][] pulseShape){
-		this.setFpga(fpga);
-		this.setHybrid(hybrid);
-		this.setChannel(channel);
-		this.setPedestal(pedestal);
-		this.setNoise(noise);
-		this.setShapingTime(tp);
-		this.setT0Shift(t0Shift);
-		this.setPulseShape(pulseShape);
-	}
-	
-	
-	//--- Setters ---//
-	//---------------//
-	
-	public void setFpga(int fpga){
-		this.fpga = fpga; 
-	}
-	
-	public void setHybrid(int hybrid){
-		this.hybrid = hybrid; 
-	}
-	
-	public void setChannel(int channel){
-		this.channel = channel; 
-	}
-	
-	public void setNoise(double noise){
-		this.noise = noise; 
-	}
-	
-	public void setPedestal(double pedestal){
-		this.pedestal = pedestal; 
-	}
-
-	public void setShapingTime(double tp){
-		this.tp = tp; 
-	}
-	
-	public void setT0Shift(double t0Shift){
-		this.t0Shift = t0Shift; 
-	}
-	
-	public void setPulseShape(double[][] pulseShape){
-		this.pulseShape = pulseShape; 
-	}
-	
-	//--- Getters ---//
-	//---------------//
-	
-	public int getFpga(){
-		return fpga; 
-	}
-	
-	public int getHybrid(){
-		return hybrid; 
-	}
-	
-	public int getChannel(){
-		return channel; 
-	}
-	
-	public double getNoise(){
-		return noise; 
-	}
-	
-	public double getPedestal(){ 
-		return pedestal; 
-	}
-	
-	public double getShapingTime(){
-		return tp;
-	}
-	
-	public double getT0Shift(){
-		return t0Shift; 
-	}
-	
-	public double[][] getPulseShape(){
-		return pulseShape; 
-	}
-
-	@Override
-	public String toString(){
-		StringBuffer buffer = new StringBuffer(); 
-		buffer.append("FPGA: " + this.getFpga() + "\n"); 
-		buffer.append("Hybrid: " + this.getHybrid() + "\n");
-		buffer.append("Channel: " + this.getChannel() + "\n");
-		buffer.append("Pedestal: " + this.getPedestal() + "\n");
-		buffer.append("Noise: " + this.getNoise() + "\n");
-		return buffer.toString();
-	}

+    private int fpga = -1;
+    private int hybrid = -1;
+    private int channel = -1;
+
+    private double pedestal = Double.NaN;
+    private double noise = Double.NaN;
+    private double tp = Double.NaN;
+    private double t0Shift = Double.NaN;
+    private double[][] pulseShape = null;
+
+    /**
+     * Default Ctor
+     */
+    public ChannelConstants() {
+    }
+
+    public ChannelConstants(int fpga, int hybrid, int channel, double pedestal,
+            double noise, double tp, double t0Shift, double[][] pulseShape) {
+        this.setFpga(fpga);
+        this.setHybrid(hybrid);
+        this.setChannel(channel);
+        this.setPedestal(pedestal);
+        this.setNoise(noise);
+        this.setShapingTime(tp);
+        this.setT0Shift(t0Shift);
+        this.setPulseShape(pulseShape);
+    }
+
+    // --- Setters ---//
+    // ---------------//
+
+    public void setFpga(int fpga) {
+        this.fpga = fpga;
+    }
+
+    public void setHybrid(int hybrid) {
+        this.hybrid = hybrid;
+    }
+
+    public void setChannel(int channel) {
+        this.channel = channel;
+    }
+
+    public void setNoise(double noise) {
+        this.noise = noise;
+    }
+
+    public void setPedestal(double pedestal) {
+        this.pedestal = pedestal;
+    }
+
+    public void setShapingTime(double tp) {
+        this.tp = tp;
+    }
+
+    public void setT0Shift(double t0Shift) {
+        this.t0Shift = t0Shift;
+    }
+
+    public void setPulseShape(double[][] pulseShape) {
+        this.pulseShape = pulseShape;
+    }
+
+    // --- Getters ---//
+    // ---------------//
+
+    public int getFpga() {
+        return fpga;
+    }
+
+    public int getHybrid() {
+        return hybrid;
+    }
+
+    public int getChannel() {
+        return channel;
+    }
+
+    public double getNoise() {
+        return noise;
+    }
+
+    public double getPedestal() {
+        return pedestal;
+    }
+
+    public double getShapingTime() {
+        return tp;
+    }
+
+    public double getT0Shift() {
+        return t0Shift;
+    }
+
+    public double[][] getPulseShape() {
+        return pulseShape;
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("FPGA: " + this.getFpga() + "\n");
+        buffer.append("Hybrid: " + this.getHybrid() + "\n");
+        buffer.append("Channel: " + this.getChannel() + "\n");
+        buffer.append("Pedestal: " + this.getPedestal() + "\n");
+        buffer.append("Noise: " + this.getNoise() + "\n");
+        return buffer.toString();
+    }

 }

diff -u -r1.1 -r1.2
--- SvtConditions.java	20 Sep 2013 08:52:42 -0000	1.1
+++ SvtConditions.java	20 Sep 2013 21:55:09 -0000	1.2
@@ -1,7 +1,7 @@

 package org.lcsim.hps.conditions.svt;
 
 import java.util.HashMap;

-import java.util.Map; 

+import java.util.Map;

 import java.util.List;
 
 import org.lcsim.conditions.ConditionsConverter;

@@ -14,100 +14,102 @@

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

- * @version $Id: SvtConditions.java,v 1.1 2013/09/20 08:52:42 omoreno Exp $

+ * @version $Id: SvtConditions.java,v 1.2 2013/09/20 21:55:09 jeremy Exp $

  */
 public class SvtConditions {

-	
-	private static Map<SiSensor, double[]> noiseMap = new HashMap<SiSensor, double[]>(); 
-	private static Map<SiSensor, double[]> pedestalMap = new HashMap<SiSensor, double[]>(); 
-	private static Map<SiSensor, double[]> tpMap = new HashMap<SiSensor, double[]>(); 
-	private static Map<SiSensor, Double> t0ShiftMap = new HashMap<SiSensor, Double>(); 
-	
-	/**
-	 * Ctor
-	 */
-	private SvtConditions(){ 
-	}
-
-	public static void loadSvtConditions(ConditionsConverter<ChannelConstants> converter){
-		
-		ConditionsManager conditionsManager = ConditionsManager.defaultInstance();
-		
-		SvtCalibrationConverter calibrationsConverter = new SvtCalibrationConverter();
-		ChannelConstants channelConstants; 
-		
-		
-		while(calibrationsConverter.hasNext()){
-			
-			channelConstants = calibrationsConverter.getData(conditionsManager, "svt_calibrations");
-			
-			int fpga = channelConstants.getFpga(); 
-			int hybrid = channelConstants.getHybrid();
-			int channel = channelConstants.getChannel(); 
-			
-			Pair<Integer, Integer> daqPair = new Pair<Integer, Integer>(fpga, hybrid);
-			SiSensor sensor = SvtUtils.getInstance().getSensor(daqPair);
-			
-			if(noiseMap.get(sensor) == null) noiseMap.put(sensor, new double[640]);
-			if(pedestalMap.get(sensor) == null) pedestalMap.put(sensor, new double[640]);
-			if(tpMap.get(sensor) == null) tpMap.put(sensor, new double[640]);
-		
-			noiseMap.get(sensor)[channel] = channelConstants.getNoise(); 
-			pedestalMap.get(sensor)[channel] = channelConstants.getPedestal(); 
-			tpMap.get(sensor)[channel] = channelConstants.getShapingTime(); 			
-			
-		}
-	}
-	
-	
-	/**
-	 * 
-	 * Get the noise for a given channel on a sensor. 
-	 * 
-	 * @param sensor 
-	 * @param channel
-	 * @return noise
-	 */
-	public static Double getNoise(SiSensor sensor, int channel){
-		double[] noise = noiseMap.get(sensor);
-		if(noise == null || channel < 0 || channel > 640){
-			return null; 
-		} else { 
-			return noise[channel];
-		}
-	}
-	
-	/**
-	 *
-	 * Get the pedestal for a given channel on a sensor.
-	 * 
-	 * @param sensor
-	 * @param channel
-	 * @return pedestal
-	 */
-	public static Double getPedestal(SiSensor sensor, int channel){
-		double[] pedestal = pedestalMap.get(sensor);
-		if(pedestal == null || channel < 0 || channel > 640){
-			return null; 
-		} else { 
-			return pedestal[channel];
-		}
-	}
-	
-	/**
-	 *
-	 * Get the shaping time for a given channel on a sensor
-	 * 
-	 * @param sensor
-	 * @param channel
-	 * @return shaping time
-	 */
-	public static Double getShapingTime(SiSensor sensor, int channel){
-		double[] tp = tpMap.get(sensor);
-		if(tp == null || channel < 0 || channel > 640){
-			return null; 
-		} else { 
-			return tp[channel];
-		}
-	}

+
+    private static Map<SiSensor, double[]> noiseMap = new HashMap<SiSensor, double[]>();
+    private static Map<SiSensor, double[]> pedestalMap = new HashMap<SiSensor, double[]>();
+    private static Map<SiSensor, double[]> tpMap = new HashMap<SiSensor, double[]>();
+    private static Map<SiSensor, Double> t0ShiftMap = new HashMap<SiSensor, Double>();
+
+    /**
+     * Ctor
+     */
+    private SvtConditions() {
+    }
+
+    public static void loadSvtConditions(ConditionsConverter<ChannelConstants> converter) {
+
+        ConditionsManager conditionsManager = ConditionsManager.defaultInstance();
+
+        SvtCalibrationConverter calibrationsConverter = new SvtCalibrationConverter();
+        ChannelConstants channelConstants;
+
+        while (calibrationsConverter.hasNext()) {
+
+            channelConstants = calibrationsConverter.getData(conditionsManager, "svt_calibrations");
+
+            int fpga = channelConstants.getFpga();
+            int hybrid = channelConstants.getHybrid();
+            int channel = channelConstants.getChannel();
+
+            Pair<Integer, Integer> daqPair = new Pair<Integer, Integer>(fpga,
+                    hybrid);
+            SiSensor sensor = SvtUtils.getInstance().getSensor(daqPair);
+
+            if (noiseMap.get(sensor) == null)
+                noiseMap.put(sensor, new double[640]);
+            if (pedestalMap.get(sensor) == null)
+                pedestalMap.put(sensor, new double[640]);
+            if (tpMap.get(sensor) == null)
+                tpMap.put(sensor, new double[640]);
+
+            noiseMap.get(sensor)[channel] = channelConstants.getNoise();
+            pedestalMap.get(sensor)[channel] = channelConstants.getPedestal();
+            tpMap.get(sensor)[channel] = channelConstants.getShapingTime();
+
+        }
+    }
+
+    /**
+     * 
+     * Get the noise for a given channel on a sensor.
+     * 
+     * @param sensor
+     * @param channel
+     * @return noise
+     */
+    public static Double getNoise(SiSensor sensor, int channel) {
+        double[] noise = noiseMap.get(sensor);
+        if (noise == null || channel < 0 || channel > 640) {
+            return null;
+        } else {
+            return noise[channel];
+        }
+    }
+
+    /**
+     * 
+     * Get the pedestal for a given channel on a sensor.
+     * 
+     * @param sensor
+     * @param channel
+     * @return pedestal
+     */
+    public static Double getPedestal(SiSensor sensor, int channel) {
+        double[] pedestal = pedestalMap.get(sensor);
+        if (pedestal == null || channel < 0 || channel > 640) {
+            return null;
+        } else {
+            return pedestal[channel];
+        }
+    }
+
+    /**
+     * 
+     * Get the shaping time for a given channel on a sensor
+     * 
+     * @param sensor
+     * @param channel
+     * @return shaping time
+     */
+    public static Double getShapingTime(SiSensor sensor, int channel) {
+        double[] tp = tpMap.get(sensor);
+        if (tp == null || channel < 0 || channel > 640) {
+            return null;
+        } else {
+            return tp[channel];
+        }
+    }

 }