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
92 lines
5.5 KiB
C++
92 lines
5.5 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <vector>
|
|
|
|
#include "../../common/DiffractionSpot.h"
|
|
#include "../../common/PanelBoxes.h"
|
|
|
|
#include "../image_preprocessing/ImagePreprocessorBuffer.h"
|
|
|
|
class ImageSpotFinder {
|
|
// Flat index of every strong pixel of the current image that passed the resolution mask, and its
|
|
// value. Kept as members only to reuse the allocation from image to image.
|
|
std::vector<uint32_t> strong_pixel;
|
|
std::vector<int32_t> strong_pixel_value;
|
|
uint32_t strong_pixel_count = 0;
|
|
protected:
|
|
const int32_t width, height;
|
|
std::vector<uint32_t> output_buffer;
|
|
// Pixels excluded from spot finding, packed the same way as output_buffer (bit set = excluded).
|
|
// The bits past the last image pixel are set at construction, so the padding of the last word
|
|
// needs no separate guard. Default: nothing excluded.
|
|
std::vector<uint32_t> res_mask_bits;
|
|
// The connected components of the last extraction. A member so ExtractComponents can hand out a
|
|
// reference and reuse the allocation from image to image.
|
|
std::vector<DiffractionSpot> components;
|
|
// The panels the image is made of (PanelBoxes): the local windows and the connected components stay
|
|
// inside a panel and every spot carries its panel - the FPGA spot finder's model, per JUNGFRAU module.
|
|
// Default, and for an empty module table: one panel, the whole image.
|
|
std::vector<PanelBox> panels;
|
|
// Pixels on no panel, packed like res_mask_bits; empty when every pixel is on one. Folded into the
|
|
// resolution mask, so such a pixel never reaches a component.
|
|
std::vector<uint32_t> off_panel_bits;
|
|
|
|
// host_bit_buffer = false leaves output_buffer empty: the GPU finders extract on the device and
|
|
// never read the bit buffer on the host, so allocating and pinning 2.26 MB per engine (at 18 MP)
|
|
// would be pure waste for them.
|
|
ImageSpotFinder(int32_t width, int32_t height, bool host_bit_buffer = true);
|
|
size_t OutputSize() const;
|
|
size_t OutputByteSize() const;
|
|
// Host extraction: scan the bit buffer, gather the values, run the connected-component search.
|
|
void ExtractComponentsHost(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings);
|
|
public:
|
|
constexpr static int32_t MIN_VALID_PIXELS = 100;
|
|
constexpr static int NBX = 15;
|
|
|
|
virtual ~ImageSpotFinder() = default;
|
|
|
|
// Detect flags the image's strong pixels into the internal bit buffer - the expensive step (local
|
|
// box or per-ring background over every pixel). ExtractComponents then builds the connected
|
|
// components from those pixels.
|
|
virtual void Detect(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings) = 0;
|
|
|
|
// Strong pixels the last extraction saw, after the resolution mask. Reported whether or not the
|
|
// frame was given up on for holding StrongPixelLimit of them, which is the point of it: such a
|
|
// frame yields no spots at all, and without this nothing distinguishes it from a blank one.
|
|
[[nodiscard]] virtual uint32_t StrongPixelCount() const { return strong_pixel_count; }
|
|
|
|
// Peak-excluded per-ring background of the last Detect(), in the bins of the azimuthal-integration
|
|
// mapping and in raw photon counts. Only the adaptive finders build one (it is what sets their
|
|
// threshold); empty for everyone else, and for a frame with nothing valid to reduce.
|
|
[[nodiscard]] virtual const std::vector<float> &GetRingBackground() const;
|
|
|
|
// Pixels to ignore, one bool per pixel (true = ignore). Set when the resolution limits change,
|
|
// not per image: the GPU finders keep a bit-packed device copy of it, and re-uploading that for
|
|
// every image would cost more than the extraction it feeds.
|
|
void SetResolutionMask(const std::vector<bool> &mask);
|
|
// The same mask already packed 32 pixels to a word, which is how the finders keep it. Every
|
|
// worker's finder is given the identical mask, so the packing is done once by whoever owns the
|
|
// resolution map rather than by each of them (AzimuthalIntegrationMapping::ResolutionMaskBits).
|
|
virtual void SetResolutionMaskBits(const std::vector<uint32_t> &packed_mask);
|
|
|
|
// The panels of the image, from the experiment's module table. Set once, before the first image;
|
|
// the resolution mask is set again after it (SetResolutionMaskBits folds the panels in).
|
|
virtual void SetPanels(const DetectorModules &modules);
|
|
|
|
// Every connected component of the last Detect() with at most max-pix pixels. min-pix is NOT
|
|
// applied here on purpose - it is the only spot setting that changes between the passes of the
|
|
// per-image min-pix search, so ONE extraction serves all three of them.
|
|
virtual const std::vector<DiffractionSpot> &ExtractComponents(const ImagePreprocessorBuffer &image,
|
|
const SpotFindingSettings &settings);
|
|
// The components that also pass min-pix.
|
|
static std::vector<DiffractionSpot> Filter(const std::vector<DiffractionSpot> &in,
|
|
const SpotFindingSettings &settings);
|
|
|
|
std::vector<DiffractionSpot> ExtractSpots(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings);
|
|
std::vector<DiffractionSpot> Run(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings);
|
|
};
|