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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsTableRegistry.java	2014-03-18 16:18:13 UTC (rev 312)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsTableRegistry.java	2014-03-18 19:10:30 UTC (rev 313)
@@ -71,6 +71,14 @@

         fields.add("svt_channel_id");
         addTableMetaData(new ConditionsTableMetaData(ConditionsTableConstants.SVT_BAD_CHANNELS, fields));
         

+        // SVT DAQ map
+        fields = new HashSet<String>();
+        fields.add("half");
+        fields.add("layer");
+        fields.add("fpga");
+        fields.add("hybrid");
+        addTableMetaData(new ConditionsTableMetaData(ConditionsTableConstants.SVT_DAQ_MAP, fields));
+        

         // ECal bad channels
         fields = new HashSet<String>();
         fields.add("ecal_channel_id");

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-18 16:18:13 UTC (rev 312)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtCalibrationConverter.java	2014-03-18 19:10:30 UTC (rev 313)
@@ -45,9 +45,8 @@

         int collectionId = record.getFieldValue();
 
         // Objects for building the return value.

-        ConditionsTableMetaData tableMetaData = _objectFactory.getTableRegistry().getTableMetaData(tableName);

         SvtCalibrationCollection collection = 

-                new SvtCalibrationCollection(tableMetaData, collectionId, true); 

+                new SvtCalibrationCollection(this.getTableMetaData(tableName), collectionId, true); 

 
         // Get a connection from the manager.
         ConnectionManager connectionManager = getConnectionManager();

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java	2014-03-18 16:18:13 UTC (rev 312)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java	2014-03-18 19:10:30 UTC (rev 313)
@@ -38,9 +38,9 @@

             
             // Get info from the DAQ map about this sensor. 
             Pair<Integer, Integer> daqPair = null;            

-            int half = SvtDaqMap.TOP;

+            int half = SvtDaqMap.TOP_HALF;

             if (sensor.isBottomLayer()) {

-                half = SvtDaqMap.BOTTOM;

+                half = SvtDaqMap.BOTTOM_HALF;

             }             
             daqPair = daqMap.get(half, layerNumber);
             if (daqPair == null) {

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-18 16:18:13 UTC (rev 312)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-18 19:10:30 UTC (rev 313)
@@ -5,12 +5,13 @@

 import java.sql.ResultSet;
 import java.sql.SQLException;
 

+import org.hps.conditions.AbstractConditionsObject.FieldValueMap;
+import org.hps.conditions.ConditionsObjectException;

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConnectionManager;
 import org.hps.conditions.DatabaseConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;

-import org.lcsim.hps.util.Pair;

 
 /**
  * This class creates a {@link SvtDaqMap} from the conditions database.

@@ -31,24 +32,25 @@

         if (name == null) {
             name = SVT_DAQ_MAP;
         }

-        
-        // The object to be returned to caller.
-        SvtDaqMap daqMap = new SvtDaqMap();
-        

+                

         // Get the ConditionsRecord with the meta-data, which will use the current run number from the manager.
         ConditionsRecord record = ConditionsRecord.find(manager, name).get(0);
                
         // Get the table name, field name, and field value defining the applicable conditions.
         String tableName = record.getTableName();
         String fieldName = record.getFieldName();

-        int fieldValue = record.getFieldValue();

+        int collectionId = record.getFieldValue();
+        
+        // The object to be returned to caller.
+        SvtDaqMap collection = 
+               new SvtDaqMap(this.getTableMetaData(tableName), collectionId, true); 

                         
         // Get the connection manager.
         ConnectionManager connectionManager = ConnectionManager.getConnectionManager();
                                                                                             
         // Construct the query to find matching calibration records using the ID field.

-        String query = "SELECT half, layer, hybrid, fpga FROM "
-                + tableName + " WHERE " + fieldName + " = " + fieldValue

+        String query = "SELECT id, half, layer, hybrid, fpga FROM "
+                + tableName + " WHERE " + fieldName + " = " + collectionId

                 + " ORDER BY half ASC, layer ASC";
                    
         // Execute the query and get the results.

@@ -58,21 +60,25 @@

             // Loop over the database records.
             while(resultSet.next()) {          
                 

-                // Get record data.
-                int half = resultSet.getInt(1);
-                int layer = resultSet.getInt(2);
-                int hybrid = resultSet.getInt(3);
-                int fpga = resultSet.getInt(4);
-                                
-                // Add data to DAQ map: half => layer => DAQ pair               
-                daqMap.add(half, layer, new Pair<Integer,Integer>(fpga, hybrid));

+                int rowId = resultSet.getInt(1);
+                
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("half", resultSet.getInt(2));
+                fieldValues.put("layer", resultSet.getInt(3));
+                fieldValues.put("hybrid", resultSet.getInt(4));
+                fieldValues.put("fpga", resultSet.getInt(5));
+                SvtDaqMapping newObject = _objectFactory.createObject(
+                        SvtDaqMapping.class, tableName, rowId, fieldValues, true);
+                collection.add(newObject);

             }            
         } catch (SQLException x) {
             throw new RuntimeException("Database error.", x);

-        } 

+        } catch (ConditionsObjectException x) {
+            throw new RuntimeException("Error creating object of " + getType().getSimpleName() + " type.", x);
+        }

         
         // Return DAQ map to caller.

-        return daqMap;

+        return collection;

     }
 
     /**

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java	2014-03-18 19:10:30 UTC (rev 313)
@@ -0,0 +1,23 @@

+package org.hps.conditions.svt;
+
+import org.hps.conditions.AbstractConditionsObject;
+
+
+public class SvtDaqMapping extends AbstractConditionsObject {
+
+    public int getHalf() {
+        return getFieldValue("half");
+    }
+    
+    public int getLayerNumber() {
+        return getFieldValue("layer");
+    }
+    
+    public int getFpgaNumber() {
+        return getFieldValue("fpga");
+    }
+    
+    public int getHybridNumber() {
+        return getFieldValue("hybrid");
+    }    
+}