v1.0.0-rc.31

This commit is contained in:
2025-03-02 13:15:28 +01:00
parent aeabc81a4c
commit ddf4c75645
309 changed files with 8705 additions and 1421 deletions

View File

@@ -9,14 +9,14 @@
#include "../receiver/JFJochReceiverService.h"
#include "../image_pusher/ZMQWriterNotificationPuller.h"
TEST_CASE("StreamWriterTest_ZMQ","[StreamWriter]") {
TEST_CASE("StreamWriterTest_ZMQ", "[StreamWriter]") {
RegisterHDF5Filter();
Logger logger("StreamWriterTest_ZMQ");
DiffractionExperiment x(DetectorGeometry(2));
x.FilePrefix("subdir/StreamWriterTest").NumTriggers(1).ImagesPerTrigger(5)
.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0);
.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0).OverwriteExistingFiles(true);
PixelMask pixel_mask(x);
@@ -25,7 +25,7 @@ TEST_CASE("StreamWriterTest_ZMQ","[StreamWriter]") {
for (int i = 0; i < x.GetDataStreamsNum(); i++)
aq_devices.AddHLSDevice(64);
ZMQStream2Pusher pusher ({"ipc://*"});
ZMQStream2Pusher pusher({"ipc://*"});
JFJochReceiverService fpga_receiver_service(aq_devices, logger, pusher);
std::unique_ptr<StreamWriter> writer;
@@ -33,7 +33,7 @@ TEST_CASE("StreamWriterTest_ZMQ","[StreamWriter]") {
auto pusher_addr = pusher.GetAddress();
REQUIRE(pusher_addr.size() == 1);
REQUIRE_NOTHROW(writer = std::make_unique<StreamWriter>(logger, pusher_addr[0]));
CHECK (writer->GetStatistics().state == StreamWriterState::Idle);
CHECK(writer->GetStatistics().state == StreamWriterState::Idle);
REQUIRE_NOTHROW(fpga_receiver_service.Start(x, pixel_mask, nullptr));
REQUIRE_NOTHROW(writer->Run());
@@ -63,7 +63,7 @@ TEST_CASE("StreamWriterTest_ZMQ","[StreamWriter]") {
REQUIRE(std::filesystem::remove("subdir"));
}
TEST_CASE("StreamWriterTest_ZMQ_Update","[StreamWriter]") {
TEST_CASE("StreamWriterTest_ZMQ_Update", "[StreamWriter]") {
RegisterHDF5Filter();
Logger logger("StreamWriterTest_ZMQ_Update");
@@ -71,7 +71,8 @@ TEST_CASE("StreamWriterTest_ZMQ_Update","[StreamWriter]") {
DatasetSettings d;
d.FilePrefix("subdir/StreamWriterTest2").NumTriggers(1).ImagesPerTrigger(5).RunName("run1").RunNumber(256);
DiffractionExperiment x(DetectorGeometry(2));
x.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0).ImportDatasetSettings(d);
x.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0)
.ImportDatasetSettings(d).OverwriteExistingFiles(true);
PixelMask pixel_mask(x);
JFModuleGainCalibration gain;
@@ -79,7 +80,7 @@ TEST_CASE("StreamWriterTest_ZMQ_Update","[StreamWriter]") {
for (int i = 0; i < x.GetDataStreamsNum(); i++)
aq_devices.AddHLSDevice(64);
ZMQStream2Pusher pusher ({"ipc://*"});
ZMQStream2Pusher pusher({"ipc://*"});
pusher.WriterNotificationSocket("ipc://*");
JFJochReceiverService fpga_receiver_service(aq_devices, logger, pusher);
@@ -88,7 +89,7 @@ TEST_CASE("StreamWriterTest_ZMQ_Update","[StreamWriter]") {
auto pusher_addr = pusher.GetAddress();
REQUIRE(pusher_addr.size() == 1);
REQUIRE_NOTHROW(writer = std::make_unique<StreamWriter>(logger, pusher_addr[0]));
CHECK (writer->GetStatistics().state == StreamWriterState::Idle);
CHECK(writer->GetStatistics().state == StreamWriterState::Idle);
REQUIRE_NOTHROW(fpga_receiver_service.Start(x, pixel_mask, nullptr));
REQUIRE_NOTHROW(writer->Run());
@@ -119,7 +120,7 @@ TEST_CASE("StreamWriterTest_ZMQ_Update","[StreamWriter]") {
}
TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification","[StreamWriter]") {
TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification", "[StreamWriter]") {
// This tests simulates what happens if writer notification about writing end is missing
// Expected end result: receiver ends with an exception
@@ -130,7 +131,8 @@ TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification","[StreamWriter]") {
DatasetSettings d;
d.FilePrefix("subdir/StreamWriterTest3").NumTriggers(1).ImagesPerTrigger(5).RunName("run1").RunNumber(256);
DiffractionExperiment x(DetectorGeometry(2));
x.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0).ImportDatasetSettings(d);
x.UseInternalPacketGenerator(true).Mode(DetectorMode::Raw).PedestalG0Frames(0)
.ImportDatasetSettings(d).OverwriteExistingFiles(true);
PixelMask pixel_mask(x);
JFModuleGainCalibration gain;
@@ -138,7 +140,7 @@ TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification","[StreamWriter]") {
for (int i = 0; i < x.GetDataStreamsNum(); i++)
aq_devices.AddHLSDevice(64);
ZMQStream2Pusher pusher ({"ipc://*"});
ZMQStream2Pusher pusher({"ipc://*"});
pusher.WriterNotificationSocket("ipc://*");
JFJochReceiverService fpga_receiver_service(aq_devices, logger, pusher);
@@ -150,7 +152,7 @@ TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification","[StreamWriter]") {
REQUIRE_NOTHROW(writer = std::make_unique<StreamWriter>(logger, pusher_addr[0]));
writer->DebugSkipWriteNotification(true);
CHECK (writer->GetStatistics().state == StreamWriterState::Idle);
CHECK(writer->GetStatistics().state == StreamWriterState::Idle);
REQUIRE_NOTHROW(fpga_receiver_service.Start(x, pixel_mask, nullptr));
REQUIRE_NOTHROW(writer->Run());
@@ -178,4 +180,4 @@ TEST_CASE("StreamWriterTest_ZMQ_Update_NoNotification","[StreamWriter]") {
REQUIRE(std::filesystem::remove("subdir/StreamWriterTest3_master.h5"));
REQUIRE(std::filesystem::remove("subdir/StreamWriterTest3_data_000001.h5"));
REQUIRE(std::filesystem::remove("subdir"));
}
}