The rc178 branch continued after #88 was squash-merged; this is its content fromb9ada7914(the tree #88 squashed) to094eee31a, as one change on main. The individual commits stay on the rc178 branch: - still battery: --cold evicts each set's input from the page cache; Alvra pixel masks; manifest fixes - AGIPD: converter to one rigid panel per module, int16 photons, mask folded in; still battery reads the converted sets - DetectorModules: panel look-up by id, plane -> panel, plane bounds and a per-pixel walk; mask size checked - tests: [PanelLayout] equivalence harness, stacked vs assembled panel layout - Dense per-pixel maps through the panel table (panel layout stage 1) - Panel id on spots and the panel table in the start message - Viewer and preview show a panel detector as it lies on the detector plane - Panel layout stage 3: per-panel spot finding (CPU+GPU, CCL) and raster algorithms on the plane raster - Panel layout stage 2: prediction and Bragg integration through the panel table - XTC reader: frames handed up as stored, streams indexed in parallel - XFEL reader: integer frames stay integer, one gain, placement by panel - EXTERNAL_TEST_DATA_STILLS.md: images used vs the entry for every set; drop "Not in the battery" - still battery: EuXFEL sets read the depositors' Cheetah CXI files directly; AGIPD converter removed - float32_to_int16.py: a non-finite pixel becomes -32768, the int16 error marker, not a zero count - CrystFEL geometry: read the pixel masks and bad regions instead of ignoring them - Panel layout stage 5: the XFEL reader hands up the stored frame and its panel table - Panel table persisted in NXmx; modulation grid and pre-scan memo key on the plane - still battery: Alvra sets take their pixel mask from the CrystFEL geometry, not --mask-good - still battery: take the deposited model as mmCIF where the RCSB has no PDB-format file - still battery: dimple gets PDB-format coordinates converted from an mmCIF-only deposition - stills fixed cost: geometry refinement and pre-scan do the same work in less wall time - stills geometry sample and trial spot finding run as many workers as the image pass - Stills integration: background ring reach measured on empty apertures, radial curvature from the whole frame - StillsPartialityRefine: the partiality width is the run's, measured on the crystals, not the prediction window's - MergeOnTheFly: capture term and multiplicative outlier band for the stills merge (both opt-in) - Stills given a cell: the written cell is the mean over the frames that are merged - Stills: the radial curvature correction decided per run on the same empty apertures - StillsPartialityRefine: measure the run width only on shells with signal - Stills pre-scan: report the paired z of the radial-correction comparison - module placement: the five concurrent fits each keep every thread - still battery: score R-free against the deposited data through the same dimple protocol - still battery: the R-free target is the lower of the deposition's dimple and published values - Stills: background clip follows the radial curve; signal disk from the lattice spacing - Stills keep an overloaded observation as a lower bound instead of dropping it - Stills: drop the lattice-spacing signal disk; the correction decision back on the plain clip - battery: R-free against the deposition without refinement only, one protocol for rotation and stills - still battery: EuXFEL sets run on a 2,000-image subset for now - stills geometry refinement: fit the detector distance and the cell together - stills geometry refinement: a distance given with --detector-distance is held in the joint fit - Metal integration engine: back to its panel-s5 kernels; Mac stills keep the old clip, no saturation count - Metal integration test: the CPU comparison runs on a rotation experiment - Stills: kept overloads go back to the drop where they are not concentrated at low resolution - stills distance search: an absolute 30-3000 mm scan, a sample found without d-limits, the fit iterated - battery results: XFEL still battery 20261022-1358 on rc1780cf62452c- 12 sets, cold, R_free unrefined - battery results: still summary gains the resolution of our merge and of the deposition - Pre-scan masks a pixel at the saturation limit on most frames, as one holding the error value - Stills keep an overload as a lower bound only where it has pixels at the limit; run-level gate removed - XFEL reader: a per-frame mask is read the way the frames are, its chunk inflated outside the HDF5 lock - stills distance search: every centre scanned with a wider acceptance, a larger sample where nothing indexes - rugnux usage: --beam-center-check describes the absolute 30-3000 mm stills distance scan, not the old 60-160 % grid - stills: detector tilt refined in the geometry pre-pass, kept where held-out frames agree - CLAUDE.md: the changelog is written once, just before the merge into main - condensed one-liners of what users get - broker: serve the placed model and its maps of the last rugnux live run (/rugnux/model.cif, /rugnux/map.ccp4) - frontend: Mol* viewer of the placed model and its density on the Rugnux live page - writer: _model.cif from rugnux live keeps the input model's metadata, as the served model.cif does - rugnux live maps: one unit cell centred on the model; the viewer opens on all of it - Anomalous difference map: ANOM/PHANOM in _maps.mtz, /rugnux/map.ccp4?type=anom, a magenta mesh in the viewer - Mol* viewer: open with the maps drawn within 10 A of the centre of view - Mol* viewer: aaredb's structure-viewer setup, on a black stage - rugnux: the gain of a stills file that states none is read off its single-photon peak where the background resolves photons - Mol* viewer: in line with AareDB's StructureView at its current head (8ece2c2) - ACKNOWLEDGEMENT: the web frontend's Mol* viewer follows AareDB's setup (G. Gotthard, PSI) - stills tilt decision: the modules stay where the run placed them - still battery: no distance pins and no per-set tuning flags; gain from the data except where a file's baseline hides it - battery results: rc178 6f6f69 - full still battery and full rotation battery with REFMAC - Bragg integration: a CCD rotation sweep's sigmas at the measured gain, intensities in photons - BackgroundGain: the gain of a frame that resolves photons is the spacing of its photon peaks, so a baseline left in the frame no longer hides it - ShadowFinder: measure the background's azimuthal modulation instead of predicting it from the polarization - BackgroundGain: one gain estimate for rotation and stills; the still battery no longer gives EuXFEL 152 its gain - ShadowFinder: measure the modulation robustly under a wide one-sided shadow - ShadowFinderTest: a one-sided shadow is not fitted as part of the background's modulation - ShadowFinder: back to the predicted polarization factor, in the plane the background shows - MXAnalysisAfterFPGA: the Bragg engine's edge mask in the image's layout, so raw / untransformed FPGA runs start again - battery results: still battery on rc178 e54f55 replaces the earlier rc178 still tables - XFELReader: per-frame mask and photon conversion without a library call or a branch per pixel - stills geometry trial: the hypotheses a search asks are indexed side by side - stills tilt decision: the fits start beside the pre-scan and the geometry trial - XFELReader: a deflated frame is inflated and converted a piece at a time, while it is in the cache - XFELReader: a byte-shuffled frame is unshuffled a piece at a time, a whole pixel per step - GeometryRefiner: residuals carry only the blocks a fit moves; beam and distance one block - GeometryRefiner: a spot's residual differentiates its observed and predicted halves apart - docs: EXTERNAL_TEST_DATA lists every open-arm battery set, with corrected values and counts - battery: doc_check.py cross-checks the manifests against the dataset pages - stills module placement: the placement fit gets half the threads, each held-out fit an eighth - still battery: the EuXFEL sets run on all their frames, as the published still runs did - battery results: still battery on rc178 a0ce6c, cold on a quiet machine, replaces the earlier rc178 table - macOS build: explicit size_t in the XFEL reader's row bounds; parentheses in the CPU preprocessor's select Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu
199 lines
6.8 KiB
C++
199 lines
6.8 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <fstream>
|
|
|
|
#include "../preview/JFJochTIFF.h"
|
|
#include "../preview/PreviewImage.h"
|
|
#include "../writer/HDF5Objects.h"
|
|
#include "../common/RawToConvertedGeometry.h"
|
|
#include "../frame_serialize/CBORStream2Serializer.h"
|
|
#include <tiffio.h>
|
|
#include <iostream>
|
|
|
|
TEST_CASE("TIFFTest","[TIFF]") {
|
|
std::vector<uint16_t> values(512*1024);
|
|
CompressedImage image(values, 1024, 512);
|
|
REQUIRE_NOTHROW(WriteTIFFToString(image));
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_Write_Read","[TIFF]") {
|
|
std::vector<uint32_t> values(512*1024);
|
|
for (int i = 0; i < values.size(); i++)
|
|
values[i] = (i * 17 + 2);
|
|
|
|
CompressedImage image(values, 1024, 512);
|
|
|
|
std::string s;
|
|
REQUIRE_NOTHROW(s = WriteTIFFToString(image));
|
|
|
|
std::vector<uint8_t> buffer;
|
|
CompressedImage out = ReadTIFF(s, buffer);
|
|
REQUIRE(out.GetMode() == CompressedImageMode::Uint32);
|
|
REQUIRE(out.GetWidth() == 1024);
|
|
REQUIRE(out.GetHeight() == 512);
|
|
REQUIRE(buffer.size() == values.size() * sizeof(uint32_t));
|
|
REQUIRE(memcmp(values.data(), buffer.data(), buffer.size()) == 0);
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_Write_Read_8bit","[TIFF]") {
|
|
std::vector<uint8_t> values(512*1024);
|
|
for (int i = 0; i < values.size(); i++)
|
|
values[i] = static_cast<uint8_t>(i * 17 + 2);
|
|
|
|
CompressedImage image(values, 1024, 512, CompressedImageMode::Uint8);
|
|
|
|
std::string s;
|
|
REQUIRE_NOTHROW(s = WriteTIFFToString(image));
|
|
|
|
std::vector<uint8_t> buffer;
|
|
CompressedImage out = ReadTIFF(s, buffer);
|
|
REQUIRE(out.GetMode() == CompressedImageMode::Uint8);
|
|
REQUIRE(out.GetWidth() == 1024);
|
|
REQUIRE(out.GetHeight() == 512);
|
|
REQUIRE(buffer == values);
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_Write_Read_16bit","[TIFF]") {
|
|
std::vector<uint16_t> values(512*1024);
|
|
for (int i = 0; i < values.size(); i++)
|
|
values[i] = static_cast<uint16_t>(i * 17 + 2);
|
|
|
|
CompressedImage image(values, 1024, 512);
|
|
|
|
std::string s;
|
|
REQUIRE_NOTHROW(s = WriteTIFFToString(image));
|
|
|
|
std::vector<uint8_t> buffer;
|
|
CompressedImage out = ReadTIFF(s, buffer);
|
|
REQUIRE(out.GetMode() == CompressedImageMode::Uint16);
|
|
REQUIRE(out.GetWidth() == 1024);
|
|
REQUIRE(out.GetHeight() == 512);
|
|
REQUIRE(buffer.size() == values.size() * sizeof(uint16_t));
|
|
REQUIRE(memcmp(values.data(), buffer.data(), buffer.size()) == 0);
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_File","[TIFF]") {
|
|
std::vector<uint16_t> values(512*1024);
|
|
|
|
for (auto &i: values)
|
|
i = 345;
|
|
|
|
CompressedImage image(values, 1024, 512);
|
|
|
|
REQUIRE_NOTHROW(WriteTIFFToFile("test_image.tiff", image));
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_File_signed","[TIFF]") {
|
|
std::vector<int16_t> values(512 * 1024);
|
|
|
|
for (int i = 0; i < values.size(); i++)
|
|
values[i] = static_cast<int16_t>(((i % 2 == 0) ? 1 : -1) * i);
|
|
|
|
CompressedImage image(values, 1024, 512);
|
|
|
|
REQUIRE_NOTHROW(WriteTIFFToFile("test_image_signed.tiff", image));
|
|
}
|
|
|
|
rgb rainbowColor(float t) {
|
|
// Ensure t is in [0,1]
|
|
t = std::max(0.0f, std::min(1.0f, t));
|
|
|
|
// Convert to hue (0 to 6)
|
|
float hue = t * 6.0f;
|
|
|
|
int phase = static_cast<int>(hue);
|
|
float fract = hue - phase;
|
|
|
|
uint8_t p = static_cast<uint8_t>(255 * (1.0f - fract));
|
|
uint8_t q = static_cast<uint8_t>(255 * fract);
|
|
uint8_t full = 255;
|
|
|
|
switch (phase) {
|
|
case 0: return {full, q, 0}; // Red to Yellow
|
|
case 1: return {p, full, 0}; // Yellow to Green
|
|
case 2: return {0, full, q}; // Green to Cyan
|
|
case 3: return {0, p, full}; // Cyan to Blue
|
|
case 4: return {q, 0, full}; // Blue to Magenta
|
|
case 5: return {full, 0, p}; // Magenta to Red
|
|
default: return {full, 0, 0}; // Fallback (red)
|
|
}
|
|
}
|
|
|
|
TEST_CASE("TIFFTest_File_rgb","[TIFF]") {
|
|
std::vector<rgb> values(512 * 1024);
|
|
|
|
for (int i = 0; i < values.size(); i++) {
|
|
float t = static_cast<float>(i % 1024) / (1024 - 1);
|
|
values[i] = rainbowColor(t);
|
|
}
|
|
CompressedImage image(values, 1024, 512);
|
|
|
|
REQUIRE_NOTHROW(WriteTIFFToFile("test_image_rgb.tiff", image));
|
|
}
|
|
|
|
|
|
TEST_CASE("TIFFTest_File_float","[TIFF]") {
|
|
std::vector<float> values(512 * 1024);
|
|
for (int i = 0; i < values.size(); i++)
|
|
values[i] = i / 100.0;
|
|
CompressedImage image(values, 1024, 512);
|
|
REQUIRE_NOTHROW(WriteTIFFToFile("test_image_float.tiff", image));
|
|
}
|
|
|
|
// A detector with a panel table is previewed as it lies on the plane: two panels stacked in the stored
|
|
// image, placed side by side with a gap, come out side by side, the gap in the gap colour.
|
|
TEST_CASE("PreviewImage_PanelLayout", "[TIFF][PanelId]") {
|
|
DiffractionExperiment x(DetDECTRIS(64, 32, "test", ""));
|
|
x.BitDepthImage(16).PixelSigned(false);
|
|
DetectorModule right = DetectorModule::AsImaged(0, 16, 64, 16);
|
|
right.ox = 80;
|
|
right.oy = 0;
|
|
x.Modules(DetectorModules({DetectorModule::AsImaged(0, 0, 64, 16), right}));
|
|
|
|
std::vector<uint16_t> pixels(64 * 32, 0);
|
|
for (int i = 64 * 16; i < 64 * 32; i++)
|
|
pixels[i] = 1000; // above the foreground: the top of the colour scale
|
|
|
|
PreviewImage preview;
|
|
preview.Configure(x, PixelMask(x));
|
|
|
|
std::vector<uint8_t> buffer(1 << 20);
|
|
CBORStream2Serializer serializer(buffer.data(), buffer.size());
|
|
DataMessage message{.number = 0, .image = CompressedImage(pixels, 64, 32)};
|
|
serializer.SerializeImage(message);
|
|
buffer.resize(serializer.GetBufferSize());
|
|
|
|
PreviewImageSettings settings{.saturation_value = 10, .show_beam_center = false, .show_spots = false,
|
|
.format = PreviewImageFormat::TIFF};
|
|
const std::string tiff = preview.GenerateImage(settings, buffer);
|
|
{
|
|
std::ofstream f("preview_panel_layout.tiff", std::ios::binary);
|
|
f.write(tiff.data(), tiff.size());
|
|
}
|
|
|
|
TIFF *t = TIFFOpen("preview_panel_layout.tiff", "r");
|
|
REQUIRE(t);
|
|
uint32_t width = 0, height = 0;
|
|
TIFFGetField(t, TIFFTAG_IMAGEWIDTH, &width);
|
|
TIFFGetField(t, TIFFTAG_IMAGELENGTH, &height);
|
|
// Plane bounds [-0.5, 143.5) x [-0.5, 15.5): raster pixel centres 0..143 x 0..15 (PlaneRasterOf)
|
|
CHECK(width == 144);
|
|
CHECK(height == 16);
|
|
|
|
std::vector<rgb> row(width);
|
|
REQUIRE(TIFFReadScanline(t, row.data(), 8) == 1); // plane y = 8
|
|
TIFFClose(t);
|
|
remove("preview_panel_layout.tiff");
|
|
|
|
ColorScale scale;
|
|
scale.Select(settings.scale);
|
|
const rgb gap = scale.Apply(ColorScaleSpecial::Gap);
|
|
auto same = [](const rgb &a, const rgb &b) { return a.r == b.r && a.g == b.g && a.b == b.b; };
|
|
CHECK(same(row[10], scale.ApplyLUTIndex(0))); // left panel: zero counts
|
|
CHECK(same(row[70], gap)); // the gap between the panels
|
|
CHECK(same(row[100], scale.ApplyLUTIndex(scale.LUTData().size() - 1))); // right panel: the top of the scale
|
|
}
|