Files
Jungfraujoch/viewer/image_viewer/JFJochFollowerImage.cpp
T
leonarski_fandClaude Opus 5 16bf3408f0 Address code-review findings; make detection limits detector-driven
One changeset, developed together in response to a review of this branch, so the
files carry several of the changes at once. Full test suite passes (733 cases).

Spot finding
- Split ImageSpotFinder into Detect() (flag strong pixels - the expensive
  per-pixel pass) and ExtractSpots() (CCL + min/max-pix + resolution mask), with
  Run() = both. The per-image min-pix escalation now detects ONCE and repeats
  only the cheap extraction, instead of re-running the whole finder four times
  per frame as it did on the default path. It also keeps the winning attempt's
  spot list rather than re-extracting it, so the frame that is integrated is
  exactly the frame that was scored - which a GPU re-extract could not guarantee
  (float atomic ordering).
- spot_finding_time_s no longer swallows indexing time, and indexing_time_s now
  sums every escalation call instead of reporting only the last.

Detection limits follow the detector
- The azimuthal-integration upper q and the spot-finding high-resolution limit
  are now std::optional, in the C++ structs AND in the OpenAPI schema, and
  resolve to the detector's own maximum (DiffractionExperiment::GetDetectorMaxQ_
  recipA). Adaptive detection reads a pixel's ring from the azimuthal bins, so a
  pixel outside that q range could never be strong - the integration range
  silently bounded what detection could see, regardless of the requested
  resolution limit. Regenerated the C++ and TypeScript clients; the viewer and
  the web frontend each gained a "to detector edge" switch.

Detection defaults are now per workflow (measured, not assumed)
- Stills: adaptive detection, min-pix chosen per image, no resolution clipping.
- Rotation: fixed-threshold finder, min-pix 2, 1.5 A limit.
  On a 33-crystal rotation battery, adaptive detection helped four hard crystals
  but deterministically broke three (a lost space group, a halved indexing rate,
  a collapsed merge), and the detector-edge limit cost indexing on a strong
  rotation set (100.0 -> 96.8%). Each is still overridable by its flag, and
  --no-adaptive-spots is new.

Indexer seed escalation
- Stop escalating once a seed's lattice explains >= 90% of the seed spots.
  Previously any frame with >= 80 spots always paid three indexer calls, online
  broker included.

Merge-consistency filter
- --min-image-cc gated on a per-image CC computed BEFORE the stills partiality
  post-refinement and never refreshed; the refiner now recomputes it, so the
  reported CC describes the data that are actually merged.
- Replaced the per-call cc_mask argument with one MergeOnTheFly flag, so the
  merge, the error model and MergeStats can no longer disagree about which
  images are in (the --scale path merged unfiltered while its statistics were
  filtered).

Per-image B-factor refinement (-B) removed
- Measured on four serial-stills datasets: it is a no-op where the per-image fit
  is well conditioned and actively harmful where it is not (CC1/2 -8.1, R_meas
  +23.2 on the weakest large-cell set, whose fits hit their [-50, 200] bounds on
  14-25% of images). It had also been silently DISCARDED since the partiality
  post-refinement landed - reported but not applied. Rather than fix and keep a
  knob with no demonstrated benefit, the flag and the whole image_scale_b_factor
  chain are gone: setting, scaling fit, message field, CBOR, HDF5 write and
  read-back, per-image plot, OpenAPI enum, viewer column and checkbox, docs.
  ScaleOnTheFly no longer needs Ceres at all - the fit is a linear IRLS.
  (The Wilson per-image b_factor is a different quantity and stays.)

Stills partiality width now fits both of its components
- sigma^2 = gamma0^2 + (gamma_e*d*)^2 instead of a purely angular gamma_e*d*
  with gamma0 pinned to 0. Fitted per crystal by least squares of dist_ewald^2
  on d*^2. The angular-only width is fitted over a d*^2-dense population, so it
  was pinned by the high-resolution edge and collapsed at low d*: median
  partiality 0.008 beyond 13 A for reflections that were plainly recorded, 55%
  of them under the merge's partiality floor, and the survivors divided by those
  values - which inflated the merged low-resolution intensity scale 3.6x
  (~ +9 A^2 of apparent B). Measured on 5000 stills: the ramp flattens to 0.89x,
  no observation is dropped any more (701750 -> 716811), shell-mean CC1/2 and
  R-free improve slightly. Note CC1/2, R_meas, completeness and a B-refining
  R-free are all blind to that ramp, which is why it survived earlier validation;
  the cost is high-resolution R_meas (98.5 -> 101.9 shell-averaged).

Removed dead code from add-then-remove churn
- Prediction-time "still partiality" (unreachable: no setter), the phantom
  IndexingSettings::min_indexed_spot_fraction knob (getter, no setter - now the
  constant it always was), StillsPartialityRefine's caller-less Settings
  constructor and its reference to a long-gone env var, ProcessImage's unread
  bool return, an unused include, and a dead viewer overlay hook.

