hps-java/src/main/java/org/lcsim/hps/conditions
diff -u -r1.16 -r1.17
--- DatabaseConditionsReader.java 9 Oct 2013 21:00:29 -0000 1.16
+++ DatabaseConditionsReader.java 9 Oct 2013 22:31:53 -0000 1.17
@@ -14,6 +14,7 @@
import org.lcsim.conditions.ConditionsReader;
import org.lcsim.hps.conditions.ecal.EcalCalibrationConverter;
import org.lcsim.hps.conditions.ecal.EcalChannelMapConverter;
+import org.lcsim.hps.conditions.ecal.EcalConditionsConverter;
import org.lcsim.hps.conditions.ecal.EcalGainConverter;
import org.lcsim.hps.conditions.svt.PulseParametersConverter;
import org.lcsim.hps.conditions.svt.SvtCalibrationConverter;
@@ -46,7 +47,7 @@
* </p>
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DatabaseConditionsReader.java,v 1.16 2013/10/09 21:00:29 jeremy Exp $
+ * @version $Id: DatabaseConditionsReader.java,v 1.17 2013/10/09 22:31:53 jeremy Exp $
*/
public class DatabaseConditionsReader extends ConditionsReader {
@@ -236,5 +237,8 @@
// ECAL pulse parameters.
manager.registerConditionsConverter(new PulseParametersConverter());
+
+ // ECAL combined conditions.
+ manager.registerConditionsConverter(new EcalConditionsConverter());
}
}