Build Packages / build:windows:nocuda (push) Waiting to run
Build Packages / build:windows:cuda (push) Waiting to run
Build Packages / Unit tests (push) Failing after 6m24s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 14m5s
Build Packages / build:viewer-tgz:cpu (push) Failing after 14m34s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 14m54s
Build Packages / build:viewer-tgz:cuda (push) Failing after 16m14s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 16m24s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 18m53s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 13m2s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 19m34s
Build Packages / build:rpm (rocky9) (push) Failing after 14m54s
Build Packages / Generate python client (push) Successful in 42s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 14m10s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (durin plugin) (push) Successful in 12m14s
Build Packages / XDS test (neggia plugin) (push) Successful in 11m52s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 12m15s
Build Packages / Build documentation (push) Successful in 2m10s
Build Packages / build:rpm (rocky8) (push) Failing after 18m29s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 17m55s
Build Packages / DIALS test (push) Successful in 17m4s
--azint-only and --scale are replaced by --mode mx|azint|scale|calibration, with mx the default. The old flags are removed rather than aliased. Calibration mode fits the detector geometry - PONI x/y, the two tilts and the distance - to a calibrant's powder rings and writes a pyFAI .poni alongside a report of how far each parameter moved from the header. Bragg data constrain the beam centre worst, because it is gauge-coupled to the crystal orientation; a powder ring has no orientation to couple to. --calibrant takes lab6, agbh, ceo2, si or ice. A calibrant is a list of ring positions rather than a unit cell, because hexagonal ice is P6_3/mmc: rings enumerated from its cell would include systematically absent ones. So the crystalline standards generate their rings from a cell and ice carries the measured list, and RingsFromAzimuthalProfile, GuessGeometry and OptimizeGeometry all take ring q. The calibrant table is shared with the viewer's powder panel, which previously carried its own copy. --calibration picks how the rings are measured: rings (default) sums the (q x azimuth) profile over every processed image and fits the arcs in it; spots pools the found spots and fits those. Both use the whole run, with -s/-e/-t selecting images. rings defaults --azim-phi-bins to 32, since a profile with one azimuthal bin has averaged the ring over every direction and cannot locate it. Two fixes this exposed: The extraction window is capped at half the gap to the neighbouring ring. The background under a peak is taken from the ends of its window, so a window wider than half that gap measures the next ring's flank as this ring's background - and hexagonal ice has three rings within 0.06 1/A. Ice calibration was 3.5 px out before this and 0.29 px after; LaB6 is unaffected. RingOptimizer holds rot1/rot2 fixed when only one ring is present. A tilt and a centre offset both move a ring as cos(phi) and are separated only by the tilt's amplitude growing as the ring radius squared, so on a single ring they are exactly degenerate. Measured. LaB6 at five distances: the fitted direct beam is within 0.36 px of an independent implementation out to 300 mm, and D = -0.046 + 1.000788 dtz with an rms of 0.011 mm. At 500 mm one ring is fully on the detector and a second only clips the corners, which is not enough to constrain a tilt - restricting the q range to the resolved ring recovers 0.06 px. Ice: 5.53 -> 0.29 px on one crystal and 4.71 -> 0.80 px on another, against XDS's refined direct beam. On an ice-free crystal the fit is worse than the header, which is the correct outcome. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
138 lines
6.8 KiB
C++
138 lines
6.8 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
#include "RingsFromProfile.h"
|
|
#include "../../common/JFJochMath.h"
|
|
|
|
namespace {
|
|
|
|
// Peak position of one ring in one azimuthal sector, in q, or NaN if there is no peak worth using.
|
|
//
|
|
// The window is narrow and centred on where the ring is expected, so the background under it is close
|
|
// to a straight line: take it from the two bins at each end and interpolate. The position itself is the
|
|
// intensity-weighted centroid of everything above half the peak height, which is insensitive to the
|
|
// exact half-maximum crossing and needs no line-shape assumption - a powder ring is not Gaussian, it is
|
|
// the instrumental profile convolved with whatever strain and size broadening the standard has.
|
|
float SectorPeakQ(const std::vector<float> &profile, int32_t q_bins, int phi_bin,
|
|
int lo_bin, int hi_bin, float low_q, float q_spacing, float min_peak_over_noise) {
|
|
const size_t row = static_cast<size_t>(phi_bin) * static_cast<size_t>(q_bins);
|
|
const auto value = [&](int i) { return profile[row + static_cast<size_t>(i)]; };
|
|
const auto q_of = [&](int i) { return low_q + (static_cast<float>(i) + 0.5f) * q_spacing; };
|
|
|
|
const float bkg_lo = 0.5f * (value(lo_bin) + value(lo_bin + 1));
|
|
const float bkg_hi = 0.5f * (value(hi_bin) + value(hi_bin - 1));
|
|
const auto bkg_at = [&](int i) {
|
|
const float t = static_cast<float>(i - lo_bin) / static_cast<float>(hi_bin - lo_bin);
|
|
return bkg_lo + t * (bkg_hi - bkg_lo);
|
|
};
|
|
|
|
int peak = -1;
|
|
float peak_height = 0.0f;
|
|
for (int i = lo_bin + 2; i <= hi_bin - 2; ++i) {
|
|
const float h = value(i) - bkg_at(i);
|
|
if (h > peak_height) { peak_height = h; peak = i; }
|
|
}
|
|
if (peak < 0)
|
|
return NAN;
|
|
|
|
// Scatter of the background shoulders, as the noise this peak has to stand clear of. A sector with
|
|
// no ring in it has a "peak" that is just the largest background fluctuation, and this is what
|
|
// rejects it - the alternative, an absolute intensity cut, would need a value per detector and beam.
|
|
float s = 0.0f;
|
|
int n = 0;
|
|
for (int i : {lo_bin, lo_bin + 1, hi_bin - 1, hi_bin}) {
|
|
const float r = value(i) - bkg_at(i);
|
|
s += r * r;
|
|
++n;
|
|
}
|
|
const float noise = std::sqrt(s / static_cast<float>(n));
|
|
if (!(peak_height > min_peak_over_noise * noise))
|
|
return NAN;
|
|
|
|
const float half = 0.5f * peak_height;
|
|
double sum_wq = 0.0, sum_w = 0.0;
|
|
for (int i = peak; i >= lo_bin && value(i) - bkg_at(i) >= half; --i) {
|
|
const double w = value(i) - bkg_at(i);
|
|
sum_wq += w * q_of(i);
|
|
sum_w += w;
|
|
}
|
|
for (int i = peak + 1; i <= hi_bin && value(i) - bkg_at(i) >= half; ++i) {
|
|
const double w = value(i) - bkg_at(i);
|
|
sum_wq += w * q_of(i);
|
|
sum_w += w;
|
|
}
|
|
if (!(sum_w > 0.0))
|
|
return NAN;
|
|
return static_cast<float>(sum_wq / sum_w);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
std::vector<RingOptimizerInput> RingsFromAzimuthalProfile(const std::vector<float> &profile,
|
|
const AzimuthalIntegrationMapping &mapping,
|
|
const DiffractionGeometry &geom,
|
|
const std::vector<float> &calibrant_ring_q,
|
|
float q_window_recipA,
|
|
float min_peak_over_noise) {
|
|
std::vector<RingOptimizerInput> out;
|
|
|
|
const int32_t q_bins = mapping.GetQBinCount();
|
|
const int32_t azim_bins = mapping.GetAzimuthalBinCount();
|
|
// One azimuthal bin is a plain radial profile: the ring is averaged over every direction at once, so
|
|
// nothing remains to say where its centre is. This needs the run to have been integrated with
|
|
// azimuthal bins (jfjoch_broker azim_int_settings.azimuthal_bins, rugnux --azim-phi-bins).
|
|
if (azim_bins < 4 || q_bins < 8
|
|
|| profile.size() != static_cast<size_t>(q_bins) * static_cast<size_t>(azim_bins))
|
|
return out;
|
|
|
|
const auto &settings = mapping.Settings();
|
|
const float low_q = settings.GetLowQ_recipA();
|
|
const float q_spacing = settings.GetQSpacing_recipA();
|
|
const float high_q = low_q + static_cast<float>(q_bins) * q_spacing;
|
|
|
|
for (size_t i = 0; i < calibrant_ring_q.size(); ++i) {
|
|
const float q_ring = calibrant_ring_q[i];
|
|
// Never let the window reach into the neighbouring ring. SectorPeakQ takes the background under
|
|
// the peak from the two bins at each end of the window, so a window wider than half the gap to
|
|
// the next ring measures that ring's flank as this one's background. Hexagonal ice has three
|
|
// rings within 0.06 1/A of one another, which the fixed window merges into a single peak.
|
|
float window = q_window_recipA;
|
|
if (i > 0)
|
|
window = std::min(window, 0.5f * (q_ring - calibrant_ring_q[i - 1]));
|
|
if (i + 1 < calibrant_ring_q.size())
|
|
window = std::min(window, 0.5f * (calibrant_ring_q[i + 1] - q_ring));
|
|
|
|
if (!(q_ring - window > low_q) || !(q_ring + window < high_q))
|
|
continue;
|
|
const int window_bins = static_cast<int>(std::lround(window / q_spacing));
|
|
const int centre_bin = static_cast<int>((q_ring - low_q) / q_spacing);
|
|
const int lo_bin = std::max(0, centre_bin - window_bins);
|
|
const int hi_bin = std::min(q_bins - 1, centre_bin + window_bins);
|
|
// Two background bins at each end and a peak between them is the least this can work with; a
|
|
// ring whose window is narrower than that is not resolved at this q spacing.
|
|
if (hi_bin - lo_bin < 6)
|
|
continue;
|
|
|
|
for (int phi_bin = 0; phi_bin < azim_bins; ++phi_bin) {
|
|
const float q_obs = SectorPeakQ(profile, q_bins, phi_bin, lo_bin, hi_bin,
|
|
low_q, q_spacing, min_peak_over_noise);
|
|
if (!std::isfinite(q_obs))
|
|
continue;
|
|
|
|
// The sector's CENTRE, not its lower edge: GetBin() floors phi into the sector, so a bin
|
|
// stands for [j, j+1) and taking its edge would rotate every ring point by half a sector -
|
|
// which is exactly the cos(phi) signal the beam centre is read from.
|
|
const float phi_rad = static_cast<float>((static_cast<double>(phi_bin) + 0.5)
|
|
* 2.0 * PI / static_cast<double>(azim_bins));
|
|
const auto [x, y] = geom.ResPhiToPxl(static_cast<float>(2.0 * PI) / q_obs, phi_rad);
|
|
if (!std::isfinite(x) || !std::isfinite(y))
|
|
continue;
|
|
out.push_back({x, y, q_ring});
|
|
}
|
|
}
|
|
return out;
|
|
}
|