Author: [log in to unmask]
Date: Tue Nov 4 20:50:05 2014
New Revision: 1432
Log:
use engineering run event builder and DB settings by default; add option to use settings appropriate for test run
Modified:
java/trunk/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.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 Tue Nov 4 20:50:05 2014
@@ -62,6 +62,7 @@
options.addOption(new Option("D", true, "Pass a variable to the steering file"));
options.addOption(new Option("r", false, "Interpret -x argument as a steering resource instead of a file path"));
options.addOption(new Option("R", true, "The run number"));
+ options.addOption(new Option("t", false, "Read test run data"));
return options;
}
@@ -182,16 +183,25 @@
}
int runNumber = 0;
- if(cl.hasOption("R")){
+ if (cl.hasOption("R")) {
runNumber = Integer.valueOf(cl.getOptionValue("R"));
}
jobManager.setup(steeringStream);
jobManager.configure();
- new org.hps.conditions.config.TestRunReadOnlyConfiguration(false).setup().load(detectorName, runNumber);
// LCSim event builder.
- LCSimEventBuilder eventBuilder = new LCSimTestRunEventBuilder();
+ LCSimEventBuilder eventBuilder = null;
+
+ if (cl.hasOption("t")) {
+ new org.hps.conditions.config.TestRunReadOnlyConfiguration(false).setup().load(detectorName, runNumber);
+ eventBuilder = new LCSimTestRunEventBuilder();
+ } else {
+ new org.hps.conditions.config.DevReadOnlyConfiguration().setup().load(detectorName, runNumber);
+ eventBuilder = new LCSimEngRunEventBuilder();
+
+ }
+
eventBuilder.setDetectorName(detectorName);
for (String evioFileName : cl.getArgs()) {
|