hps-java/src/main/java/org/lcsim/hps/conditions/svt
diff -u -r1.2 -r1.3
--- SvtConditionsConverter.java 11 Oct 2013 00:07:24 -0000 1.2
+++ SvtConditionsConverter.java 15 Oct 2013 01:36:21 -0000 1.3
@@ -3,14 +3,13 @@
import static org.lcsim.hps.conditions.ConditionsConstants.SVT_BAD_CHANNELS;
import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CALIBRATIONS;
import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CHANNELS;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_DAQ_MAP;
import static org.lcsim.hps.conditions.ConditionsConstants.SVT_GAINS;
import static org.lcsim.hps.conditions.ConditionsConstants.SVT_PULSE_PARAMETERS;
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_DAQ_MAP;
import java.util.Map.Entry;
import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.ChannelCollection;
import org.lcsim.hps.conditions.DatabaseConditionsConverter;
/**
@@ -51,7 +50,7 @@
}
// Add bad channels.
- ChannelCollection badChannels = manager.getCachedConditions(ChannelCollection.class, SVT_BAD_CHANNELS).getCachedData();
+ SvtBadChannelCollection badChannels = manager.getCachedConditions(SvtBadChannelCollection.class, SVT_BAD_CHANNELS).getCachedData();
for (Integer badChannel : badChannels) {
SvtChannel channel = conditions.getChannelMap().get(badChannel);
conditions.getChannelConstants(channel).setBadChannel(true);