From 409b814a2c5f3a204812af1f596d9c232625a589 Mon Sep 17 00:00:00 2001
From: NichtJens <nichtjens@gmail.com>
Date: Wed, 15 May 2024 13:18:32 +0200
Subject: [PATCH] de-arrow some more

---
 sf-utils/BinaryBufferReader.py | 54 ++++++++++++++++------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/sf-utils/BinaryBufferReader.py b/sf-utils/BinaryBufferReader.py
index fd8ce34..dcd0e15 100644
--- a/sf-utils/BinaryBufferReader.py
+++ b/sf-utils/BinaryBufferReader.py
@@ -58,8 +58,9 @@ class BinaryBufferReader:
         metadata_init = False
 
         for i_module in range(self.n_modules):
-            device_name = f"M{i_module:02}"
+            output_prefix = f"[pulse_id {pulse_id} module {i_module}] "
 
+            device_name = f"M{i_module:02}"
             filename = get_filename(self.root_folder, device_name, pulse_id)
 
             with open(filename, "rb") as input_file:
@@ -67,44 +68,41 @@ class BinaryBufferReader:
                 input_data = input_file.read(n_bytes_to_read)
                 frame_buffer = BufferBinaryFormat.from_buffer_copy(input_data)
 
-            output_prefix = f"[pulse_id {pulse_id} module {i_module}] "
-
             if frame_buffer.FORMAT_MARKER != b"\xBE":
                 _logger.debug(f"{output_prefix} no data in buffer")
                 metadata["is_good_frame"] = False
                 continue
 
-            is_good_frame = (frame_buffer.n_recv_packets == 128)
-
-            if is_good_frame:
-                current = {
-                    "pulse_id":    frame_buffer.pulse_id,
-                    "frame_index": frame_buffer.frame_index,
-                    "daq_rec":     frame_buffer.daq_rec
-                }
-
-                if not metadata_init:
-                    metadata.update(current)
-                    metadata_init = True
-
-                if metadata["is_good_frame"]:
-                    for key, val in current.items():
-                        md_val = metadata[key]
-                        if val != md_val:
-                            _logger.debug(f"{output_prefix} Mismatch {key}: {val} != {md_val}")
-                            metadata["is_good_frame"] = False
-
-            else:
-                n_lost_packets = 128 - frame_buffer.n_recv_packets
-                _logger.debug(f"{output_prefix} n_lost_packets {n_lost_packets}")
-                metadata["is_good_frame"] = False
-
             start_byte_image = MODULE_N_BYTES * i_module
             stop_byte_image = start_byte_image + MODULE_N_BYTES
 
             frame_data = numpy.array(frame_buffer.data, dtype="bytes")
             data[start_byte_image:stop_byte_image] = frame_data
 
+            is_good_frame = (frame_buffer.n_recv_packets == 128)
+
+            if not is_good_frame:
+                n_lost_packets = 128 - frame_buffer.n_recv_packets
+                _logger.debug(f"{output_prefix} n_lost_packets {n_lost_packets}")
+                metadata["is_good_frame"] = False
+                continue
+
+            current = {
+                "pulse_id":    frame_buffer.pulse_id,
+                "frame_index": frame_buffer.frame_index,
+                "daq_rec":     frame_buffer.daq_rec
+            }
+
+            if not metadata_init:
+                metadata.update(current)
+                metadata_init = True
+
+            if metadata["is_good_frame"]:
+                for key, val in current.items():
+                    md_val = metadata[key]
+                    if val != md_val:
+                        _logger.debug(f"{output_prefix} Mismatch {key}: {val} != {md_val}")
+                        metadata["is_good_frame"] = False
 
         if not metadata_init:
             metadata["is_good_frame"] = False