Author: [log in to unmask] Date: Wed Sep 23 13:26:50 2015 New Revision: 3685 Log: Update with changes to run manager API. Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java ============================================================================= --- java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java (original) +++ java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java Wed Sep 23 13:26:50 2015 @@ -4,6 +4,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import org.hps.record.epics.EpicsData; import org.hps.record.epics.EpicsEvioProcessor; import org.hps.record.evio.EvioEventUtilities; @@ -16,7 +17,6 @@ import org.hps.record.triggerbank.TDCData; import org.hps.record.triggerbank.TIData; import org.hps.run.database.RunManager; -import org.hps.run.database.RunSummary; import org.jlab.coda.jevio.EvioEvent; import org.lcsim.conditions.ConditionsEvent; import org.lcsim.event.EventHeader; @@ -69,7 +69,7 @@ * Modulus of TI timestamp offset (units of nanoseconds). */ private final long timestampCycle = 24 * 6 * 35; - + /** * Class constructor. */ @@ -104,10 +104,10 @@ @Override protected long getTime(final List<AbstractIntData> triggerList) { long tiTimeOffset = 0; - RunSummary runSummary = RunManager.getRunManager().getRunSummary(); - if (runSummary != null) { - tiTimeOffset = runSummary.getTriggerConfig().getTiTimeOffset(); + if (RunManager.getRunManager().runExists()) { + tiTimeOffset = RunManager.getRunManager().getTriggerConfig().getTiTimeOffset(); tiTimeOffset = (tiTimeOffset / timestampCycle) * timestampCycle; + System.out.println("tiTimeOffset: " + tiTimeOffset); } for (final AbstractIntData data : triggerList) { @@ -132,11 +132,11 @@ if (!EvioEventUtilities.isPhysicsEvent(evioEvent)) { throw new RuntimeException("Not a physics event: event tag " + evioEvent.getHeader().getTag()); } - + // Create a new LCSimEvent. final EventHeader lcsimEvent = this.getEventData(evioEvent); LOGGER.finest("created new LCSim event " + lcsimEvent.getEventNumber()); - + // Put DAQ Configuration info into lcsimEvent. triggerConfigReader.getDAQConfig(evioEvent, lcsimEvent);