--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMap.java	2014-03-19 00:08:37 UTC (rev 318)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMap.java	2014-03-19 00:44:40 UTC (rev 319)
@@ -1,67 +0,0 @@

-package org.hps.conditions.svt;
-
-import org.hps.conditions.ConditionsObjectCollection;
-import org.hps.conditions.ConditionsTableMetaData;
-import org.lcsim.hps.util.Pair;
-
-/**
- * This class establishes the mapping between layer numbers and DAQ pair (FPGA, hybrid)
- * for the top and bottom halves of the detector. 
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class SvtDaqMap extends ConditionsObjectCollection<SvtDaqMapping> {
-    
-    /**
-     * Flag values for top or bottom half.
-     */
-    public static final int TOP_HALF = 0;
-    public static final int BOTTOM_HALF = 1;
-    
-    public SvtDaqMap(ConditionsTableMetaData tableMetaData, int collectionId, boolean isReadOnly) {
-        super(tableMetaData, collectionId, isReadOnly);
-    }
-      
-    /**
-     * Get a DAQ pair (FPGA, hybrid) by top/bottom number and layer number.
-     * @param half 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) {
-        for (SvtDaqMapping object : this.getObjects()) {
-            if (object.getHalf() == half && object.getLayerNumber() == layerNumber) {
-                return new Pair<Integer, Integer>(object.getFpgaNumber(), object.getHybridNumber());
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Convert this object to a string.
-     * @return This object converted to a string.
-     */
-    public String toString() {
-        StringBuffer buff = new StringBuffer();
-        buff.append("half");
-        buff.append(" ");
-        buff.append("layer");
-        buff.append(" ");
-        buff.append("fpga");
-        buff.append(" ");
-        buff.append("hybrid");
-        buff.append('\n');
-        buff.append("----------------------");
-        buff.append('\n');
-        for (SvtDaqMapping object : getObjects()) {
-            buff.append(object.getHalf());
-            buff.append("    ");
-            buff.append(String.format("%-2d", object.getLayerNumber()));
-            buff.append("    ");                
-            buff.append(object.getFpgaNumber());
-            buff.append("    ");
-            buff.append(object.getHybridNumber());
-            buff.append('\n');
-        }        
-        return buff.toString();
-    }    
-}

\ No newline at end of file

--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-19 00:08:37 UTC (rev 318)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapConverter.java	2014-03-19 00:44:40 UTC (rev 319)
@@ -1,89 +0,0 @@

-package org.hps.conditions.svt;
-
-import static org.hps.conditions.ConditionsTableConstants.SVT_DAQ_MAP;
-
-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;
-
-/**
- * This class creates a {@link SvtDaqMap} from the conditions database.
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class SvtDaqMapConverter extends DatabaseConditionsConverter<SvtDaqMap> {
-
-    public SvtDaqMapConverter(ConditionsObjectFactory objectFactory) {
-        super(objectFactory);
-    }
-    
-    /**
-     * Create an {@link SvtDaqMap} object from the database.
-     */
-    public SvtDaqMap getData(ConditionsManager manager, String name) {
-        
-        // Use default key name if not set.
-        if (name == null) {
-            name = SVT_DAQ_MAP;
-        }
-                
-        // 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();
-        int collectionId = record.getCollectionId();
-        
-        // 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 id, half, layer, hybrid, fpga FROM " + tableName 
-                + " WHERE collection_id = " + collectionId
-                + " ORDER BY half ASC, layer ASC";
-                   
-        // Execute the query and get the results.
-        ResultSet resultSet = connectionManager.query(query);
-               
-        try {
-            // Loop over the database records.
-            while(resultSet.next()) {                          
-                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 collection;
-    }
-
-    /**
-     * Get the type handled by this converter.
-     * @return The type handled by this converter.
-     */
-    public Class<SvtDaqMap> getType() {
-        return SvtDaqMap.class;
-    }
-
-}