Spot finding works panel by panel, as the FPGA path does per JUNGFRAU module. PanelBoxes (common/) gives one box per DetectorModule; an empty table gives one box, the whole image, so every clamp reduces to the old image bounds in the same evaluation order (rotation sets, EIGER, CCDs, our JUNGFRAU unchanged). - ImageSpotFinder::SetPanels: the CPU local-box pass (dense, count-threshold and the DetectAt/candidate path of the adaptive finder) slides its windows inside each panel box; host CCL labels panel by panel; pixels on no panel are folded into the resolution mask. - GPU: analyze_pixel tiles each panel (warps numbered panel after panel), analyze_candidates and union_neighbours clip to the pixel's panel, the device spot carries its panel; the GPU list is put in panel order so it equals the host's. - DiffractionSpot carries its panel; SpotAnalyze maps by ImageToPlane(panel, ...) (d_A on the plane). - ImagePreprocessorBuffer::GatherTiles (CPU+GPU) clips each square to the panel of its centre. - MXAnalysisWithoutFPGA and the pre-scan workers hand the module table to finders and buffers. Raster algorithms: new common/AssembleToPlane.h (PlaneRasterOf, AssembleToPlane nearest-pixel gather with gaps, GatherFromPlane back to stored pixels; empty table = copy). With panels, ShadowFinder::GetMask runs on the projection assembled to the plane raster and gathers the mask back per stored pixel (CPU route); FindBeamCenterFFT scores the assembled projection and reports plane coordinates; the detector diagnostic JPEG shows the assembled plane. Without panels all three take their old path. Harness: PanelLayout_SpotsNeverCrossPanels enabled (count threshold and SNR on the edge scene), new PanelLayout_SpotFinderParity (CPU vs GPU, local box and adaptive, on the stacked layout), PanelLayout_AssembleToPlane, PanelLayout_ShadowFinder, PanelLayout_BeamCenterFFT, PanelLayout_DetectorDiagnostic (stacked vs assembled image cut to the raster). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu
141 lines
6.1 KiB
C++
141 lines
6.1 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <bit>
|
|
|
|
#include "../../common/JFJochException.h"
|
|
#include "ImageSpotFinder.h"
|
|
#include "StrongPixelSet.h"
|
|
|
|
ImageSpotFinder::ImageSpotFinder(int32_t width, int32_t height, bool host_bit_buffer)
|
|
: width(width),
|
|
height(height),
|
|
output_buffer(host_bit_buffer ? width * height / 32 + 1 : 0),
|
|
res_mask_bits(OutputSize(), 0),
|
|
panels(PanelBoxes({}, width, height)) {
|
|
// Exclude the padding bits of the last word up front, so neither the host scan nor the GPU
|
|
// compaction needs a separate "is this bit still inside the image?" test.
|
|
const size_t npixel = static_cast<size_t>(width) * height;
|
|
if (npixel % 32 != 0)
|
|
res_mask_bits.back() = ~((1u << (npixel % 32)) - 1u);
|
|
}
|
|
|
|
size_t ImageSpotFinder::OutputSize() const {
|
|
return (width * height) / 32 + ((width * height % 32 != 0) ? 1 : 0);
|
|
}
|
|
|
|
size_t ImageSpotFinder::OutputByteSize() const {
|
|
return OutputSize() * sizeof(uint32_t);
|
|
}
|
|
|
|
void ImageSpotFinder::SetResolutionMask(const std::vector<bool> &mask) {
|
|
const size_t npixel = static_cast<size_t>(width) * height;
|
|
if (mask.size() != npixel)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"ImageSpotFinder::SetResolutionMask: mask size mismatch");
|
|
std::vector<uint32_t> packed(OutputSize(), 0);
|
|
for (size_t i = 0; i < npixel; i++)
|
|
if (mask[i])
|
|
packed[i / 32] |= 1u << (i % 32);
|
|
SetResolutionMaskBits(packed);
|
|
}
|
|
|
|
void ImageSpotFinder::SetResolutionMaskBits(const std::vector<uint32_t> &packed_mask) {
|
|
if (packed_mask.size() != OutputSize())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"ImageSpotFinder::SetResolutionMaskBits: mask size mismatch");
|
|
res_mask_bits = packed_mask;
|
|
const size_t npixel = static_cast<size_t>(width) * height;
|
|
if (npixel % 32 != 0)
|
|
res_mask_bits.back() |= ~((1u << (npixel % 32)) - 1u);
|
|
for (size_t i = 0; i < off_panel_bits.size(); i++)
|
|
res_mask_bits[i] |= off_panel_bits[i];
|
|
}
|
|
|
|
void ImageSpotFinder::SetPanels(const DetectorModules &modules) {
|
|
panels = PanelBoxes(modules, width, height);
|
|
off_panel_bits.clear();
|
|
if (!modules.empty()) {
|
|
off_panel_bits.assign(OutputSize(), UINT32_MAX);
|
|
modules.ForEachPixel(width, height, [&](int64_t, size_t i, double, double) {
|
|
off_panel_bits[i / 32] &= ~(1u << (i % 32));
|
|
});
|
|
}
|
|
SetResolutionMaskBits(res_mask_bits);
|
|
}
|
|
|
|
const std::vector<float> &ImageSpotFinder::GetRingBackground() const {
|
|
static const std::vector<float> none;
|
|
return none;
|
|
}
|
|
|
|
void ImageSpotFinder::ExtractComponentsHost(const ImagePreprocessorBuffer &image,
|
|
const SpotFindingSettings &settings) {
|
|
// Collect the strong pixels first and read their values afterwards, instead of reading the image
|
|
// pixel by pixel: on the GPU that read is a device gather, which is what lets the preprocessed
|
|
// image stay on the device instead of being copied back in full for every frame.
|
|
strong_pixel.clear();
|
|
for (size_t i = 0; i < OutputSize(); i++) {
|
|
// The resolution mask is packed like the bit buffer, so a whole word of it is excluded at
|
|
// once instead of testing 32 bits one at a time.
|
|
uint32_t word = output_buffer[i] & ~res_mask_bits[i];
|
|
while (word != 0) {
|
|
strong_pixel.push_back(static_cast<uint32_t>(i * 32 + std::countr_zero(word)));
|
|
word &= word - 1;
|
|
}
|
|
}
|
|
|
|
strong_pixel_count = static_cast<uint32_t>(strong_pixel.size());
|
|
components.clear();
|
|
// The connected-component search gives up on a frame with this many strong pixels, so their values
|
|
// are of no use - not even worth gathering off the device.
|
|
if (strong_pixel.size() >= StrongPixelLimit(static_cast<size_t>(width) * height))
|
|
return;
|
|
|
|
image.Gather(strong_pixel, strong_pixel_value);
|
|
|
|
// Panel by panel, as the FPGA path labels module by module: a component never joins pixels of two
|
|
// panels, however close the image stores them. The strong pixels are in raster order, and so are
|
|
// those of one box. Every strong pixel is on a panel (off_panel_bits).
|
|
for (const auto &p: panels) {
|
|
StrongPixelSet pixel_set;
|
|
for (size_t i = 0; i < strong_pixel.size(); i++) {
|
|
const auto col = static_cast<int32_t>(strong_pixel[i] % width);
|
|
const auto line = static_cast<int32_t>(strong_pixel[i] / width);
|
|
if (col >= p.x0 && col < p.x1 && line >= p.y0 && line < p.y1)
|
|
pixel_set.AddStrongPixel(col, line, strong_pixel_value[i]);
|
|
}
|
|
const size_t first = components.size();
|
|
pixel_set.FindComponentsImage(settings, components);
|
|
for (size_t i = first; i < components.size(); i++)
|
|
components[i].Panel(p.panel);
|
|
}
|
|
}
|
|
|
|
const std::vector<DiffractionSpot> &ImageSpotFinder::ExtractComponents(const ImagePreprocessorBuffer &image,
|
|
const SpotFindingSettings &settings) {
|
|
ExtractComponentsHost(image, settings);
|
|
return components;
|
|
}
|
|
|
|
std::vector<DiffractionSpot> ImageSpotFinder::Filter(const std::vector<DiffractionSpot> &in,
|
|
const SpotFindingSettings &settings) {
|
|
std::vector<DiffractionSpot> out;
|
|
const int64_t min_pix = settings.min_pix_per_spot.value_or(2);
|
|
for (const auto &spot: in)
|
|
if (spot.PixelCount() >= min_pix)
|
|
out.push_back(spot);
|
|
return out;
|
|
}
|
|
|
|
std::vector<DiffractionSpot> ImageSpotFinder::ExtractSpots(const ImagePreprocessorBuffer &image,
|
|
const SpotFindingSettings &settings) {
|
|
return Filter(ExtractComponents(image, settings), settings);
|
|
}
|
|
|
|
std::vector<DiffractionSpot> ImageSpotFinder::Run(const ImagePreprocessorBuffer &image,
|
|
const SpotFindingSettings &settings) {
|
|
Detect(image, settings);
|
|
return ExtractSpots(image, settings);
|
|
}
|