--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java	2014-09-14 08:00:06 UTC (rev 1021)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java	2014-09-14 08:03:37 UTC (rev 1022)
@@ -66,35 +66,56 @@

            
             // Set the FEB Hybrid ID of the sensor
             sensor.setFebHybridID(daqPair.getSecondElement());

+           
+            // Set the orientation of the sensor
+            String orientation = daqMap.getOrientation(daqPair);
+            if(orientation != null && orientation.contentEquals(SvtDaqMappingCollection.AXIAL)){
+            	sensor.setAxial(true);
+            } else if(orientation != null && orientation.contains(SvtDaqMappingCollection.STEREO)){
+            	sensor.setStereo(true);
+            }

 
             // Find all the channels for this sensor.
             Collection<SvtChannel> channels = channelMap.find(daqPair);
 
             // Loop over the channels of the sensor.
             for (SvtChannel channel : channels) {

-                // Get conditions data for this channel.

+                
+            	// 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:
                 //

+                
+                // Check if the channel was flagged as bad

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

-
-                /*

+                
+                // Set the pedestal and noise of each of the samples for the 
+                // channel
+                double[] pedestal = new double[6];
+                double[] noise = new double[6];
+                for(int sampleN = 0; sampleN < HpsSiSensor.NUMBER_OF_SAMPLES; sampleN++){
+                	pedestal[sampleN] = constants.getCalibration().getPedestal(sampleN);
+                	noise[sampleN] = constants.getCalibration().getNoise(sampleN);
+                }
+                sensor.setPedestal(channelNumber, pedestal);
+                sensor.setNoise(channelNumber, noise);
+               
+                // Set the gain and offset for the channel

                 sensor.setGain(channelNumber, constants.getGain().getGain());

-                sensor.setTimeOffset(channelNumber, constants.getGain().getOffset());
-                sensor.setNoise(channelNumber, constants.getCalibration().getNoise());
-                sensor.setPedestal(channelNumber, constants.getCalibration().getPedestal());
-                sensor.setPulseParameters(channelNumber, constants.getPulseParameters().toArray());
-                */

+                sensor.setOffset(channelNumber, constants.getGain().getOffset());
+               
+                // Set the shape fit parameters
+                sensor.setShapeFitParameters(channelNumber, constants.getShapeFitParameters().toArray());

             }
 

-            // Set the time shift for the sensor.
-            //SvtTimeShift sensorTimeShift = timeShifts.find(daqPair).get(0);
-            //sensor.setTimeShift(sensorTimeShift.getTimeShift());

+            // Set the t0 shift for the sensor.
+            SvtT0Shift sensorT0Shift = t0Shifts.find(daqPair).get(0);
+            sensor.setT0Shift(sensorT0Shift.getT0Shift());

         }
     }
 }