Author: [log in to unmask]
Date: Sun May 3 11:04:29 2015
New Revision: 2888
Log:
Add option -M for memory mapped in EvioToLcio, all other readers also sequential.
Modified:
java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/EvioToLcio.java
java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java
Modified: java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
=============================================================================
--- java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java (original)
+++ java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java Sun May 3 11:04:29 2015
@@ -20,7 +20,7 @@
throw new RuntimeException("File " + evioFileName + " does not exist.");
}
try {
- org.jlab.coda.jevio.EvioReader reader = new org.jlab.coda.jevio.EvioReader(evioFile);
+ org.jlab.coda.jevio.EvioReader reader = new org.jlab.coda.jevio.EvioReader(evioFile,true,false);
int eventN = 1;
int badEvents = 0;
fileLoop:
Modified: java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/EvioToLcio.java
=============================================================================
--- java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/EvioToLcio.java (original)
+++ java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/EvioToLcio.java Sun May 3 11:04:29 2015
@@ -115,6 +115,7 @@
options.addOption(new Option("v", false, "print EVIO XML for each event"));
options.addOption(new Option("m", true, "set the max event buffer size"));
options.addOption(new Option("t", true, "specify a conditions system tag to use"));
+ options.addOption(new Option("M", false,"Memory map file before reading"));
logger.setLevel(Level.FINE);
}
@@ -342,7 +343,7 @@
// Open the EVIO reader.
try {
- reader = new EvioReader(evioFile,false,true);
+ reader = new EvioReader(evioFile,false,!cl.hasOption("M"));
} catch (Exception e) {
throw new RuntimeException("Error opening the EVIO file reader.", e);
}
Modified: java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
=============================================================================
--- java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java (original)
+++ java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java Sun May 3 11:04:29 2015
@@ -340,7 +340,7 @@
// Open a new EVIO reader.
LOGGER.info("Opening next EVIO file " + evioFile.getPath() + " ...");
- reader = new EvioReader(evioFile.getPath(), false);
+ reader = new EvioReader(evioFile.getPath(), false,true);
LOGGER.info("Done opening file!");
// Print the number of events.
Modified: java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java
=============================================================================
--- java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java (original)
+++ java/branches/HPSJAVA-494/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java Sun May 3 11:04:29 2015
@@ -151,7 +151,7 @@
private void openReader() {
try {
System.out.println("Opening reader for file " + this.files.get(this.fileIndex) + " ...");
- this.reader = new EvioReader(this.files.get(this.fileIndex), false);
+ this.reader = new EvioReader(this.files.get(this.fileIndex), false,true);
System.out.println("Done opening file.");
} catch (EvioException | IOException e) {
throw new RuntimeException(e);
|