v1.0.0-rc.81

2025-09-21 19:27:51 +02:00
parent 3ded4cd3ce
commit 5d9d2de4a4
243 changed files with 3401 additions and 935 deletions
--- a/tests/JFJochReceiverProcessingTest.cpp
+++ b/tests/JFJochReceiverProcessingTest.cpp
@@ -551,6 +551,95 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_FFT", "[JFJochRecei
    REQUIRE_NOTHROW(writer_future.get());
 }

+TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_FFTW", "[JFJochReceiver]") {
+    Logger logger(Catch::getResultCapture().getCurrentTestName());
+
+    RegisterHDF5Filter();
+
+    const uint16_t nthreads = 4;
+
+    DiffractionExperiment experiment(DetJF4M());
+    experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true).ImagesPerFile(2)
+            .FilePrefix("lyso_test_fftw").JungfrauConvPhotonCnt(false).SetFileWriterFormat(FileWriterFormat::NXmxVDS)
+            .OverwriteExistingFiles(true)
+            .DetectorDistance_mm(75).BeamY_pxl(1136).BeamX_pxl(1090).IncidentEnergy_keV(12.4)
+            .IndexingAlgorithm(IndexingAlgorithmEnum::FFTW);
+    PixelMask pixel_mask(experiment);
+
+    // Load example image
+    HDF5ReadOnlyFile data("../../tests/test_data/compression_benchmark.h5");
+    HDF5DataSet dataset(data, "/entry/data/data");
+    HDF5DataSpace file_space(dataset);
+
+    REQUIRE(file_space.GetDimensions()[2] == experiment.GetXPixelsNum());
+    REQUIRE(file_space.GetDimensions()[1] == experiment.GetYPixelsNum());
+    std::vector<int16_t> image_conv (file_space.GetDimensions()[1] * file_space.GetDimensions()[2]);
+
+    std::vector<hsize_t> start = {4,0,0};
+    std::vector<hsize_t> file_size = {1, file_space.GetDimensions()[1], file_space.GetDimensions()[2]};
+    dataset.ReadVector(image_conv, start, file_size);
+
+    std::vector<int16_t> image_raw_geom(experiment.GetModulesNum() * RAW_MODULE_SIZE);
+    ConvertedToRawGeometry(experiment, image_raw_geom.data(), image_conv.data());
+    logger.Info("Loaded image");
+
+    // Setup acquisition device
+    AcquisitionDeviceGroup aq_devices;
+    std::unique_ptr<HLSSimulatedDevice> test = std::make_unique<HLSSimulatedDevice>(0, 64);
+    for (int m = 0; m < experiment.GetModulesNum(); m++)
+        test->SetInternalGeneratorFrame((uint16_t *) image_raw_geom.data() + m * RAW_MODULE_SIZE, m);
+
+    aq_devices.Add(std::move(test));
+
+    ZMQStream2Pusher pusher({"ipc://*"});
+    pusher.WriterNotificationSocket("ipc://*");
+
+    ZMQImagePuller puller(pusher.GetAddress()[0]);
+    StreamWriter writer(logger, puller);
+    auto writer_future = std::async(std::launch::async, &StreamWriter::Run, &writer);
+
+    JFJochReceiverService service(aq_devices, logger, pusher);
+    service.NumThreads(nthreads);
+    service.Indexing(experiment.GetIndexingSettings());
+
+    // No progress value at the start of measurement
+    REQUIRE(!service.GetProgress().has_value());
+
+    SpotFindingSettings settings = DiffractionExperiment::DefaultDataProcessingSettings();
+    settings.signal_to_noise_threshold = 2.5;
+    settings.photon_count_threshold = 5;
+    settings.min_pix_per_spot = 1;
+    settings.max_pix_per_spot = 200;
+    settings.high_resolution_limit = 2.0;
+    settings.low_resolution_limit = 50.0;
+    service.SetSpotFindingSettings(settings);
+
+    service.Start(experiment, pixel_mask, nullptr);
+    auto receiver_out = service.Stop();
+
+    std::string jpeg;
+    PreviewImageSettings jpeg_settings{
+            .saturation_value = 10,
+            .jpeg_quality = 100,
+            .show_spots = true
+    };
+    REQUIRE_NOTHROW(jpeg = service.GetJPEGFromBuffer(jpeg_settings));
+    REQUIRE(!jpeg.empty());
+    std::ofstream f("lyso_processing_test_min_pix_1.jpeg", std::ios::binary);
+    f.write(jpeg.data(), jpeg.size());
+
+    CHECK(receiver_out.efficiency == 1.0);
+    REQUIRE(receiver_out.status.indexing_rate);
+    CHECK(receiver_out.status.indexing_rate.value() == 1.0);
+    CHECK(receiver_out.status.images_sent == experiment.GetImageNum());
+    CHECK(!receiver_out.status.cancelled);
+
+    // No progress value at the end of measurement
+    REQUIRE(!service.GetProgress().has_value());
+
+    REQUIRE_NOTHROW(writer_future.get());
+}
+
 TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_FFT_reference", "[JFJochReceiver]") {
    Logger logger(Catch::getResultCapture().getCurrentTestName());