leonarski_fandClaude Opus 4.8
7c5bedfd74
Add --soft-weight (implies --adaptive-spots): give every detected spot a
continuous quality weight in (0,1] and keep the highest-weight spots rather than
the brightest, so a deliberately loose detector self-cleans -- bright ice / salt
/ jet blobs and single-pixel noise no longer evict faint clean Bragg spots from
the max-spots cut.
The weight is a product of dimensionless gates (AdaptiveSpotFinderCPU::ApplyWeights,
computed against the per-ring background the adaptive finder already builds): a
logistic ramp in the spot's SNR and a soft size band (rises from one pixel,
plateaus, falls for oversized ice/salt/streak blobs). It carries on
DiffractionSpot -> SpotToSave and is consumed by FilterSpotsByCount, which ranks
by {non-ice, weight, intensity} when requested and by intensity otherwise, so the
classic and FPGA paths are unchanged.
Honest result: on the serial-stills battery this is index-rate-NEUTRAL. The
weighted ranking only changes the outcome when the spot count exceeds the
max-spots cap and the weight disagrees with intensity in a way that affects
indexing; the adaptive detectors already produce clean spot lists and the weak
sets sit under the cap, so re-ranking is a wash there (and a wash, not a
regression, on the one set that floods). Its intended benefit -- robustness to
ice/jet-contaminated frames and to a loosened detector -- is not exercised by
this battery; kept opt-in as the substrate for that.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
34 lines
1.3 KiB
C++
34 lines
1.3 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "Coord.h"
|
|
#include "DiffractionExperiment.h"
|
|
#include "DiffractionGeometry.h"
|
|
#include "SpotToSave.h"
|
|
|
|
// Definition of Bragg spot
|
|
class DiffractionSpot {
|
|
float x = 0;
|
|
float y = 0;
|
|
int64_t pixel_count = 0;
|
|
int64_t photons = 0; // total photon count
|
|
int64_t max_photons = INT64_MIN; // maximum number of counts per pixel in the spot
|
|
float weight = 1.0f; // soft quality weight in (0,1]; 1 = "no opinion" (default)
|
|
public:
|
|
void SetWeight(float w) { weight = w; }
|
|
float Weight() const { return weight; }
|
|
DiffractionSpot() = default;
|
|
DiffractionSpot(uint32_t col, uint32_t line, int64_t photons);
|
|
DiffractionSpot(const SpotToSave &save);
|
|
DiffractionSpot& operator+=(const DiffractionSpot& spot);
|
|
int64_t PixelCount() const;
|
|
int64_t Count() const;
|
|
int64_t MaxCount() const;
|
|
Coord RawCoord() const;
|
|
void ConvertToImageCoordinates(const DiffractionExperiment& experiment, uint16_t module_number);
|
|
std::optional<SpotToSave> Export(const DiffractionGeometry &geometry, int64_t image_num = 0) const;
|
|
void AddPixel(uint32_t col, uint32_t line, int64_t photons);
|
|
};
|