v1.0.0-rc.153 (#63)

This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use.

* jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing
* jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files
* jfjoch_broker: Add ROI calculation in non-FPGA workflow
* jfjoch_broker: Fixes to TCP image pusher
* jfjoch_broker: Remove NUMA bindings
* jfjoch_broker: Improvements to indexing
* jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values
* jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors
* jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs
* jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results

Reviewed-on: #63

tests/PixelMaskTest.cpp

@@ -306,6 +306,44 @@ TEST_CASE("PixelMask_LoadUserMaskRaw_UpdatesCachedRawMask", "[PixelMask]") {
     CHECK((raw_mask_out[0] & (1u << PixelMask::ModuleEdgePixelBit)) != 0);
 }
 
+TEST_CASE("PixelMask_LoadUserMask_CompressedImage","[PixelMask]") {
+    DiffractionExperiment experiment(DetJF(4, 1, 8, 36, false));
+    experiment.MaskModuleEdges(false).MaskChipEdges(false);
+
+    const uint32_t cols = experiment.GetXPixelsNumConv();
+    const uint32_t lines = experiment.GetYPixelsNumConv();
+
+    // 8-bit single-channel mask, as e.g. PyFAI produces; non-zero == masked
+    std::vector<uint8_t> values(static_cast<size_t>(cols) * lines, 0);
+    values[1030 * 700 + 300] = 255;
+    CompressedImage image(values, cols, lines, CompressedImageMode::Uint8);
+
+    PixelMask mask(experiment);
+    REQUIRE_NOTHROW(mask.LoadUserMask(experiment, image));
+
+    REQUIRE(mask.GetMask()[1030 * 700 + 300] == (1 << PixelMask::UserMaskedPixelBit));
+    REQUIRE(mask.GetUserMask()[1030 * 700 + 300] == 1);
+    REQUIRE(mask.GetStatistics().user_mask == 1);
+
+    // 32-bit mask goes through the same path
+    std::vector<uint32_t> values32(static_cast<size_t>(cols) * lines, 0);
+    values32[1030 * 700 + 300] = 7;
+    CompressedImage image32(values32, cols, lines);
+    PixelMask mask32(experiment);
+    REQUIRE_NOTHROW(mask32.LoadUserMask(experiment, image32));
+    REQUIRE(mask32.GetUserMask()[1030 * 700 + 300] == 1);
+
+    // Float images are rejected outright
+    std::vector<float> valuesf(static_cast<size_t>(cols) * lines, 0.0f);
+    CompressedImage imagef(valuesf, cols, lines);
+    REQUIRE_THROWS(mask.LoadUserMask(experiment, imagef));
+
+    // Image whose shape doesn't match the detector is rejected
+    std::vector<uint8_t> wrong(static_cast<size_t>(cols) * (lines + 1), 0);
+    CompressedImage bad(wrong, cols, lines + 1, CompressedImageMode::Uint8);
+    REQUIRE_THROWS(mask.LoadUserMask(experiment, bad));
+}
+
 TEST_CASE("PixelMask_GetMaskRaw_ThrowsForDECTRIS", "[PixelMask]") {
     DiffractionExperiment experiment(DetDECTRIS(2068, 2164, "Test", ""));
     PixelMask mask(experiment);