Print

---

Author: [log in to unmask]
Date: Mon Oct 27 11:49:54 2014
New Revision: 1316

Log:
Update to extend AbstractSvtDaqMapping.

Modified:
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	Mon Oct 27 11:49:54 2014
@@ -2,8 +2,6 @@
 
 import org.lcsim.detector.tracker.silicon.HpsSiSensor;
 
-import org.hps.conditions.AbstractConditionsObject;
-import org.hps.conditions.ConditionsObjectCollection;
 import org.hps.util.Pair;
 
 /**
@@ -12,29 +10,19 @@
  * @author Jeremy McCormick <[log in to unmask]>
  * @author Omar Moreno <[log in to unmask]>
  */
-public class SvtDaqMapping extends AbstractConditionsObject {
+public class SvtDaqMapping extends AbstractSvtDaqMapping {
 
-    public static class SvtDaqMappingCollection extends ConditionsObjectCollection<SvtDaqMapping> {
+    public static class SvtDaqMappingCollection 
+            extends AbstractSvtDaqMappingCollection<SvtDaqMapping> {
 
         /**
-         * Flag values for top or bottom half.
-         */
-        public static final String TOP_HALF = "T";
-        public static final String BOTTOM_HALF = "B";
-        
-        /**
-         * Flag values for axial or stereo sensors 
-         */
-        public static final String AXIAL = "A";
-        public static final String STEREO = "S";
-
-        /**
-         * Get a DAQ pair (FEB ID, FEB Hybrid ID) for the given {@link HpsSiSensor}
+         * Get a DAQ pair (FEB ID, FEB Hybrid ID) for the given 
+         * {@link HpsSiSensor}
          * 
 		 * @param  sensor A sensor of type {@link HpsSiSensor}
 		 * @return The DAQ pair associated with the sensor 
          */
-        Pair<Integer, Integer> getDaqPair(HpsSiSensor sensor) {
+        public Pair<Integer, Integer> getDaqPair(HpsSiSensor sensor) {
         	
         	String svtHalf = sensor.isTopLayer() ? TOP_HALF : BOTTOM_HALF;
         	for (SvtDaqMapping object : this.getObjects()) {
@@ -117,19 +105,7 @@
     	return getFieldValue("feb_hybrid_id");
     }
     
-    public String getSvtHalf() {
-        return getFieldValue("svt_half");
-    }
-
-    public int getLayerNumber() {
-        return getFieldValue("layer");
-    }
-    
     public String getSide(){
     	return getFieldValue("side");
     }
-
-    public String getOrientation() { 
-    	return getFieldValue("orientation");
-    }
 }