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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -33,6 +33,10 @@

     public List<T> getObjects() {
         return Collections.unmodifiableList(objects);
     }

+    
+    public boolean contains(Object object) {
+        return getObjects().contains(object);
+    }

         
     public void add(T object) {
         if (objects.contains(object)) {

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsTableRegistry.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsTableRegistry.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -90,13 +90,22 @@

         fields.add("gain");
         addTableMetaData(new ConditionsTableMetaData(ConditionsTableConstants.ECAL_GAINS, fields));
         

-        // Ecal calibrations

+        // ECal calibrations

         fields = new HashSet<String>();
         fields.add("ecal_channel_id");
         fields.add("noise");
         fields.add("pedestal");
         addTableMetaData(new ConditionsTableMetaData(ConditionsTableConstants.ECAL_CALIBRATIONS, fields));
         

+        // ECal channels
+        fields = new HashSet<String>();
+        fields.add("crate");
+        fields.add("slot");
+        fields.add("channel");
+        fields.add("x");
+        fields.add("y"); 
+        addTableMetaData(new ConditionsTableMetaData(ConditionsTableConstants.ECAL_CHANNELS, fields));
+        

         // Beam current
         fields = new HashSet<String>();
         fields.add("beam_current");

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelConverter.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannelConverter.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -52,15 +52,11 @@

             
             // Loop over the records.
             try {

-                while (resultSet.next()) {
-                    
-                    int rowId = resultSet.getInt(1);
-                                        

+                while (resultSet.next()) {                    
+                    int rowId = resultSet.getInt(1);                                       

                     FieldValueMap fieldValues = new FieldValueMap();

-                    fieldValues.put("ecal_channel_id", resultSet.getInt(2));
-                    
-                    EcalBadChannel newObject = _objectFactory.createObject(EcalBadChannel.class, tableName, rowId, fieldValues, true);
-                    

+                    fieldValues.put("ecal_channel_id", resultSet.getInt(2));                    
+                    EcalBadChannel newObject = _objectFactory.createObject(EcalBadChannel.class, tableName, rowId, fieldValues, true);                    

                     collection.add(newObject);
                 }
             } catch (SQLException x) {

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMap.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMap.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -1,14 +1,29 @@

 package org.hps.conditions.ecal;
 

-import java.util.HashMap;

+import org.hps.conditions.ConditionsObjectCollection;

 
 /**
  * This class maps ID values from the database to detailed ECal channel information.
  * There should really only be one of these data structures per job, as the EcalChannel 
  * objects are used as unique identifiers in the {@link EcalConditions} class.
  */

-public class EcalChannelMap extends HashMap<Integer, EcalChannel> {

+public class EcalChannelMap extends ConditionsObjectCollection<EcalChannel> {

+    public static final class DaqId {
+        public int crate;
+        public int slot;
+        public int channel;
+    }
+    
+    public static final class GeometryId {
+        public int x;
+        public int y;
+    }
+    
+    public static final class ChannelId {
+        public int id;
+    }
+    

     /**
      * Class constructor.
      */

@@ -22,11 +37,11 @@

      * @param channelNumber The channel number.
      * @return The matching channel or null if does not exist.
      */

-    public EcalChannel find(int crate, int slot, int channelNumber) {
-        for (EcalChannel channel : values()) {
-            if (channel.getCrate() == crate 
-                    && channel.getSlot() == slot 
-                    && channel.getChannel() == channelNumber) {

+    public EcalChannel findChannel(DaqId daqId) {
+        for (EcalChannel channel : getObjects()) {
+            if (channel.getCrate() == daqId.crate 
+                    && channel.getSlot() == daqId.slot 
+                    && channel.getChannel() == daqId.channel) {

                 return channel;
             }
         }

@@ -38,15 +53,22 @@

      * @param x The x value.
      * @param y The y value.
      * @return The matching channel or null if does not exist.

-     * 
-     * FIXME: Improve performance of this method from O(N).

      */

-    public EcalChannel find(int x, int y) {
-        for (EcalChannel channel : values()) {
-            if (channel.getX() == x && channel.getY()== y) {

+    public EcalChannel findChannel(GeometryId geometryId) {
+        for (EcalChannel channel : getObjects()) {
+            if (channel.getX() == geometryId.x && channel.getY() == geometryId.y) {

                 return channel;
             }
         }
         return null;
     }

+    
+    public EcalChannel findChannel(ChannelId channelId) {
+        for (EcalChannel channel : getObjects()) {
+            if (channel.getId() == channelId.id) {
+                return channel;
+            }
+        }
+        return null;
+    }

 }

\ No newline at end of file

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannelMapConverter.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -5,10 +5,12 @@

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

-import org.lcsim.conditions.ConditionsManager;

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

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.ConnectionManager;
 import org.hps.conditions.DatabaseConditionsConverter;

+import org.lcsim.conditions.ConditionsManager;

 
 /**
  * This class creates the {@link EcalChannelMap} from the conditions table

@@ -30,16 +32,17 @@

      */
     public EcalChannelMap getData(ConditionsManager manager, String name) {
 

-        // Collection to be returned to caller.
-        EcalChannelMap channels = new EcalChannelMap();
-

         // References to database objects.
         ResultSet resultSet = null;
         ConnectionManager connectionManager = getConnectionManager();

+        
+        // Collection to be returned to caller.
+        EcalChannelMap collection = new EcalChannelMap();

 
         // Assign default key name if none was given.

-        if (name == null)
-            name = ECAL_CHANNELS;

+        String tableName = name;
+        if (tableName == null)
+            tableName = ECAL_CHANNELS;

 
         // Query to retrieve channel data.
         String query = "SELECT id, x, y, crate, slot, channel FROM " + name;

@@ -50,21 +53,24 @@

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

-                // Create channel data object from database record.
-                int id = resultSet.getInt(1);
-                int x = resultSet.getInt(2);
-                int y = resultSet.getInt(3);
-                int crate = resultSet.getInt(4);
-                int slot = resultSet.getInt(5);
-                int channel = resultSet.getInt(6);
-                EcalChannel channelData = new EcalChannel(id, crate, slot, channel, x, y);
-                channels.put(channelData.getId(), channelData);

+                
+                int rowId = resultSet.getInt(1);                                       
+                FieldValueMap fieldValues = new FieldValueMap();
+                fieldValues.put("x", resultSet.getInt(2));
+                fieldValues.put("y", resultSet.getInt(3));
+                fieldValues.put("crate", resultSet.getInt(4));
+                fieldValues.put("slot", resultSet.getInt(5));
+                fieldValues.put("channel", resultSet.getInt(6));                                
+                EcalChannel newObject = _objectFactory.createObject(EcalChannel.class, tableName, rowId, fieldValues, true);                    
+                collection.add(newObject);

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

-        } 

+        } catch (ConditionsObjectException x) {
+            throw new RuntimeException("Error converting to " + getType().getSimpleName() + " type.", x);
+        }

-        return channels;

+        return collection;

     }
 
     /**

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditions.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditions.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -49,7 +49,7 @@

      */
     public EcalChannelConstants getChannelConstants(EcalChannel channel) {
         // This channel must come from the map.

-        if (!channelMap.containsValue(channel)) {

+        if (!channelMap.contains(channel)) {

             System.err.println("Channel not found in map => " + channel);
             throw new IllegalArgumentException("Channel was not found in map.");
         }

@@ -98,7 +98,7 @@

         buff.append('\n');
         
         // Loop over all channels.

-        for (EcalChannel channel : channelMap.values()) {

+        for (EcalChannel channel : channelMap.getObjects()) {

             
             EcalChannelConstants constants = getChannelConstants(channel);
             

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

--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-03-18 22:30:45 UTC (rev 315)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java	2014-03-18 23:05:19 UTC (rev 316)
@@ -5,10 +5,9 @@

 import static org.hps.conditions.ConditionsTableConstants.ECAL_CHANNELS;
 import static org.hps.conditions.ConditionsTableConstants.ECAL_GAINS;
 

-import java.util.Map.Entry;
-

 import org.hps.conditions.ConditionsObjectFactory;
 import org.hps.conditions.DatabaseConditionsConverter;

+import org.hps.conditions.ecal.EcalChannelMap.ChannelId;

 import org.lcsim.conditions.ConditionsManager;
 
 /**

@@ -39,7 +38,9 @@

         // Add gains.
         EcalGainCollection gains = manager.getCachedConditions(EcalGainCollection.class, ECAL_GAINS).getCachedData();        
         for (EcalGain gain : gains.getObjects()) {

-            EcalChannel channel = channelMap.get(gain.getChannelId());

+            ChannelId channelId = new ChannelId();
+            channelId.id = gain.getChannelId();
+            EcalChannel channel = channelMap.findChannel(channelId);

             conditions.getChannelConstants(channel).setGain(gain);
         }
         

@@ -47,7 +48,9 @@

         EcalBadChannelCollection badChannels = manager.getCachedConditions(
                 EcalBadChannelCollection.class, ECAL_BAD_CHANNELS).getCachedData();
         for (EcalBadChannel badChannel : badChannels.getObjects()) {

-            EcalChannel channel = channelMap.get(badChannel.getChannelId());

+            ChannelId channelId = new ChannelId();
+            channelId.id = badChannel.getChannelId();
+            EcalChannel channel = channelMap.findChannel(channelId);

             conditions.getChannelConstants(channel).setBadChannel(true);
         }
         

@@ -55,7 +58,9 @@

         EcalCalibrationCollection calibrations = 
                 manager.getCachedConditions(EcalCalibrationCollection.class, ECAL_CALIBRATIONS).getCachedData();
         for (EcalCalibration calibration : calibrations.getObjects()) {

-            EcalChannel channel = channelMap.get(calibration.getChannelId());

+            ChannelId channelId = new ChannelId();
+            channelId.id = calibration.getChannelId();
+            EcalChannel channel = channelMap.findChannel(channelId);

             conditions.getChannelConstants(channel).setCalibration(calibration);
         }