diff --git a/acquisition_device/AcquisitionCounters.cpp b/acquisition_device/AcquisitionCounters.cpp index 966751706..9d1cb5d74 100644 --- a/acquisition_device/AcquisitionCounters.cpp +++ b/acquisition_device/AcquisitionCounters.cpp @@ -31,7 +31,7 @@ void AcquisitionCounters::Reset(const DiffractionExperiment &experiment, uint16_ curr_frame_number[i] = 0; handle_for_frame = std::vector(expected_frames * nmodules, HandleNotFound); - packets_collected = std::vector(expected_frames * nmodules); + packets_collected = std::vector(expected_frames * nmodules); packets_per_module = std::vector(nmodules); total_packets = 0; expected_packets_per_module = 512 * experiment.GetFPGASummation(); diff --git a/acquisition_device/AcquisitionCounters.h b/acquisition_device/AcquisitionCounters.h index 5e978bd4f..6cb53fe06 100644 --- a/acquisition_device/AcquisitionCounters.h +++ b/acquisition_device/AcquisitionCounters.h @@ -21,7 +21,7 @@ class AcquisitionCounters { mutable std::condition_variable_any data_updated; std::vector handle_for_frame; - std::vector packets_collected; + std::vector packets_collected; uint64_t total_packets; std::vector packets_per_module; diff --git a/acquisition_device/AcquisitionDevice.cpp b/acquisition_device/AcquisitionDevice.cpp index 7e2d070a3..ea823b719 100644 --- a/acquisition_device/AcquisitionDevice.cpp +++ b/acquisition_device/AcquisitionDevice.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only +#include #include #include #include @@ -54,6 +55,7 @@ void AcquisitionDevice::StartAction(const DiffractionExperiment &experiment, uin counters.Reset(experiment, data_stream); expected_frames = experiment.GetFrameNum() / experiment.GetFPGASummation(); + fpga_summation = experiment.GetFPGASummation(); // Ensure internal WR queue is empty work_request_queue.Clear(); @@ -92,6 +94,14 @@ void AcquisitionDevice::WaitForActionComplete() { } if (!skip_analysis) { + // The card counts the packets of a summed module in 16 bits, which wraps from 128 frames on (512 a frame): + // counted here from those present in all the frames + if (512 * fpga_summation > UINT16_MAX) { + uint32_t packets = 0; + for (const auto &mask: output->module_statistics.packet_mask) + packets += std::popcount(mask); + output->module_statistics.packet_count = packets * fpga_summation; + } c.module_number = output->module_statistics.module_number; c.packet_count = output->module_statistics.packet_count; c.frame_number = output->module_statistics.frame_number; diff --git a/acquisition_device/AcquisitionDevice.h b/acquisition_device/AcquisitionDevice.h index 95da29371..3763182d0 100644 --- a/acquisition_device/AcquisitionDevice.h +++ b/acquisition_device/AcquisitionDevice.h @@ -38,6 +38,7 @@ class AcquisitionDevice { std::chrono::time_point end_time; int64_t expected_frames; + int64_t fpga_summation = 1; virtual void Start(const DiffractionExperiment& experiment, uint32_t flags) = 0; virtual void Finalize() {}; // do clean-up after action is done diff --git a/acquisition_device/Completion.h b/acquisition_device/Completion.h index 200716ef0..47d6129c6 100644 --- a/acquisition_device/Completion.h +++ b/acquisition_device/Completion.h @@ -14,7 +14,7 @@ struct Completion { uint64_t frame_number; uint32_t handle; - uint16_t packet_count; + uint32_t packet_count; uint16_t data_collection_id; uint16_t module_number; };