From 719b3ed0f73272bf0d7328fa1d3e0e5c73105171 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 27 May 2020 14:03:43 +0200 Subject: [PATCH] Rename block_number to block_id --- sf-replay/include/BufferBinaryReader.hpp | 2 +- sf-replay/src/BufferBinaryReader.cpp | 4 ++-- sf-writer/src/main.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sf-replay/include/BufferBinaryReader.hpp b/sf-replay/include/BufferBinaryReader.hpp index 0dbfa03..cca17fc 100644 --- a/sf-replay/include/BufferBinaryReader.hpp +++ b/sf-replay/include/BufferBinaryReader.hpp @@ -21,7 +21,7 @@ public: virtual ~BufferBinaryReader(); - void get_block(const uint64_t block_number, BufferBinaryBlock *buffer); + void get_block(const uint64_t block_id, BufferBinaryBlock *buffer); }; diff --git a/sf-replay/src/BufferBinaryReader.cpp b/sf-replay/src/BufferBinaryReader.cpp index a20806c..0c1eeee 100644 --- a/sf-replay/src/BufferBinaryReader.cpp +++ b/sf-replay/src/BufferBinaryReader.cpp @@ -28,9 +28,9 @@ BufferBinaryReader::~BufferBinaryReader() } void BufferBinaryReader::get_block( - const uint64_t block_number, BufferBinaryBlock* buffer) + const uint64_t block_id, BufferBinaryBlock* buffer) { - uint64_t block_start_pulse_id = block_number * BUFFER_BLOCK_SIZE; + uint64_t block_start_pulse_id = block_id * BUFFER_BLOCK_SIZE; auto current_block_file = BufferUtils::get_filename( device_, channel_name_, block_start_pulse_id); diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp index 4784e71..4b64d77 100644 --- a/sf-writer/src/main.cpp +++ b/sf-writer/src/main.cpp @@ -26,7 +26,7 @@ void read_buffer( BufferBinaryReader block_reader(device, channel_name); auto block_buffer = new BufferBinaryBlock(); - for (uint64_t block_number:buffer_blocks) { + for (uint64_t block_id:buffer_blocks) { int slot_id; while((slot_id = image_assembler.get_free_slot()) == -1) { @@ -36,7 +36,7 @@ void read_buffer( auto start_time = steady_clock::now(); - block_reader.get_block(block_number, block_buffer); + block_reader.get_block(block_id, block_buffer); auto end_time = steady_clock::now(); uint64_t read_us_duration = duration_cast( @@ -109,7 +109,7 @@ int main (int argc, char *argv[]) JFH5Writer writer(output_file, start_pulse_id, stop_pulse_id, n_modules); - for (uint64_t block_number:buffer_blocks) { + for (uint64_t block_id:buffer_blocks) { int slot_id; while((slot_id = image_assembler.get_full_slot()) == -1) {