Author: [log in to unmask]
Date: Fri Jul 31 19:40:16 2015
New Revision: 3324
Log:
more tweaks
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java Fri Jul 31 19:40:16 2015
@@ -21,7 +21,6 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.hps.conditions.api.ConditionsRecord;
-import org.hps.conditions.api.TableMetaData;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.run.RunRange;
import org.hps.conditions.run.RunSpreadsheet;
@@ -34,7 +33,6 @@
import org.hps.conditions.svt.SvtMotorMyaDataReader.SvtPositionRunRange;
import org.hps.conditions.svt.SvtMotorPosition.SvtMotorPositionCollection;
import org.hps.util.BasicLogFormatter;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.util.aida.AIDA;
import org.lcsim.util.log.LogUtil;
@@ -305,7 +303,7 @@
final ConditionsRecord condition = new ConditionsRecord();
condition.setFieldValue("run_start", rundata.getRun());
condition.setFieldValue("run_end", rundata.getRun());
- condition.setFieldValue("name", "svt_bias");
+ condition.setFieldValue("name", "svt_bias_constants");
condition.setFieldValue("table_name", "svt_bias_constants");
condition.setFieldValue("notes", "constants from mya");
condition.setFieldValue("created", new Date());
@@ -313,6 +311,7 @@
condition.setFieldValue("collection_id", collectionId);
condition.setTableMetaData(MANAGER.findTableMetaData("conditions"));
condition.setConnection(MANAGER.getConnection());
+ logger.info(condition.toString());
try {
@@ -323,7 +322,6 @@
constant.setFieldValue("end", biasRange.getEndDate().getTime());
constant.setFieldValue("value", biasRange.getValue());
collection.add(constant);
- logger.info(condition.toString());
}
// Insert collection data.
@@ -385,6 +383,7 @@
condition.setFieldValue("collection_id", collectionId);
condition.setTableMetaData(MANAGER.findTableMetaData("conditions"));
condition.setConnection(MANAGER.getConnection());
+ logger.info(condition.toString());
try {
@@ -396,7 +395,6 @@
constant.setFieldValue("top", positionRange.getTop());
constant.setFieldValue("bottom", positionRange.getBottom());
collection.add(constant);
- logger.info(condition.toString());
}
// Insert collection data.
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java Fri Jul 31 19:40:16 2015
@@ -148,22 +148,13 @@
@Override
protected void detectorChanged(Detector detector) {
- ConditionsRecordCollection col_svt_bias = DatabaseConditionsManager.getInstance().findConditionsRecords("svt_bias");
- if (col_svt_bias == null) {
- logger.info("svt_bias name collection wasn't found");
- }
- ConditionsRecordCollection col_svt_bias_constants = DatabaseConditionsManager.getInstance().findConditionsRecords("svt_bias_constants");
- if (col_svt_bias_constants == null) {
- logger.info("col_svt_bias_constants name collection wasn't found");
- }
-
// ConditionsRecordCollection col_svt_align_constants = DatabaseConditionsManager.getInstance().findConditionsRecords("svt_alignments");
// if (col_svt_align_constants == null) {
// logger.info("svt_alignments collection wasn't found");
// }
// col_svt_align_constants.
svtBiasConstants = DatabaseConditionsManager.getInstance().getCachedConditions(SvtBiasConstant.SvtBiasConstantCollection.class, "svt_bias_constants").getCachedData();
- System.out.println(svtBiasConstants.size());
+ System.out.println("found " + svtBiasConstants.size() + " bias ON ranges");
// timingConstants = DatabaseConditionsManager.getInstance().getCachedConditions(SvtTimingConstants.SvtTimingConstantsCollection.class, "svt_timing_constants").getCachedData().get(0);
try {
@@ -298,12 +289,12 @@
if (svtBiasConstants != null) {
logger.info("there are " + svtBiasConstants.size() + " constants to search");
for (SvtBiasConstant constant : svtBiasConstants) {
- logger.info("start " + constant.getStart().toString() + " end " + constant.getEnd() + " value " + constant.getValue());
+ logger.info("start " + constant.getStart() + " end " + constant.getEnd() + " value " + constant.getValue());
}
SvtBiasConstant constant = svtBiasConstants.find(newEventDate);
- logger.info(constant == null ? "No constant found!" : ("Found constant " + "start " + constant.getStart().toString() + " end " + constant.getEnd() + " value " + constant.getValue()));
+ logger.info(constant == null ? "No constant found!" : ("Found constant " + "start " + constant.getStart() + " end " + constant.getEnd() + " value " + constant.getValue()));
}
}