Also
- Viewer: the magnifier compared a QImage with itself, so its scene rect was set
  once ever and it could not pan into a larger dataset; the hover tail timer
  could fire after leaveEvent and resurrect the resolution readout outside the
  image.
- update_version.sh regenerated the frontend lock file BEFORE bumping the
  version (every release shipped an off-by-one lock), and did git rm/git add on
  a path that has not existed since the client moved to src/client - with no
  set -e, both failed silently.
- fpga/pcie_driver/postinstall.sh tested "[ ! occurrences > 0 ]", which is a
  redirect, not a test, so dkms add never ran.
- Unit tests for the adaptive-threshold host functions, which had none.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-07-27 09:07:00 +02:00

125 lines
4.3 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "JFJochFollowerImage.h"
#include "JFJochImage.h"
#include "../../common/ColorScale.h"
#include <algorithm>
#include <cmath>
#include <QGraphicsScene>
#include <QPainter>
#include <QWheelEvent>
// Same wording as the main view's per-pixel labels
static QString PixelValueText(int32_t value) {
if (value == GAP_PXL_VALUE)
return QStringLiteral("Gap");
if (value == ERROR_PXL_VALUE)
return QStringLiteral("Err");
if (value == SATURATED_PXL_VALUE)
return QStringLiteral("Sat");
return QString::number(value);
}
JFJochFollowerImage::JFJochFollowerImage(QWidget *parent) : QGraphicsView(parent) {
setScene(new QGraphicsScene(this));
setTransformationAnchor(QGraphicsView::AnchorViewCenter);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setTransform(QTransform::fromScale(zoom_, zoom_));
}
void JFJochFollowerImage::SetFrame(std::shared_ptr<const QImage> frame) {
const bool same_pointer = (frame_ == frame);
frame_ = std::move(frame);
if (!frame_ || frame_->isNull()) {
scene()->clear();
item_ = nullptr;
return;
}
// The producer reuses one buffer, so normally only the pixels changed and the item stays.
if (!item_ || !same_pointer) {
scene()->clear();
item_ = new JFJochImageItem(frame_);
scene()->addItem(item_);
}
// The producer reassigns its buffer in place when the frame size changes, so the pointer says
// nothing about the dimensions - compare against the size we last saw.
if (frame_->size() != frame_size_) {
frame_size_ = frame_->size();
item_->refresh();
scene()->setSceneRect(0, 0, frame_size_.width(), frame_size_.height());
}
viewport()->update();
}
void JFJochFollowerImage::SetPixelValues(std::shared_ptr<const JFJochReaderImage> image) {
values_ = std::move(image);
}
void JFJochFollowerImage::CenterAt(QPointF scenePos) {
if (!frame_ || frame_->isNull())
return;
centerOn(scenePos);
}
void JFJochFollowerImage::wheelEvent(QWheelEvent *event) {
constexpr double step = 1.15;
zoom_ *= (event->angleDelta().y() > 0) ? step : 1.0 / step;
zoom_ = std::clamp(zoom_, 1.0, 200.0);
const QPointF center = mapToScene(viewport()->rect().center());
setTransform(QTransform::fromScale(zoom_, zoom_));
centerOn(center);
}
void JFJochFollowerImage::drawForeground(QPainter *painter, const QRectF &rect) {
QGraphicsView::drawForeground(painter, rect);
if (zoom_ < kLabelZoom || !values_ || !frame_ || frame_->isNull())
return;
const int W = frame_->width();
const int H = frame_->height();
const auto &pixels = values_->Image();
if (static_cast<int64_t>(pixels.size()) < static_cast<int64_t>(W) * H)
return; // values belong to a different frame
const QRectF visible = mapToScene(viewport()->rect()).boundingRect();
const int x0 = std::max(0, static_cast<int>(std::floor(visible.left())));
const int x1 = std::min(W, static_cast<int>(std::ceil(visible.right())));
const int y0 = std::max(0, static_cast<int>(std::floor(visible.top())));
const int y1 = std::min(H, static_cast<int>(std::ceil(visible.bottom())));
if (x1 <= x0 || y1 <= y0 || (x1 - x0) * (y1 - y0) > kMaxLabels)
return;
// Lay the text out in viewport pixels so it stays a constant, readable size
painter->save();
painter->resetTransform();
QFont font("DejaVu Sans Mono");
font.setStyleHint(QFont::TypeWriter);
font.setPixelSize(std::clamp(static_cast<int>(zoom_ * 0.3), 7, 16));
painter->setFont(font);
for (int y = y0; y < y1; y++) {
for (int x = x0; x < x1; x++) {
const QRect cell = mapFromScene(QRectF(x, y, 1, 1)).boundingRect();
const QRgb c = frame_->pixel(x, y);
const rgb col{.r = static_cast<uint8_t>(qRed(c)),
.g = static_cast<uint8_t>(qGreen(c)),
.b = static_cast<uint8_t>(qBlue(c))};
painter->setPen(luminance(col) > 128.0 ? Qt::black : Qt::white);
painter->drawText(cell, Qt::AlignCenter, PixelValueText(pixels[y * W + x]));
}
}
painter->restore();
}