Skip to content

Commit b115698

Browse files
Merge pull request #237 from JeffersonLab/iss235
Allow EVIO to LCIO converter to run without a steering file.
2 parents f2fea0c + f1f3d1d commit b115698

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

evio/src/main/java/org/hps/evio/EvioToLcio.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@
7272
*/
7373
public final class EvioToLcio {
7474

75-
/**
76-
* The default steering resource, which basically does nothing except print event numbers.
77-
*/
78-
private static final String DEFAULT_STEERING_RESOURCE = "/org/hps/steering/EventMarker.lcsim";
79-
8075
/**
8176
* Setup logging for this class.
8277
*/
@@ -333,12 +328,6 @@ public void parse(String[] args) {
333328
}
334329
}
335330

336-
// Setup the default steering which just prints event numbers.
337-
if (steeringStream == null) {
338-
steeringStream = EvioToLcio.class.getResourceAsStream(DEFAULT_STEERING_RESOURCE);
339-
LOGGER.config("using default steering resource " + DEFAULT_STEERING_RESOURCE);
340-
}
341-
342331
// Get the max number of events to process.
343332
if (cl.hasOption("n")) {
344333
maxEvents = Integer.valueOf(cl.getOptionValue("n"));
@@ -396,7 +385,14 @@ public void parse(String[] args) {
396385
}
397386

398387
// Configure the LCSim job manager.
399-
jobManager.setup(steeringStream);
388+
if (steeringStream != null) {
389+
// Running a steering file with the job; use full job manager setup.
390+
jobManager.setup(steeringStream);
391+
} else {
392+
// No steering file is being used; configure job manager manually.
393+
jobManager.initializeLoop(); /* enables event printing */
394+
jobManager.getConditionsSetup().configure(); /* activates SVT detector setup */
395+
}
400396
jobManager.configure();
401397
LOGGER.config("LCSim job manager was successfully configured.");
402398

0 commit comments

Comments
 (0)