Author: [log in to unmask]
Date: Mon Nov 17 13:51:53 2014
New Revision: 1553
Log:
Use new class locations. Add a logger to some of these classes. (Work in progress on adding loggers. Some print outs still go to System.out)
Modified:
java/trunk/evio/src/main/java/org/hps/evio/DummyEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.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/DummyEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/DummyEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/DummyEventBuilder.java Mon Nov 17 13:51:53 2014
@@ -1,5 +1,6 @@
package org.hps.evio;
+import org.hps.record.LCSimEventBuilder;
import org.jlab.coda.jevio.EvioEvent;
import org.lcsim.conditions.ConditionsEvent;
import org.lcsim.conditions.ConditionsManager;
@@ -11,8 +12,9 @@
import org.lcsim.util.loop.DummyDetector;
/**
+ * This is an event builder that does nothing except create empty events.
+ * It uses a "dummy" LCSim detector.
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DummyEventBuilder.java,v 1.3 2012/09/01 00:15:15 meeg Exp $
*/
public class DummyEventBuilder implements LCSimEventBuilder {
@@ -34,17 +36,10 @@
public EventHeader makeLCSimEvent(EvioEvent evioEvent) {
return new BaseLCSimEvent(0, evioEvent.getHeader().getNumber(), dummyName);
}
-
+
@Override
- public void setDetectorName(String detectorName) {}
-
- @Override
- public void setDebug(boolean debug) {}
-
- @Override
- public boolean isPhysicsEvent(EvioEvent evioEvent) {
- return true;
- }
+ public void setDetectorName(String detectorName) {
+ }
@Override
public void readEvioEvent(EvioEvent evioEvent) {
Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java Mon Nov 17 13:51:53 2014
@@ -2,8 +2,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.DatabaseConditionsManager;
-import org.hps.conditions.TableConstants;
+
+import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.DaqId;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
@@ -18,7 +19,6 @@
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.GenericObject;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java Mon Nov 17 13:51:53 2014
@@ -5,7 +5,7 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.CompositeData;
Modified: java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java Mon Nov 17 13:51:53 2014
@@ -16,14 +16,15 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.hps.job.JobManager;
+import org.hps.record.LCSimEventBuilder;
+import org.hps.record.evio.EvioEventUtilities;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioReader;
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
-import org.lcsim.job.JobControlManager;
import org.lcsim.lcio.LCIOWriter;
import org.lcsim.util.log.LogUtil;
-import org.hps.conditions.DatabaseConditionsManager;
/**
* <p>
@@ -61,7 +62,7 @@
// The default steering resource, which basically does nothing except
// initialize the conditions system.
- private static final String DEFAULT_STEERING_RESOURCE = "/org/hps/steering/monitoring/DummyMonitoring.lcsim";
+ private static final String DEFAULT_STEERING_RESOURCE = "/org/hps/steering/EventMarker.lcsim";
// The command line options which will be defined in the constructor.
Options options = null;
@@ -195,7 +196,7 @@
}
// LCSim job manager.
- JobControlManager jobManager = new JobControlManager();
+ JobManager jobManager = new JobManager();
if (cl.hasOption("D")) {
String[] steeringOptions = cl.getOptionValues("D");
for (String def : steeringOptions) {
@@ -266,7 +267,7 @@
}
// Handlers for different event types.
- if (EventConstants.isPreStartEvent(evioEvent)) {
+ if (EvioEventUtilities.isPreStartEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
// int seconds = data[0];
@@ -284,13 +285,13 @@
// Setup state in the LCSimEventBuilder based on the EVIO event.
eventBuilder.readEvioEvent(evioEvent);
- if (EventConstants.isEndEvent(evioEvent)) {
+ if (EvioEventUtilities.isEndEvent(evioEvent)) {
logger.info("got EVIO end event");
// int[] data = evioEvent.getIntData();
// int seconds = data[0];
// int nevents = data[2];
// calibListener.endRun(seconds, nevents);
- } else if (EventConstants.isPhysicsEvent(evioEvent)) {
+ } else if (EvioEventUtilities.isPhysicsEvent(evioEvent)) {
logger.finest("got EVIO physics event #" + evioEvent.getEventNumber());
@@ -318,6 +319,8 @@
writer.flush();
logger.finest("wrote LCIO event #" + lcioEvent.getEventNumber());
}
+
+ nEvents++;
}
} catch (Exception e) {
@@ -327,8 +330,7 @@
} else {
continue;
}
- }
- nEvents++;
+ }
}
logger.info("Last physics event time: " + time / 1000 + " - " + new Date(time));
try {
@@ -380,18 +382,18 @@
private LCSimEventBuilder setupEventBuilder(String detectorName, int runNumber) {
LCSimEventBuilder eventBuilder = null;
// Is this run number not part of the Test Run?
- if (runNumber > EvioToLcio.TEST_RUN_END_RUN) {
- logger.info("using LCSimEngRunEventBuilder");
- eventBuilder = new LCSimEngRunEventBuilder();
- if (detectorName == null) {
- detectorName = DEFAULT_ENG_RUN_DETECTOR;
- }
- } else {
+ if (runNumber > 0 && runNumber <= EvioToLcio.TEST_RUN_END_RUN) {
// This looks like a Test Run file.
logger.info("using LCSimTestRunEventBuilder");
eventBuilder = new LCSimTestRunEventBuilder();
if (detectorName == null) {
detectorName = DEFAULT_TEST_RUN_DETECTOR;
+ }
+ } else {
+ logger.info("using LCSimEngRunEventBuilder");
+ eventBuilder = new LCSimEngRunEventBuilder();
+ if (detectorName == null) {
+ detectorName = DEFAULT_ENG_RUN_DETECTOR;
}
}
eventBuilder.setDetectorName(detectorName);
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 Mon Nov 17 13:51:53 2014
@@ -5,6 +5,7 @@
import org.hps.readout.ecal.SSPData;
import org.hps.readout.ecal.TriggerData;
+import org.hps.record.evio.EvioEventUtilities;
import org.jlab.coda.jevio.EvioEvent;
import org.lcsim.event.EventHeader;
@@ -33,7 +34,7 @@
@Override
public EventHeader makeLCSimEvent(EvioEvent evioEvent) {
- if (!isPhysicsEvent(evioEvent)) {
+ if (!EvioEventUtilities.isPhysicsEvent(evioEvent)) {
throw new RuntimeException("Not a physics event: event tag " + evioEvent.getHeader().getTag());
}
Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java Mon Nov 17 13:51:53 2014
@@ -7,15 +7,19 @@
import java.util.logging.Logger;
import org.hps.readout.ecal.TriggerData;
+import org.hps.record.LCSimEventBuilder;
+import org.hps.record.evio.EvioEventConstants;
+import org.hps.record.evio.EvioEventUtilities;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
import org.lcsim.conditions.ConditionsEvent;
import org.lcsim.conditions.ConditionsListener;
import org.lcsim.event.EventHeader;
import org.lcsim.event.base.BaseLCSimEvent;
+import org.lcsim.util.log.LogUtil;
/**
- * Build LCSim events from EVIO data.
+ * Build LCSim events from Test Run 2012 EVIO data.
*
* @author Sho Uemura <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
@@ -23,28 +27,23 @@
public class LCSimTestRunEventBuilder implements LCSimEventBuilder, ConditionsListener {
String detectorName = null;
- protected boolean debug = false;
ECalEvioReader ecalReader = null;
SVTEvioReader svtReader = null;
protected int run = 0; //current run number, taken from prestart and end events
protected long time = 0; //most recent event time (ns), taken from prestart and end events, and trigger banks (if any)
protected int sspCrateBankTag = 0x1; //bank ID of the crate containing the SSP
protected int sspBankTag = 0xe106; //SSP bank's tag
+ protected static Logger logger = LogUtil.create(LCSimTestRunEventBuilder.class);
public LCSimTestRunEventBuilder() {
ecalReader = new ECalEvioReader(0x1, 0x2);
svtReader = new SVTEvioReader();
+ logger.setLevel(Level.FINE);
}
@Override
public void setDetectorName(String detectorName) {
this.detectorName = detectorName;
- }
-
- @Override
- public void setDebug(boolean debug) {
- this.debug = debug;
- ecalReader.setDebug(debug);
}
public void setEcalHitCollectionName(String ecalHitCollectionName) {
@@ -53,38 +52,38 @@
@Override
public void readEvioEvent(EvioEvent evioEvent) {
- if (EventConstants.isSyncEvent(evioEvent)) {
+ if (EvioEventUtilities.isSyncEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
int seconds = data[0];
- System.out.println("Sync event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count since last sync " + data[1] + ", event count so far " + data[2] + ", status " + data[3]);
- } else if (EventConstants.isPreStartEvent(evioEvent)) {
+ logger.info("Sync event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count since last sync " + data[1] + ", event count so far " + data[2] + ", status " + data[3]);
+ } else if (EvioEventUtilities.isPreStartEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
int seconds = data[0];
time = ((long) seconds) * 1000000000;
run = data[1];
- System.out.println("Prestart event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", run " + run + ", run type " + data[2]);
- } else if (EventConstants.isGoEvent(evioEvent)) {
+ logger.info("Prestart event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", run " + run + ", run type " + data[2]);
+ } else if (EvioEventUtilities.isGoEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
int seconds = data[0];
time = ((long) seconds) * 1000000000;
- System.out.println("Go event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count so far " + data[2]);
- } else if (EventConstants.isPauseEvent(evioEvent)) {
+ logger.info("Go event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count so far " + data[2]);
+ } else if (EvioEventUtilities.isPauseEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
int seconds = data[0];
time = ((long) seconds) * 1000000000;
- System.out.println("Pause event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count so far " + data[2]);
- } else if (EventConstants.isEndEvent(evioEvent)) {
+ logger.info("Pause event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count so far " + data[2]);
+ } else if (EvioEventUtilities.isEndEvent(evioEvent)) {
int[] data = evioEvent.getIntData();
int seconds = data[0];
time = ((long) seconds) * 1000000000;
run = 0;
- System.out.println("End event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count " + data[2]);
+ logger.info("End event: time " + seconds + " - " + new Date(((long) seconds) * 1000) + ", event count " + data[2]);
}
}
@Override
public EventHeader makeLCSimEvent(EvioEvent evioEvent) {
- if (!isPhysicsEvent(evioEvent)) {
+ if (!EvioEventUtilities.isPhysicsEvent(evioEvent)) {
throw new RuntimeException("Not a physics event: event tag " + evioEvent.getHeader().getTag());
}
@@ -108,11 +107,6 @@
return lcsimEvent;
}
- @Override
- public boolean isPhysicsEvent(EvioEvent evioEvent) {
- return (evioEvent.getHeader().getTag() == EventConstants.PHYSICS_EVENT_TAG);
- }
-
protected EventHeader getEventData(EvioEvent evioEvent) {
int[] eventID = null;
//array of length 3: {event number, trigger code, readout status}
@@ -121,31 +115,29 @@
if (evioEvent.getChildCount() > 0) {
for (BaseStructure bank : evioEvent.getChildren()) {
- if (bank.getHeader().getTag() == EventConstants.EVENTID_BANK_TAG) {
+ if (bank.getHeader().getTag() == EvioEventConstants.EVENTID_BANK_TAG) {
eventID = bank.getIntData();
}
}
}
if (eventID == null) {
- System.out.println("No event ID bank found");
+ logger.warning("No event ID bank found");
eventID = new int[3];
- } else {
- if (debug) {
- System.out.println("Read EVIO event number " + eventID[0]);
- }
+ } else {
+ logger.finest("Read EVIO event number " + eventID[0]);
if (eventID[1] != 1) {
- System.out.println("Trigger code is usually 1; got " + eventID[1]);
+ logger.warning("Trigger code is usually 1; got " + eventID[1]);
}
if (eventID[2] != 0) {
- System.out.println("Readout status is usually 0; got " + eventID[2]);
+ logger.warning("Readout status is usually 0; got " + eventID[2]);
}
}
if (triggerList.isEmpty()) {
- System.out.println("No trigger bank found");
+ logger.finest("No trigger bank found");
} else if (triggerList.size() > 1) {
- System.out.println("Found multiple trigger banks");
+ logger.finest("Found multiple trigger banks");
}
// Create a new LCSimEvent.
Modified: java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java Mon Nov 17 13:51:53 2014
@@ -15,7 +15,7 @@
import org.lcsim.event.base.BaseRawTrackerHit;
import org.lcsim.geometry.compact.Subdetector;
import org.lcsim.lcio.LCIOUtil;
-import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.deprecated.HPSSVTConstants;
import org.hps.conditions.svt.TestRunSvtConditions;
import org.hps.conditions.svt.TestRunSvtDetectorSetup;
@@ -24,7 +24,7 @@
import org.hps.readout.svt.SVTData;
import org.hps.util.Pair;
-import static org.hps.conditions.TableConstants.SVT_CONDITIONS;
+import static org.hps.conditions.database.TableConstants.SVT_CONDITIONS;
import static org.hps.evio.EventConstants.SVT_BANK_TAG;
/**
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java Mon Nov 17 13:51:53 2014
@@ -2,6 +2,7 @@
import java.io.IOException;
+import org.hps.record.evio.EvioEventConstants;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
import org.jlab.coda.jevio.EventWriter;
@@ -90,7 +91,7 @@
}
private void writeEvioEvent() {
- EvioBank eventIDBank = new EvioBank(EventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
+ EvioBank eventIDBank = new EvioBank(EvioEventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
int[] eventID = new int[3];
eventID[0] = eventsWritten;
eventID[1] = 0; //trigger type
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java Mon Nov 17 13:51:53 2014
@@ -5,10 +5,11 @@
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.readout.ecal.ReadoutTimestamp;
import org.hps.readout.ecal.TriggerableDriver;
+import org.hps.record.evio.EvioEventConstants;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
import org.jlab.coda.jevio.EventWriter;
@@ -157,7 +158,7 @@
private void writePrestartEvent() {
// Make a new EVIO event.
- EventBuilder builder = new EventBuilder(EventConstants.PRESTART_EVENT_TAG, DataType.UINT32, EventConstants.EVENT_BANK_NUM);
+ EventBuilder builder = new EventBuilder(EvioEventConstants.PRESTART_EVENT_TAG, DataType.UINT32, EventConstants.EVENT_BANK_NUM);
int[] prestartData = new int[3];
prestartData[0] = EventConstants.MC_TIME; //Unix time in seconds - this value for MC data
prestartData[1] = CalibrationDriver.runNumber(); //run number
@@ -182,9 +183,9 @@
@Override
protected void processTrigger(EventHeader event) {
// Make a new EVIO event.
- EventBuilder builder = new EventBuilder(EventConstants.PHYSICS_EVENT_TAG, DataType.BANK, EventConstants.EVENT_BANK_NUM);
+ EventBuilder builder = new EventBuilder(EvioEventConstants.PHYSICS_EVENT_TAG, DataType.BANK, EventConstants.EVENT_BANK_NUM);
builderQueue.add(new QueuedEtEvent(builder, writers.size(), eventNum));
- EvioBank eventIDBank = new EvioBank(EventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
+ EvioBank eventIDBank = new EvioBank(EvioEventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
int[] eventID = new int[3];
eventID[0] = event.getEventNumber();
eventID[1] = 1; //trigger type
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 Mon Nov 17 13:51:53 2014
@@ -9,7 +9,7 @@
import java.util.List;
import java.util.Queue;
-import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.deprecated.QuietBaseLCSimEvent;
import org.hps.readout.ecal.ClockSingleton;
import org.hps.readout.ecal.ReadoutTimestamp;
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 Mon Nov 17 13:51:53 2014
@@ -6,7 +6,9 @@
import junit.framework.TestCase;
-import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.record.LCSimEventBuilder;
+import org.hps.record.evio.EvioEventUtilities;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioReader;
import org.lcsim.event.EventHeader;
@@ -62,7 +64,7 @@
while ((evioEvent = reader.nextEvent()) != null) {
reader.parseEvent(evioEvent);
builder.readEvioEvent(evioEvent);
- if (EventConstants.isPhysicsEvent(evioEvent)) {
+ if (EvioEventUtilities.isPhysicsEvent(evioEvent)) {
try {
EventHeader lcsimEvent = builder.makeLCSimEvent(evioEvent);
System.out.println("created LCSim event #" + lcsimEvent.getEventNumber());
