Author: [log in to unmask]
Date: Sat May 2 11:04:48 2015
New Revision: 2883
Log:
Enable sequential read with jevio-4.4.6-SNAPSHOT
Modified:
java/branches/HPSJAVA-494/datacat/pom.xml
java/branches/HPSJAVA-494/evio/src/main/java/org/hps/evio/EvioToLcio.java
java/branches/HPSJAVA-494/parent/pom.xml
Modified: java/branches/HPSJAVA-494/datacat/pom.xml
=============================================================================
--- java/branches/HPSJAVA-494/datacat/pom.xml (original)
+++ java/branches/HPSJAVA-494/datacat/pom.xml Sat May 2 11:04:48 2015
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
- <version>4.3.1</version>
+ <version>4.4.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>srs</groupId>
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 Sat May 2 11:04:48 2015
@@ -342,7 +342,7 @@
// Open the EVIO reader.
try {
- reader = new EvioReader(evioFile);
+ reader = new EvioReader(evioFile,false,true);
} catch (Exception e) {
throw new RuntimeException("Error opening the EVIO file reader.", e);
}
@@ -532,14 +532,14 @@
while (eventQueue.size() < maxBufferSize) {
try {
// Break if no more events from reader.
- if (reader.getNumEventsRemaining() == 0) {
- break;
- }
+ //if (reader.getNumEventsRemaining() == 0) {
+ // break;
+ // } // You dont want to do this on sequential reads!
// Read the next event.
evioEvent = reader.nextEvent();
- if (evioEvent == null) {
+ if (evioEvent == null) { // This catches an end of file or bad event.
break;
}
Modified: java/branches/HPSJAVA-494/parent/pom.xml
=============================================================================
--- java/branches/HPSJAVA-494/parent/pom.xml (original)
+++ java/branches/HPSJAVA-494/parent/pom.xml Sat May 2 11:04:48 2015
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
- <version>4.4.3</version>
+ <version>4.4.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.coda</groupId>
