java/trunk/users/src/main/java/org/hps/users/jeremym

--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalConditionsTestDriver.java	2014-04-28 00:28:12 UTC (rev 520)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalConditionsTestDriver.java	2014-04-28 00:47:51 UTC (rev 521)
@@ -61,7 +61,7 @@

     public void detectorChanged(Detector detector) {
         ecalConditions = ConditionsManager.defaultInstance()
                 .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();

-        channels = ecalConditions.getChannelMap();

+        channels = ecalConditions.getChannelCollection();

         helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
     }
          

@@ -176,9 +176,7 @@

         IIdentifier id = new Identifier(rawId);
         int x = helper.getValue(id, "ix");
         int y = helper.getValue(id, "iy");

-        GeometryId geometryId = new GeometryId();
-        geometryId.x = x;
-        geometryId.y = y;

+        GeometryId geometryId = new GeometryId(helper, new int[] {x, y});

         EcalChannel channel = channels.findChannel(geometryId);
         return ecalConditions.getChannelConstants(channel);
     }