leonarski_fandClaude Opus 5
5830f78d57
Removes azim_int_settings.sigma_clip / rugnux --azim-sigma-clip and the clipping
machinery in AzIntEngine. This is a partial revert of a6be35ccd - the ice-ring-mask
removal that commit also carried stays. Sigma clipping remains where it started and
where it is needed: inside the adaptive spot finder, at a fixed 3 sigma on raw
counts, feeding the detection threshold and the ice score.
The option made the workflow harder to reason about than the quantity was worth. It
gave azimuthal integration two meanings behind one setting - the bin mean and the
background under the peaks - which the azimuthal-integration workflows do not need.
It also did not compose with the fused GPU engine, which supplies the profile from
its PLAIN pass: on the default rugnux, viewer and receiver path the setting was
silently doing nothing (measured, the profile came out identical to the unclipped
run to 1e-6 with identical per-bin pixel counts). Making it correct is not a matter
of gating that one shortcut - it means separating the workflows (azimuthal
integration, MX rotation, MX stills, geometry calibration) and deciding per workflow
what the profile is for, which is a larger change than the option earns.
The default path is unaffected: over 20 images of a rotation dataset the radial
profile, the per-bin pixel counts and the spot counts are unchanged.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
66 lines
2.9 KiB
C++
66 lines
2.9 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "JFJochMath.h"
|
|
#include <optional>
|
|
#include <cstdint>
|
|
|
|
class AzimuthalIntegrationSettings {
|
|
constexpr static float minQ_recipA = 1e-5;
|
|
constexpr static float maxQ_recipA = 10.0;
|
|
|
|
bool solid_angle_correction = true;
|
|
bool polarization_correction = true;
|
|
// Requested upper q limit. Unset means "as far as the detector reaches": DiffractionExperiment
|
|
// resolves it from the geometry (ResolveHighQ) whenever it hands these settings out, so
|
|
// high_q_recipA below - what the bins are built from - is always a concrete number. Not clipping
|
|
// detection at an arbitrary default matters for the adaptive spot finder, which bins pixels through
|
|
// this same q range and cannot see a pixel that falls outside it.
|
|
std::optional<float> requested_high_q_recipA;
|
|
float high_q_recipA = 5.0;
|
|
float low_q_recipA = 0.1;
|
|
float bkg_estimate_high_q_recipA = 2.0f * PI / 3.0;
|
|
float bkg_estimate_low_q_recipA = 2.0f * PI / 5.0;
|
|
float q_spacing = 0.01;
|
|
int32_t azim_bins = 1;
|
|
// Compute azimuthal integration on the CPU instead of the FPGA during the FPGA
|
|
// acquisition workflow. Lifts the FPGA bin-count limit and adds standard-deviation output.
|
|
bool force_cpu_in_fpga_workflow = false;
|
|
|
|
int32_t q_bins= 0;
|
|
int32_t total_bins = 0;
|
|
|
|
void UpdateBinCount();
|
|
public:
|
|
AzimuthalIntegrationSettings();
|
|
AzimuthalIntegrationSettings& SolidAngleCorrection(bool input);
|
|
AzimuthalIntegrationSettings& PolarizationCorrection(bool input);
|
|
AzimuthalIntegrationSettings& QRange_recipA(float low, std::optional<float> high);
|
|
// Substitute the detector's own maximum q for an unset high q. No-op if one was requested.
|
|
void ResolveHighQ(float detector_max_q_recipA);
|
|
AzimuthalIntegrationSettings& QSpacing_recipA(float input);
|
|
AzimuthalIntegrationSettings& BkgEstimateQRange_recipA(float low, float high);
|
|
AzimuthalIntegrationSettings& AzimuthalBinCount(int32_t input);
|
|
AzimuthalIntegrationSettings& ForceCPUinFPGAWorkflow(bool input);
|
|
|
|
[[nodiscard]] bool IsSolidAngleCorrection() const;
|
|
[[nodiscard]] bool IsPolarizationCorrection() const;
|
|
[[nodiscard]] float GetHighQ_recipA() const;
|
|
[[nodiscard]] std::optional<float> GetRequestedHighQ_recipA() const;
|
|
[[nodiscard]] float GetLowQ_recipA() const;
|
|
[[nodiscard]] float GetQSpacing_recipA() const;
|
|
|
|
[[nodiscard]] int32_t GetBinCount() const;
|
|
[[nodiscard]] int32_t GetQBinCount() const;
|
|
[[nodiscard]] int32_t GetAzimuthalBinCount() const;
|
|
[[nodiscard]] bool IsForceCPUinFPGAWorkflow() const;
|
|
|
|
[[nodiscard]] float GetBkgEstimateLowQ_recipA() const;
|
|
[[nodiscard]] float GetBkgEstimateHighQ_recipA() const;
|
|
[[nodiscard]] uint16_t QToBin(float q) const;
|
|
[[nodiscard]] uint16_t GetBin(float q, float phi_deg) const;
|
|
};
|
|
|