Print

---

Author: [log in to unmask]
Date: Mon Mar  9 00:42:45 2015
New Revision: 2371

Log:
Add parameterized (FEB ID/Hybrid ID) constructor to SvtDaqMapping.  Fix bug causing the setters to throw exceptions even when allowed values were being set.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtDaqMapping.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtDaqMapping.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtDaqMapping.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtDaqMapping.java	Mon Mar  9 00:42:45 2015
@@ -87,7 +87,7 @@
      *   @param svtHalf : SVT half (TOP or BOTTOM)
      */
     public void setSvtHalf(String svtHalf) { 
-        if (svtHalf != AbstractSvtDaqMapping.TOP_HALF || svtHalf != AbstractSvtDaqMapping.BOTTOM_HALF) 
+        if (!svtHalf.equals(AbstractSvtDaqMapping.TOP_HALF) && !svtHalf.equals(AbstractSvtDaqMapping.BOTTOM_HALF)) 
             throw new RuntimeException("[ " + this.getClass().getSimpleName() + " ]: Invalid value of SVT half.");
         this.setFieldValue("svt_half", svtHalf);
         
@@ -109,7 +109,7 @@
      *  @param orientation : Orientation of an SVT sensor (AXIAL or STEREO) 
      */
     public void setOrientation(String orientation) { 
-        if (orientation != AbstractSvtDaqMapping.AXIAL || orientation != AbstractSvtDaqMapping.STEREO)
+        if (!orientation.equals(AbstractSvtDaqMapping.AXIAL) && !orientation.equals(AbstractSvtDaqMapping.STEREO))
             throw new RuntimeException("[ " + this.getClass().getSimpleName() + " ]: Invalid orientation of sensor.");
         this.setFieldValue("orientation", orientation);
     }

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	Mon Mar  9 00:42:45 2015
@@ -16,13 +16,30 @@
 @Table(names = {"svt_daq_map"})
 @Converter(multipleCollectionsAction = MultipleCollectionsAction.ERROR)
 public class SvtDaqMapping extends AbstractSvtDaqMapping {
-   
+    
     /**
      *  Constants describing the side of a sensor
      */
     public static final String ELECTRON = "ELECTRON";
     public static final String POSITRON = "POSITRON";
 
+    /**
+     *  Default Constructor 
+     */
+    public SvtDaqMapping() { 
+    }
+   
+    /**
+     *  Constructor 
+     *
+     *  @param febID : The Front End Board (FEB) ID (0-9)
+     *  @param febHybridID : The FEB hybrid ID (0-3)
+     */
+    public SvtDaqMapping(int febID, int febHybridID) { 
+        this.setFebID(febID);
+        this.setFebHybridID(febHybridID);
+    }
+    
     public static class SvtDaqMappingCollection extends AbstractSvtDaqMappingCollection<SvtDaqMapping> {
 
         /**
@@ -160,7 +177,7 @@
      *  @param side : sensor side (ELECTRON or POSITRON)
      */
     public void setSide(String side) {
-        if (side != SvtDaqMapping.ELECTRON || side != SvtDaqMapping.POSITRON) 
+        if (!side.equals(SvtDaqMapping.ELECTRON) && !side.equals(SvtDaqMapping.POSITRON)) 
             throw new RuntimeException("[ " + this.getClass().getSimpleName() + " ]: Invalid value for sensor side.");
         this.setFieldValue("side", side);
     }