From de5ebbeb1da03d64aa49723a624761a672943271 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Thu, 16 Nov 2023 20:23:00 +0100
Subject: [PATCH] Fix JFJochFullIntegrationTest

---
 tests/JFJochFullIntegrationTest.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/JFJochFullIntegrationTest.cpp b/tests/JFJochFullIntegrationTest.cpp
index cceb850d..6910c4d0 100644
--- a/tests/JFJochFullIntegrationTest.cpp
+++ b/tests/JFJochFullIntegrationTest.cpp
@@ -51,7 +51,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.images_per_trigger = 5;
     setup.detector_distance_mm = 100;
@@ -136,7 +136,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_save_calibration", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.images_per_trigger = 5;
     setup.detector_distance_mm = 100;
@@ -223,7 +223,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_2DataStreams_4Devices", "[JFJochReceiver]")
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.images_per_trigger = 5;
     setup.detector_distance_mm = 100;
@@ -306,7 +306,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_RAW", "[JFJochReceiver]") {
     StreamWriter writer(zmq_context, logger, "inproc://#1");
     auto writer_future = writer.RunFuture();
 
-    DetectorSettings detector_settings;
+    DetectorSettings detector_settings{};
     detector_settings.frame_time_us = 500;
     detector_settings.collect_raw_data = true;
     detector_settings.storage_cell_count = 1;
@@ -314,7 +314,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_RAW", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 100;
     setup.file_prefix = "integration_raw_test";
@@ -403,7 +403,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_3Writers", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 100;
     setup.file_prefix = "integration_test_3writers";
@@ -488,13 +488,14 @@ TEST_CASE("JFJochIntegrationTest_Cancel", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 100;
     setup.file_prefix = "integration_test";
     setup.images_per_trigger = 2 * nimages;
     setup.photon_energy_keV = 12.4;
     setup.data_file_count = 1;
+    setup.save_calibration = false;
 
     REQUIRE_NOTHROW(state_machine.Start(setup));
     logger.Info("Started measurement");
@@ -568,7 +569,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 100;
     setup.file_prefix = "integration_test_preview";
@@ -665,7 +666,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview_no_writer", "[JFJochReceiver]"
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 100;
     setup.images_per_trigger = 5;
@@ -774,7 +775,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 75;
     setup.file_prefix = "spot_finding_test";
@@ -785,7 +786,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot", "[JFJochReceiver]") {
     setup.unit_cell = UnitCell{.a = 36.9, .b = 78.95, .c = 78.95, .alpha = 90.0, .beta = 90.0, .gamma = 90.0};
     setup.data_file_count = 1;
 
-    DataProcessingSettings settings;
+    DataProcessingSettings settings{};
     settings.signal_to_noise_threshold = 4;
     settings.photon_count_threshold = 5;
     settings.min_pix_per_spot = 3;
@@ -880,7 +881,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index", "[JFJochReceiver]
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 75;
         setup.file_prefix = "spot_finding_test";
@@ -997,7 +998,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_rad_int", "[JFJochReceiver]") {
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 75;
     setup.file_prefix = "spot_finding_test";
@@ -1105,7 +1106,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_sum", "[JFJochRecei
     REQUIRE_NOTHROW(state_machine.Initialize());
     logger.Info("Initialized");
 
-    DatasetSettings setup;
+    DatasetSettings setup{};
     setup.ntrigger = 1;
     setup.detector_distance_mm = 75;
     setup.summation = 3;