Files
Jungfraujoch/image_analysis/spot_finding/ImageSpotFinderCPU.h
T
leonarski_f 84228bf8be
Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
v1.0.0-rc.173 (#83)
* jfjoch_broker: Optional per-dataset authentication - statistics, images and plots can require a bearer token, which jfjoch_viewer supports.
* jfjoch_viewer: Dark mode and a theme-matched colour scheme, a magnifier panel, and simpler contrast and background controls.
* Rugnux: Multiple performance improvements on GPU and CPU (CPU-only processing up to 40% faster, faster image decoding on ARM), with unchanged results.
* Rugnux: `--model` rigid-body refinement runs on the GPU, and the model-validation check is faster and more reliable.
* Rugnux: Improved scaling and merging - error model, outlier rejection, absorption correction and French-Wilson amplitudes now agree more closely with XDS and ctruncate.
* Rugnux: Improved integration - radial background on powder and ice rings, crowded rotation data keep their reflections, and CPU-only builds integrate large unit cells as GPU builds do.
* Rugnux: More robust detector geometry - measured beam centre, X-ray bandwidth and goniometer rate, and geometry refinement accepted only on significant evidence.
* Rugnux: Merged files are written in the standard setting, or in the setting of a reference MTZ, structure-factor mmCIF or model, with its free-R flags.
* Rugnux: Richer report - ice and powder rings, further lattices, superstructure candidates and mosaicity, with warnings worded as prompts to check.
* Rugnux: Clear error messages when a data set needs more GPU or host memory than is available.

Reviewed-on: #83
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-09-29 15:57:32 +02:00

65 lines
3.0 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <cstddef>
#include <functional>
#include <vector>
#include "ImageSpotFinder.h"
#include "SpotFindingSettings.h"
#include "../../common/AzimuthalIntegrationMapping.h"
#include "../../common/DiffractionSpot.h"
// This is "slow" spot finder for image-based analysis
// To complement "fast" PSI detector module based spot finder
// This one is expected to be used in cases, where images are already assembled
// and it aims for 100 ms execution
class ImageSpotFinderCPU : public ImageSpotFinder {
// Output of the first pass, and the exclusion mask for the second.
std::vector<uint32_t> first_pass_buffer;
// One detection pass. prev_strong is the previous pass's bitmap, or nullptr for the first pass;
// a pixel set in it is treated as INT32_MAX, i.e. kept out of every local background it would
// fall into, and reported strong.
//
// With candidates set (SNR test only), the window sums of every candidate pixel are also recorded
// in candidate_windows, in pixel order, and fill_row (see DetectAt) is called.
void DetectPass(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings,
const uint32_t *prev_strong, std::vector<uint32_t> &out,
const uint32_t *candidates = nullptr,
const std::function<void(int32_t)> &fill_row = {});
// Local-box sums (centre pixel included) of one candidate pixel, as the first pass saw them.
struct CandidateWindow {
int32_t pxl;
int64_t sum, sum2, valid;
};
std::vector<CandidateWindow> candidate_windows;
// Where the first pass's own result is read by DetectAt - within NBX of a candidate - per row and
// 32-column block. Elsewhere that pass keeps its sums but skips the test.
std::vector<uint8_t> first_pass_needed;
protected:
// Detect, but with the result wanted only at the candidate pixels (packed like output_buffer):
// output_buffer ends up holding (Detect's result & candidates). The second pass is not run over
// the image: a candidate's second-pass window is its first-pass window with the pixels the first
// pass found strong taken out, and those are few, so they are subtracted from the sums the first
// pass recorded. Integer sums and the same test, so the bits are exactly Detect's.
//
// fill_row(row), when given, sets the candidates of that row: it is called once for every row, in
// order, before any candidate of the row is read, when the pass is about to read the row anyway.
void DetectAt(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings,
const std::vector<uint32_t> &candidates,
const std::function<void(int32_t)> &fill_row = {});
public:
ImageSpotFinderCPU(int32_t width, int32_t height);
void Detect(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings) override;
};