sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-30 05:52:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename block_number to block_id

Browse Source
This commit is contained in:
babic_a
2020-05-27 14:03:43 +02:00
parent b7381bce68
commit 719b3ed0f7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf-replay/include/BufferBinaryReader.hpp
+1 -1
View File
@@ -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);
};
sf-replay/src/BufferBinaryReader.cpp
+2 -2
View File
@@ -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);
sf-writer/src/main.cpp
+3 -3
View File
@@ -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<microseconds>(
@@ -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) {