hps-java/src/main/java/org/lcsim/hps/monitoring
diff -u -r1.5 -r1.6
--- HPSCalibrationDriver.java 14 Aug 2012 01:31:47 -0000 1.5
+++ HPSCalibrationDriver.java 27 Aug 2012 18:51:31 -0000 1.6
@@ -1,7 +1,5 @@
package org.lcsim.hps.monitoring;
-import java.util.Date;
-
import org.lcsim.geometry.Detector;
import org.lcsim.hps.recon.ecal.HPSEcalConditions;
import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
@@ -11,7 +9,7 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSCalibrationDriver.java,v 1.5 2012/08/14 01:31:47 omoreno Exp $
+ * @version $Id: HPSCalibrationDriver.java,v 1.6 2012/08/27 18:51:31 meeg Exp $
*/
public class HPSCalibrationDriver extends Driver {
@@ -29,7 +27,8 @@
@Override
public void detectorChanged(Detector detector){
super.detectorChanged(detector);
- HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), runNumber);
+// HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), runNumber);
+ HPSSVTCalibrationConstants.loadBadChannels(runNumber);
}
public HPSCalibrationDriver() {
hps-java/src/main/java/org/lcsim/hps/monitoring
diff -u -r1.4 -r1.5
--- HPSCalibrationListener.java 23 Jul 2012 21:45:02 -0000 1.4
+++ HPSCalibrationListener.java 27 Aug 2012 18:51:31 -0000 1.5
@@ -12,14 +12,15 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSCalibrationListener.java,v 1.4 2012/07/23 21:45:02 mgraham Exp $
+ * @version $Id: HPSCalibrationListener.java,v 1.5 2012/08/27 18:51:31 meeg Exp $
*/
public class HPSCalibrationListener implements EtEventListener {
@Override
public void begin() {
// Load calibration constants and bad SVT channels found during QA
- HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), -1);
+// HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), -1);
+ HPSSVTCalibrationConstants.loadBadChannels(-1);
HPSEcalConditions.loadPedestals();
FieldMap.loadFieldMap();
}