Print

---

Author: [log in to unmask]
Date: Thu Jan  1 23:22:28 2015
New Revision: 1827

Log:
Use ConditionsSeries for bad channels.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java	Thu Jan  1 23:22:28 2015
@@ -1,5 +1,6 @@
 package org.hps.conditions.ecal;
 
+import org.hps.conditions.api.ConditionsSeries;
 import org.hps.conditions.database.DatabaseConditionsManager;
 import org.hps.conditions.ecal.EcalBadChannel.EcalBadChannelCollection;
 import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
@@ -25,8 +26,8 @@
         return manager.getCachedConditions(EcalGainCollection.class, "test_run_ecal_gains").getCachedData();
     }
     
-    protected EcalBadChannelCollection getEcalBadChannelCollection(DatabaseConditionsManager manager) {
-        return manager.getCachedConditions(EcalBadChannelCollection.class, "test_run_ecal_bad_channels").getCachedData();
+    protected ConditionsSeries<EcalBadChannel, EcalBadChannelCollection> getEcalBadChannelSeries(DatabaseConditionsManager manager) {
+        return manager.getConditionsSeries(EcalBadChannelCollection.class, "test_run_ecal_bad_channels");
     }
     
     protected EcalCalibrationCollection getEcalCalibrationCollection(DatabaseConditionsManager manager) {

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java	Thu Jan  1 23:22:28 2015
@@ -2,6 +2,8 @@
 
 import java.util.logging.Logger;
 
+import org.hps.conditions.api.ConditionsObjectCollection;
+import org.hps.conditions.api.ConditionsSeries;
 import org.hps.conditions.database.DatabaseConditionsManager;
 import org.hps.conditions.svt.SvtBadChannel.SvtBadChannelCollection;
 import org.hps.conditions.svt.SvtCalibration.SvtCalibrationCollection;
@@ -30,6 +32,10 @@
     
     protected SvtBadChannelCollection getSvtBadChannelCollection(DatabaseConditionsManager manager) {
         return manager.getCollection(SvtBadChannelCollection.class);
+    }
+    
+    protected ConditionsSeries<SvtBadChannel, SvtBadChannelCollection> getSvtBadChannelSeries(DatabaseConditionsManager manager) {
+        return manager.getConditionsSeries(SvtBadChannelCollection.class);
     }
     
     protected SvtCalibrationCollection getSvtCalibrationCollection(DatabaseConditionsManager manager) {
@@ -65,10 +71,12 @@
 
         // Get the bad channels from the conditions database. If there aren't any bad channels, notify the user and move on.
         try {
-            SvtBadChannelCollection badChannels = getSvtBadChannelCollection(dbConditionsManager);
-            for (SvtBadChannel badChannel : badChannels) {
-                AbstractSvtChannel channel = conditions.getChannelMap().findChannel(badChannel.getChannelId());
-                conditions.getChannelConstants(channel).setBadChannel(true);
+            ConditionsSeries<SvtBadChannel, SvtBadChannelCollection> badChannelSeries = getSvtBadChannelSeries(dbConditionsManager);
+            for (ConditionsObjectCollection<SvtBadChannel> badChannelCollection : badChannelSeries) {
+                for (SvtBadChannel badChannel : badChannelCollection) {
+                    AbstractSvtChannel channel = conditions.getChannelMap().findChannel(badChannel.getChannelId());
+                    conditions.getChannelConstants(channel).setBadChannel(true);
+                }
             }
         } catch (RuntimeException e) {
             logger.warning("A set of SVT bad channels was not found.");