Author: [log in to unmask] Date: Thu Nov 13 21:57:14 2014 New Revision: 1519 Log: Updates from changes to DatabaseConditionsManager. Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java ============================================================================= --- java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java (original) +++ java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java Thu Nov 13 21:57:14 2014 @@ -183,7 +183,7 @@ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance(); if (cl.hasOption("t")) { - manager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml"); + manager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml"); eventBuilder = new LCSimTestRunEventBuilder(); } else { eventBuilder = new LCSimEngRunEventBuilder(); Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java ============================================================================= --- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java (original) +++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java Thu Nov 13 21:57:14 2014 @@ -10,7 +10,6 @@ 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; import org.hps.readout.ecal.ReadoutTimestamp; @@ -28,9 +27,8 @@ * is to make this look like data which will come off the actual ET ring during * the test run. * - * @author Jeremy McCormick <[log in to unmask]> - * @version $Id: TestRunTriggeredReconToLcio.java 779 2014-07-16 16:24:34Z - * omoreno $ + * @author Omar Moreno <[log in to unmask]> + * @author Sho Uemura <[log in to unmask]> */ public class TestRunTriggeredReconToLcio extends TriggerableDriver { @@ -221,7 +219,7 @@ @Override protected void processTrigger(EventHeader event) { - EventHeader lcsimEvent = new QuietBaseLCSimEvent(DatabaseConditionsManager.getInstance().getRunNumber(), event.getEventNumber(), event.getDetectorName()); + EventHeader lcsimEvent = new QuietBaseLCSimEvent(DatabaseConditionsManager.getInstance().getRun(), event.getEventNumber(), event.getDetectorName()); events.add(lcsimEvent); System.out.println("Creating LCIO event " + eventNum); if (triggerMCParticles == null || triggerMCParticles.isEmpty()) { Modified: java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java ============================================================================= --- java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java (original) +++ java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java Thu Nov 13 21:57:14 2014 @@ -26,7 +26,7 @@ // Setup database conditions. DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager(); - conditionsManager.configure("/org/hps/conditions/config/conditions_dev.xml"); + conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_dev.xml"); conditionsManager.setDetector("HPS-Proposal2014-v8-6pt6", 2000); // Configure LCIO writer.