Author: [log in to unmask]
Date: Fri Oct 31 17:49:33 2014
New Revision: 1372
Log:
Use the conditions manager to get the current run number instead of CalibrationDriver.
Modified:
java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
Modified: java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java Fri Oct 31 17:49:33 2014
@@ -1,12 +1,15 @@
package org.hps.evio;
import hep.physics.event.generator.MCEvent;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
+
+import org.hps.conditions.DatabaseConditionsManager;
import org.hps.conditions.deprecated.CalibrationDriver;
import org.hps.conditions.deprecated.QuietBaseLCSimEvent;
import org.hps.readout.ecal.ClockSingleton;
@@ -218,7 +221,7 @@
@Override
protected void processTrigger(EventHeader event) {
- EventHeader lcsimEvent = new QuietBaseLCSimEvent(CalibrationDriver.runNumber(), event.getEventNumber(), event.getDetectorName());
+ EventHeader lcsimEvent = new QuietBaseLCSimEvent(DatabaseConditionsManager.getInstance().getRunNumber(), event.getEventNumber(), event.getDetectorName());
events.add(lcsimEvent);
System.out.println("Creating LCIO event " + eventNum);
if (triggerMCParticles == null || triggerMCParticles.isEmpty()) {
|