Iter all events

src/eventio/base.py

@@ -62,6 +62,7 @@ def __init__(self, path, zcat=True):
         self.read_process = None
         self.zstd = False
         self.next = None
+        self.peek_error = None
 
         if not is_eventio(path):
             raise ValueError('File {} is not an eventio file'.format(path))
@@ -125,7 +126,12 @@ def __next__(self):
 
     def peek(self):
         if self.next is None:
-            self.next = next(self)
+            try:
+                self.next = next(self)
+            except (StopIteration, EOFError, IOError) as e:
+                self.peek_error = e
+                self.next = None
+
         return self.next
 
     def seek(self, position, whence=0):
@@ -157,7 +163,7 @@ def check_size_or_raise(data, expected_length, zero_ok=True):
         else:
             raise EOFError('File seems to be truncated')
 
-    if length < expected_length:
+    elif length < expected_length:
         raise EOFError('File seems to be truncated')
 
 
@@ -182,12 +188,6 @@ def read_header(byte_stream, offset, toplevel=False):
     '''
 
     header_bytes = byte_stream.read(constants.OBJECT_HEADER_SIZE)
-    check_size_or_raise(
-        header_bytes,
-        constants.OBJECT_HEADER_SIZE,
-        zero_ok=False,
-    )
-
     header = parse_header_bytes(header_bytes, toplevel=toplevel)
 
     if header.extended:

src/eventio/header.pyx

@@ -122,6 +122,11 @@ cpdef ObjectHeader parse_header_bytes(const uint8_t[:] header_bytes, bint toplev
     cdef bint only_subobjects
     cdef uint64_t length
 
+    if len(header_bytes) != OBJECT_HEADER_SIZE:
+        # for backwards compatibility, we raise the same error as before.
+        # more appropriate for this free function would be something like
+        # raise ValueError("header_bytes size must be 12")
+        raise EOFError('File seems to be truncated')
 
     type_int = unpack_uint32(header_bytes[0:4])
     type_, version, user, extended = parse_type_field(type_int)

src/eventio/simtel/objects.py

@@ -1461,10 +1461,8 @@ def __str__(self):
         )
 
     def parse(self):
-        ''' '''
-        assert_version_in(self, (1, 2))
+        ''''''
         self.seek(0)
-
         d = MCEvent.parse_mc_event(self.read(), self.header.version)
         d['event_id'] = self.header.id
         return d

src/eventio/simtel/parsing.pyx

@@ -54,6 +54,12 @@ cpdef dict parse_mc_event(
     const uint8_t[:] data,
     uint32_t version
 ):
+    if version > 2:
+        raise NotImplementedError(
+            'Unsupported version of MCEvent:'
+            ' only versions up to 2 supported,'
+            f' got: {version} '
+        )
 
     cdef uint64_t pos = 0
     cdef float xcore, ycore, aweight