File writer and spot finding improvements

This commit is contained in:
2024-04-08 11:18:50 +02:00
parent 15d99c6162
commit c6d2b5eedf
72 changed files with 690 additions and 893 deletions
+4 -5
View File
@@ -23,7 +23,7 @@ void test_puller(ZMQImagePuller *puller,
while (puller->GetFrameType() != CBORStream2Deserializer::Type::END) {
if (puller->GetFrameType() == CBORStream2Deserializer::Type::IMAGE) {
auto image = puller->GetDataMessage();
if ((nwriter > 1) && (image.number % nwriter != writer_id))
if ((nwriter > 1) && ((image.number / 16) % nwriter != writer_id))
diff_split[writer_id]++;
@@ -85,7 +85,7 @@ TEST_CASE("ZMQImageCommTest_1Writer","[ZeroMQ]") {
std::thread sender_thread = std::thread([&] {
StartMessage message {
.data_file_count = 16
.images_per_file = 16
};
EndMessage end_message{
.write_master_file = true
@@ -161,7 +161,7 @@ TEST_CASE("ZMQImageCommTest_2Writers","[ZeroMQ]") {
std::thread sender_thread = std::thread([&] {
StartMessage message {
.data_file_count = 16
.images_per_file = 16
};
EndMessage end_message{
.write_master_file = true
@@ -247,7 +247,7 @@ TEST_CASE("ZMQImageCommTest_4Writers","[ZeroMQ]") {
std::thread sender_thread = std::thread([&] {
StartMessage message {
.data_file_count = 16
.images_per_file = 16
};
EndMessage end_message{
.write_master_file = true
@@ -317,7 +317,6 @@ TEST_CASE("ZMQImagePuller_abort","[ZeroMQ]") {
TEST_CASE("ZMQImageCommTest_NoWriter","[ZeroMQ]") {
ZMQStream2PusherGroup pusher({"ipc://*"});
StartMessage msg;
msg.data_file_count = 1;
REQUIRE_THROWS(pusher.StartDataCollection(msg));
std::vector<uint8_t> test(512*1024, 11);