From ffa3a2cdacd9e2dc9b7b93ff3af1065720d4b188 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 20 Sep 2023 16:49:03 +0200 Subject: [PATCH] FPGAAcquisitionDevice: Put warning for wrong data collection ID --- receiver/AcquisitionDevice.cpp | 3 --- receiver/FPGAAcquisitionDevice.cpp | 7 +++++++ receiver/jfjoch_receiver.cpp | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/receiver/AcquisitionDevice.cpp b/receiver/AcquisitionDevice.cpp index 989a2c59..07ff8766 100644 --- a/receiver/AcquisitionDevice.cpp +++ b/receiver/AcquisitionDevice.cpp @@ -80,9 +80,6 @@ void AcquisitionDevice::StartAction(const DiffractionExperiment &experiment) { StartSendingWorkRequests(); start_time = std::chrono::system_clock::now(); - - if (logger) - logger->Info("Started"); } void AcquisitionDevice::WaitForActionComplete() { diff --git a/receiver/FPGAAcquisitionDevice.cpp b/receiver/FPGAAcquisitionDevice.cpp index b68b6249..ee7a4352 100644 --- a/receiver/FPGAAcquisitionDevice.cpp +++ b/receiver/FPGAAcquisitionDevice.cpp @@ -35,7 +35,14 @@ void FPGAAcquisitionDevice::ReadWorkCompletionThread() { work_completion_queue.PutBlocking(c); if (c.type == Completion::Type::End) quit_loop = true; + } else if (logger) { + if (c.type == Completion::Type::Start) + logger->Warning("Stream {} Start completion with wrong data collection ID", data_stream); + else + logger->Warning("Stream {} Image completion with wrong data collection ID frame {} module {}", + data_stream, c.frame_number, c.module_number); } + } while (!quit_loop); } diff --git a/receiver/jfjoch_receiver.cpp b/receiver/jfjoch_receiver.cpp index 6d8271fa..17303dad 100644 --- a/receiver/jfjoch_receiver.cpp +++ b/receiver/jfjoch_receiver.cpp @@ -114,6 +114,7 @@ int main(int argc, char **argv) { std::vector> aq_devices; for (int i = 0; i < input["device"].size(); i++) { auto ptr = SetupAcquisitionDevice(input["device"][i], i); + ptr->EnableLogging(&logger); aq_devices.emplace_back(ptr); }