jfjoch_process: Increase performance by decompressing image outside of global lock, avoiding extra processing and avoiding extra compression (if writing)

2026-04-29 19:22:22 +02:00
parent b53572e7f1
commit 2317eed841
9 changed files with 155 additions and 50 deletions
@@ -163,7 +163,6 @@ TEST_CASE("JFJochReader_MasterFile_Calibration", "[HDF5][Full]") {
    REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
 }

-
 TEST_CASE("JFJochReader_DefaultExperiment", "[HDF5][Full]") {
    DiffractionExperiment x(DetJF(1));

@@ -1495,5 +1494,64 @@ TEST_CASE("JFJochReader_NXmxIntegrated", "[HDF5][Full]") {
    }
    remove("test_reader_integrated_master.h5");

+    REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
+}
+
+TEST_CASE("JFJochReader_GetRawImage", "[HDF5][Full]") {
+    DiffractionExperiment x(DetJF(1));
+
+    x.FilePrefix("test_read_raw_image").ImagesPerTrigger(4).OverwriteExistingFiles(true);
+    x.BitDepthImage(16).ImagesPerFile(2).SetFileWriterFormat(FileWriterFormat::NXmxLegacy).PixelSigned(true)
+            .IndexingAlgorithm(IndexingAlgorithmEnum::FFT);
+    x.Compression(CompressionAlgorithm::BSHUF_ZSTD);
+
+    std::vector<int16_t> image(x.GetPixelsNum());
+    for (int i = 0; i < image.size(); i++)
+        image[i] = static_cast<int16_t>((i * 7 + 33) % UINT16_MAX);
+
+    RegisterHDF5Filter();
+    JFJochBitShuffleCompressor compressor(CompressionAlgorithm::BSHUF_ZSTD);
+    auto compressed_image = compressor.Compress(image);
+    {
+        StartMessage start_message;
+        x.FillMessage(start_message);
+        FileWriter file_set(start_message);
+
+        for (int i = 0; i < x.GetImageNum(); i++) {
+            DataMessage message{};
+            message.image = CompressedImage(compressed_image, x.GetXPixelsNum(), x.GetYPixelsNum(),
+                                            CompressedImageMode::Int16, CompressionAlgorithm::BSHUF_ZSTD);
+            message.number = i;
+            REQUIRE_NOTHROW(file_set.WriteHDF5(message));
+        }
+        EndMessage end_message;
+        end_message.max_image_number = x.GetImageNum();
+        file_set.WriteHDF5(end_message);
+        file_set.Finalize();
+    }
+    {
+        JFJochHDF5Reader reader;
+        REQUIRE_NOTHROW(reader.ReadFile("test_read_raw_image_master.h5"));
+        auto dataset = reader.GetDataset();
+        CHECK(dataset->experiment.GetImageNum() == 4);
+
+        std::shared_ptr<JFJochReaderRawImage> reader_image;
+        for (int i = 0; i < 4; i++) {
+            REQUIRE_NOTHROW(reader_image = reader.GetRawImage(i));
+
+            CHECK(reader_image->image.GetMode() == CompressedImageMode::Int16);
+            CHECK(reader_image->image.GetCompressionAlgorithm() == CompressionAlgorithm::BSHUF_ZSTD);
+            CHECK(reader_image->image.GetWidth() == x.GetXPixelsNum());
+            CHECK(reader_image->image.GetHeight() == x.GetYPixelsNum());
+            CHECK(reader_image->image.GetCompressedSize() == compressed_image.size());
+            CHECK(reader_image->image.GetCompressed() == reader_image->image_buffer.data());
+            REQUIRE(reader_image->image_buffer.size() == compressed_image.size());
+            CHECK(memcmp(reader_image->image_buffer.data(), compressed_image.data(), compressed_image.size()) == 0);
+        }
+    }
+    remove("test_read_raw_image_master.h5");
+    remove("test_read_raw_image_data_000001.h5");
+    remove("test_read_raw_image_data_000002.h5");
+// No leftover HDF5 objects
    REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
 }