JFJochStateMachine: Reduce reliance on ProtoBuf (work in progress)

This commit is contained in:
2023-11-16 13:57:15 +01:00
parent c5f6119455
commit f7069ebf5e
4 changed files with 139 additions and 139 deletions
+19 -19
View File
@@ -792,14 +792,14 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot", "[JFJochReceiver]") {
setup.mutable_unit_cell()->set_gamma(90.0);
setup.set_data_file_count(1);
JFJochProtoBuf::DataProcessingSettings settings;
settings.set_signal_to_noise_threshold(4);
settings.set_photon_count_threshold(5);
settings.set_min_pix_per_spot(3);
settings.set_max_pix_per_spot(200);
settings.set_low_resolution_limit(80.0);
settings.set_high_resolution_limit(2.5);
settings.set_local_bkg_size(5);
DataProcessingSettings settings;
settings.signal_to_noise_threshold = 4;
settings.photon_count_threshold = 5;
settings.min_pix_per_spot = 3;
settings.max_pix_per_spot = 200;
settings.low_resolution_limit = 80.0;
settings.high_resolution_limit = 2.5;
settings.local_bkg_size = 5;
REQUIRE_NOTHROW(state_machine.SetDataProcessingSettings(settings));
@@ -1028,20 +1028,20 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_rad_int", "[JFJochReceiver]") {
logger.Info("Stopped measurement");
auto rad_int = state_machine.GetRadialIntegrationProfiles();
REQUIRE(rad_int.profiles_size() == 4+1);
auto &plot_map = rad_int.profiles();
REQUIRE(rad_int.profiles.size() == 4+1);
auto &plot_map = rad_int.profiles;
CHECK(plot_map[1].title() == "file0");
CHECK(plot_map[1].plot().x_size() == 3);
CHECK(plot_map[1].plot().y_size() == 3);
CHECK(plot_map[1].title == "file0");
CHECK(plot_map[1].plot.x.size() == 3);
CHECK(plot_map[1].plot.y.size() == 3);
CHECK(plot_map[4].title() == "file3");
REQUIRE(plot_map[4].plot().x_size() == 3);
CHECK(plot_map[4].plot().x(0) == Approx(1.0));
CHECK(plot_map[4].plot().y_size() == 3);
CHECK(plot_map[4].title == "file3");
REQUIRE(plot_map[4].plot.x.size() == 3);
CHECK(plot_map[4].plot.x[0] == Approx(1.0));
CHECK(plot_map[4].plot.y.size() == 3);
CHECK(plot_map[0].title() == "dataset");
CHECK(plot_map[0].plot().x_size() == 3);
CHECK(plot_map[0].title == "dataset");
CHECK(plot_map[0].plot.x.size() == 3);
REQUIRE_NOTHROW(writer_future.get());
}