Author: [log in to unmask]
Date: Thu Aug 27 14:35:17 2015
New Revision: 3419
Log:
Changing package name.
Added:
java/trunk/record-util/src/main/java/org/hps/rundb/
- copied from r3409, java/trunk/record-util/src/main/java/org/hps/record/run/
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java
- copied, changed from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummary.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java
- copied, changed from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java
- copied, changed from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDao.java
- copied, changed from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDaoImpl.java
- copied, changed from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDaoImpl.java
Removed:
java/trunk/record-util/src/main/java/org/hps/record/run/
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfig.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDaoImpl.java
Modified:
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java Thu Aug 27 14:35:17 2015
@@ -21,9 +21,9 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.ConnectionParameters;
-import org.hps.record.run.RunSummary;
-import org.hps.record.run.RunSummaryDaoImpl;
-import org.hps.record.run.RunSummaryImpl;
+import org.hps.rundb.RunSummary;
+import org.hps.rundb.RunSummaryDaoImpl;
+import org.hps.rundb.RunSummaryImpl;
import org.lcsim.util.log.DefaultLogFormatter;
import org.lcsim.util.log.LogUtil;
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java Thu Aug 27 14:35:17 2015
@@ -11,10 +11,11 @@
import org.hps.record.evio.EvioFileSequenceComparator;
import org.hps.record.evio.EvioFileSource;
import org.hps.record.evio.EvioLoop;
-import org.hps.record.run.RunSummaryImpl;
import org.hps.record.scalers.ScalersEvioProcessor;
import org.hps.record.triggerbank.TiTimeOffsetEvioProcessor;
import org.hps.record.triggerbank.TriggerConfigInt;
+import org.hps.record.triggerbank.TriggerConfigVariable;
+import org.hps.rundb.RunSummaryImpl;
import org.lcsim.util.log.DefaultLogFormatter;
import org.lcsim.util.log.LogUtil;
@@ -210,18 +211,26 @@
*/
private void updateRunSummary() {
+ LOGGER.info("setting total events " + evioLoop.getTotalCountableConsumed());
// Set total number of events from the event loop.
runSummary.setTotalEvents((int) evioLoop.getTotalCountableConsumed());
// Add scaler data from the scalers EVIO processor.
+ LOGGER.info("adding " + this.scalersProcessor.getScalerData().size() + " scaler data objects");
runSummary.setScalerData(this.scalersProcessor.getScalerData());
// Add EPICS data from the EPICS EVIO processor.
+ LOGGER.info("adding " + this.epicsProcessor.getEpicsData().size() + " EPICS data objects");
runSummary.setEpicsData(this.epicsProcessor.getEpicsData());
// Add trigger config from the trigger time processor.
+ LOGGER.info("updating trigger config");
TriggerConfigInt triggerConfig = new TriggerConfigInt();
this.triggerTimeProcessor.updateTriggerConfig(triggerConfig);
+ LOGGER.info("tiTimeOffset: " + triggerConfig.get(TriggerConfigVariable.TI_TIME_OFFSET.name()));
+ System.out.println("tiTimeOffset: " + triggerConfig.get(TriggerConfigVariable.TI_TIME_OFFSET.name()));
runSummary.setTriggerConfigInt(triggerConfig);
+
+ LOGGER.getHandlers()[0].flush();
}
}
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java Thu Aug 27 14:35:17 2015
@@ -4,8 +4,8 @@
import java.util.HashMap;
import java.util.logging.Logger;
-import org.hps.record.run.RunSummary;
-import org.hps.record.run.RunSummaryImpl;
+import org.hps.rundb.RunSummary;
+import org.hps.rundb.RunSummaryImpl;
import org.lcsim.util.log.LogUtil;
/**
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.util.List;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.io.File;
import java.util.List;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.io.File;
import java.sql.Connection;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.sql.Connection;
import java.sql.SQLException;
Copied: java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java (from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummary.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/run/RunSummary.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.io.File;
import java.util.Date;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.util.List;
Copied: java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java (from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryDaoImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java (from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/run/RunSummaryImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.io.File;
import java.text.DateFormat;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.util.List;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDao.java (from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDao.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDao.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import org.hps.record.triggerbank.TriggerConfigInt;
Copied: java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDaoImpl.java (from r3411, java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/run/TriggerConfigIntDaoImpl.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigIntDaoImpl.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
-package org.hps.record.run;
+package org.hps.rundb;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified: java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java Thu Aug 27 14:35:17 2015
@@ -1,4 +1,4 @@
/**
* API for accessing the HPS run database with run summary information.
*/
-package org.hps.record.run;
+package org.hps.rundb;
