diff --git a/docs/RUGNUX_CLI.md b/docs/RUGNUX_CLI.md index 3ab82abff..4c4f2b53f 100644 --- a/docs/RUGNUX_CLI.md +++ b/docs/RUGNUX_CLI.md @@ -96,7 +96,8 @@ name). Several inputs are one stills dataset in `--mode mx`, or several rotation one dataset - `rugnux run*.h5` (SACLA), `*.cxi`, `*.xtc` (LCLS) - or several Jungfraujoch/NXmx masters of stills - or of rotation sweeps under `--force-still` - read as one run: their images one after another, merged together, with the indexing rate reported per master as well. Such masters must share the detector, wavelength, -distance and beam centre. Several inputs must be one format; any `--mode` other than `mx`, and +distance and beam centre. A grid scan an input holds (a fixed-target chip) is not carried into the run: several chips are +not one grid, so the run has no grid map. Several inputs must be one format; any `--mode` other than `mx`, and following a broker, take one. Several rotation sweeps are told apart from the files: one sweep per CBF/marCCD/SMV/SFRM file-name diff --git a/reader/JFJochMultiReader.cpp b/reader/JFJochMultiReader.cpp index 5e823ed27..903246a79 100644 --- a/reader/JFJochMultiReader.cpp +++ b/reader/JFJochMultiReader.cpp @@ -109,6 +109,9 @@ JFJochMultiReader::JFJochMultiReader(std::vector> dataset->pixel_mask = std::make_shared(mask); if (as_stills) dataset->experiment.Goniometer(std::nullopt); + // Several collections are not one grid: the first input's grid would place the whole run's image + // numbers on its own raster and throw past its last element. The run keeps no grid map. + dataset->experiment.GridScan(std::nullopt); SetStartMessage(dataset); } diff --git a/tests/MultiReaderTest.cpp b/tests/MultiReaderTest.cpp index 9589bee5b..d02ffafc4 100644 --- a/tests/MultiReaderTest.cpp +++ b/tests/MultiReaderTest.cpp @@ -4,6 +4,7 @@ #include #include "../common/DiffractionExperiment.h" +#include "../common/ScanResultGenerator.h" #include "../reader/JFJochMultiReader.h" namespace { @@ -116,3 +117,29 @@ TEST_CASE("JFJochMultiReader_RotationAsStills", "[JFJochMultiReader][portable]") CHECK(!reader.GetDataset()->experiment.GetGoniometer().has_value()); CHECK(reader.ReadSpots(2)[0].x == Catch::Approx(100.0f)); } + +TEST_CASE("JFJochMultiReader_DropsGridScan", "[JFJochMultiReader][portable]") { + // Two fixed-target chips, a grid scan each: read together they are one stills run, not one grid. + // The first input's grid (6 elements) would throw on every image number past its own. + auto x = Stills(); + x.ImagesPerTrigger(6).GridScan(GridScanSettings(3, 10.0f, 10.0f, true, false).ImageNum(6)); + + std::vector> inputs; + inputs.push_back(std::make_unique(6, 0.0f, x, EmptyMask(x))); + inputs.push_back(std::make_unique(6, 100.0f, x, EmptyMask(x))); + JFJochMultiReader reader(std::move(inputs)); + REQUIRE(reader.GetNumberOfImages() == 12); + CHECK(!reader.GetDataset()->experiment.GetGoniometer().has_value()); + CHECK(!reader.GetDataset()->experiment.GetGridScan().has_value()); + + // As rugnux sets the run up: the combined dataset's experiment over every image of every input. + DiffractionExperiment run(reader.GetDataset()->experiment); + run.ImagesPerTrigger(static_cast(reader.GetNumberOfImages())); + ScanResultGenerator scan_result(run); + for (int64_t i = 0; i < 12; i++) { + DataMessage message; + message.number = i; + REQUIRE_NOTHROW(scan_result.Add(message)); + } + CHECK(scan_result.GetResult().images.size() == 12); +}