java/trunk/conditions/src/main/java/org/hps/conditions/svt

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	2014-09-05 22:43:21 UTC (rev 958)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	2014-09-06 00:12:08 UTC (rev 959)
@@ -11,19 +11,19 @@

         /**
          * Flag values for top or bottom half.
          */

-        public static final int TOP_HALF = 0;
-        public static final int BOTTOM_HALF = 1;

+        public static final String TOP_HALF = "T";
+        public static final String BOTTOM_HALF = "B";

 
         /**

-         * Get a DAQ pair (FPGA, hybrid) by top/bottom number and layer number.
-         * @param half Value indicating top or bottom half of detector.

+         * Get a DAQ pair (FEB ID, FEB Hybrid ID) by SVT volume and layer number.
+         * @param svtHalf Value indicating top or bottom half of detector.

          * @param layerNumber The layer number.
          * @return The DAQ pair for the half and layer number or null if does not exist.
          */

-        Pair<Integer, Integer> get(int half, int layerNumber) {

+        Pair<Integer, Integer> getDaqPair(String SvtHalf, int layerNumber) {

             for (SvtDaqMapping object : this.getObjects()) {

-                if (object.getHalf() == half && object.getLayerNumber() == layerNumber) {
-                    return new Pair<Integer, Integer>(object.getFpgaNumber(), object.getHybridNumber());

+                if (object.getSvtHalf() == SvtHalf && object.getLayerNumber() == layerNumber) {
+                    return new Pair<Integer, Integer>(object.getFebID(), object.getFebHybridID());

                 }
             }
             return null;

@@ -35,43 +35,61 @@

          */
         public String toString() {
             StringBuffer buff = new StringBuffer();

-            buff.append("half");

+            buff.append("FEB ID: ");

             buff.append(" ");

-            buff.append("layer");

+            buff.append("FEB Hybrid ID: ");

             buff.append(" ");

-            buff.append("fpga");

+            buff.append("Hybrid ID: ");

             buff.append(" ");

-            buff.append("hybrid");

+            buff.append("SVT half: ");
+            buff.append(" ");
+            buff.append("Layer");
+            buff.append(" ");
+            buff.append("Orientation: ");
+            buff.append(" ");

             buff.append('\n');
             buff.append("----------------------");
             buff.append('\n');
             for (SvtDaqMapping object : getObjects()) {

-                buff.append(object.getHalf());

+            	buff.append(object.getFebID());

                 buff.append("    ");

+            	buff.append(object.getFebHybridID());
+                buff.append("    ");
+            	buff.append(object.getHybridID());
+                buff.append("    ");
+                buff.append(object.getSvtHalf());
+                buff.append("    ");

                 buff.append(String.format("%-2d", object.getLayerNumber()));
                 buff.append("    ");

-                buff.append(object.getFpgaNumber());

+                buff.append(object.getOrientation());

                 buff.append("    ");

-                buff.append(object.getHybridNumber());

                 buff.append('\n');
             }
             return buff.toString();
         }
     }

-
-    public int getHalf() {
-        return getFieldValue("half");

+    
+    public int getFebID() { 
+    	return getFieldValue("feb_id");

     }

+    
+    public int getFebHybridID() { 
+    	return getFieldValue("feb_hybrid_id");
+    }
+    
+    public int getHybridID() { 
+    	return getFieldValue("hybrid_id");
+    }
+    
+    public String getSvtHalf() {
+        return getFieldValue("svt_half");
+    }

 
     public int getLayerNumber() {
         return getFieldValue("layer");
     }
 

-    public int getFpgaNumber() {
-        return getFieldValue("fpga");

+    public String getOrientation() { 
+    	return getFieldValue("orientation");

     }

-
-    public int getHybridNumber() {
-        return getFieldValue("hybrid");
-    }

 }