v1.0.0-rc.104 (#9)

This is an UNSTABLE release.

jfjoch_writer: Fix and improve the way grid scan geometry is saved (non-NXmx extension makes it way easier)
jfjoch_viewer: Display grid scan results in 2D (work in progress)
jfjoch_viewer: Improve auto-scaling on start of images (work in progress)
jfjoch_viewer: Add B-factor and resolution estimate to the dataset info plots

Reviewed-on: #9
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>

tests/JFJochReaderTest.cpp

@@ -271,6 +271,7 @@ TEST_CASE("JFJochReader_Goniometer", "[HDF5][Full]") {
         reader.ReadFile("test17_master.h5");
         auto dataset = reader.GetDataset();
 
+        REQUIRE(!dataset->experiment.GetGridScan().has_value());
         REQUIRE(dataset->experiment.GetGoniometer().has_value());
 
         CHECK(dataset->experiment.GetGoniometer()->GetStart_deg() == 95.0);
@@ -285,6 +286,64 @@ TEST_CASE("JFJochReader_Goniometer", "[HDF5][Full]") {
     REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
 }
 
+TEST_CASE("JFJochReader_GridScan", "[HDF5][Full]") {
+    DiffractionExperiment x(DetJF(1));
+
+    x.PixelSigned(false).BitDepthImage(16).OverwriteExistingFiles(true);
+    x.FrameTime(std::chrono::microseconds(500), std::chrono::microseconds(10));
+
+    DatasetSettings d;
+    d.FilePrefix("test_reader_grid_scan").ImagesPerTrigger(5);
+    d.BeamX_pxl(100).BeamY_pxl(200).DetectorDistance_mm(150)
+            .PhotonEnergy_keV(WVL_1A_IN_KEV)
+            .GridScan(GridScanSettings(3, -7.5, 8.0, true, true));
+    x.ImportDatasetSettings(d);
+
+    RegisterHDF5Filter();
+
+    std::vector<uint16_t> image(x.GetPixelsNum(), 0);
+    {
+        StartMessage start_message;
+        x.FillMessage(start_message);
+
+        FileWriter file_set(start_message);
+
+        DataMessage message{};
+        for (int i = 0; i < 5; i++) {
+            message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
+            message.number = i;
+
+            REQUIRE_NOTHROW(file_set.WriteHDF5(message));
+        }
+
+        EndMessage end_message;
+        end_message.max_image_number = 4;
+        file_set.WriteHDF5(end_message);
+
+        file_set.Finalize();
+    }
+    {
+        JFJochHDF5Reader reader;
+        reader.ReadFile("test_reader_grid_scan_master.h5");
+        auto dataset = reader.GetDataset();
+
+
+        REQUIRE(!dataset->experiment.GetGoniometer().has_value());
+        REQUIRE(dataset->experiment.GetGridScan().has_value());
+
+        CHECK(dataset->experiment.GetGridScan()->IsSnakeScan());
+        CHECK(dataset->experiment.GetGridScan()->IsVerticalScan());
+        CHECK(dataset->experiment.GetGridScan()->GetNFast() == 3);
+        CHECK(dataset->experiment.GetGridScan()->GetNSlow() == 2);
+        CHECK(dataset->experiment.GetGridScan()->GetNElem() == 6);
+        CHECK(dataset->experiment.GetGridScan()->GetGridStepX_um() == Catch::Approx(-7.5));
+        CHECK(dataset->experiment.GetGridScan()->GetGridStepY_um() == Catch::Approx(8.0));
+    }
+    remove("test_reader_grid_scan_master.h5");
+
+    REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
+}
+
 TEST_CASE("JFJochReader_DataI16", "[HDF5][Full]") {
     DiffractionExperiment x(DetJF(1));