Build Packages / Unit tests (push) Successful in 49m15s
Build Packages / build:windows:nocuda (push) Successful in 18m5s
Build Packages / build:windows:cuda (push) Successful in 20m26s
Build Packages / build:viewer-tgz:cpu (push) Successful in 7m17s
Build Packages / build:viewer-tgz:cuda (push) Successful in 8m15s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 6m57s
Build Packages / build:rugnux:windows (push) Successful in 10m56s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 5m0s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m21s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m22s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m49s
Build Packages / build:rpm (rocky8) (push) Successful in 11m57s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m5s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m45s
Build Packages / Generate python client (push) Successful in 10s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (JFJoch plugin) (push) Failing after 3h12m36s
Build Packages / XDS test (durin plugin) (push) Failing after 3h12m38s
Build Packages / DIALS test (push) Failing after 3h12m40s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 3h12m42s
Build Packages / build:rpm (rocky9) (push) Failing after 3h12m44s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 3h12m46s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 3h12m48s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 3h12m50s
Six changes to the desktop viewer, all in what it shows and what it is called: - The left-hand reprocessing panel is titled "Processing" (it sits next to "File manager"); the jobs panel that held that name is "Jobs". - The file manager lists *.cbf beside the HDF5 datasets. A CBF is one frame per file and opening any of them opens its sweep, which is what the File > Open dialog already did. - Image statistics: collection time, detector distance, beam centre and wavelength were in the dataset row's tooltip, where a number nobody hovers over is a number nobody reads. They are rows of their own, in the order a person asks for them - what the dataset is, how it was collected, then what this image contains. Source/instrument and sample are bold like every other value. The B-factor row is gone. - A "Spots + background" plot: spot count on the left axis, background per pixel on the right, since a common scale would flatten one of them. The axis labels take the colour of their line - a legend costs exactly the vertical room those labels need at this dock height. It is what a live (HTTP) connection selects by default, until the user picks something else. - Expanding the powder-calibration section no longer widens the settings panel past the space it has. Two buttons side by side cannot be narrower than both their labels, and a combo is never narrower than its longest entry - a 40-character cell in the calibrant list set the minimum width of the whole dock. One button per row, the cell in a tooltip, and both combos allowed to elide. - The grid/per-image toggles both rebuild the metric selector now. The grid button did not, so leaving per-image mode through it left the per-image plot types listed - X-ray fluorescence offered as a metric of a grid scan - and their values were then read as per-dataset metrics. Each mode also remembers its own selection instead of carrying an index across two unrelated lists. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011oVDk7aukYqfPZBLHn5nGg
147 lines
7.4 KiB
C++
147 lines
7.4 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "PowderCalibrationWidget.h"
|
|
#include <QPushButton>
|
|
#include <QGridLayout>
|
|
#include <QLabel>
|
|
#include "../../common/JFJochMath.h"
|
|
|
|
#include "../image_analysis/geom_refinement/AssignSpotsToRings.h"
|
|
#include "../image_analysis/geom_refinement/Calibrants.h"
|
|
|
|
PowderCalibrationWidget::PowderCalibrationWidget(QWidget *parent) : QWidget(parent) {
|
|
auto layout = new QVBoxLayout(this);
|
|
|
|
calibrantCombo = new QComboBox(this);
|
|
// Without this a combo asks to be as wide as its longest entry - and it is never allowed to
|
|
// shrink below that, which is what used to pin the whole settings dock wide as soon as the
|
|
// powder section was expanded. The current text elides instead; the tooltip carries the rest.
|
|
calibrantCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
|
|
calibrantCombo->setMinimumContentsLength(12);
|
|
updateCalibrantList();
|
|
|
|
// How a whole-dataset run measures the rings. The two buttons below always work from the spots of
|
|
// the image on screen, so this only takes effect for "Analyze dataset".
|
|
methodCombo = new QComboBox(this);
|
|
methodCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
|
|
methodCombo->setMinimumContentsLength(12);
|
|
methodCombo->addItem("Rings (summed profile)", static_cast<int>(CalibrationMethod::Rings));
|
|
methodCombo->addItem("Spots (pooled spot lists)", static_cast<int>(CalibrationMethod::Spots));
|
|
methodCombo->setToolTip("How \"Analyze dataset\" measures the powder rings: rings sums the "
|
|
"(q x azimuth) azimuthal profile over every image and fits the ring arcs in it; "
|
|
"spots pools the found spots and fits those.");
|
|
|
|
// The detector tilt is a free parameter of every one of these fits. Unticking it holds rot1/rot2
|
|
// where the geometry already has them - what a calibration handed to a program with no way to
|
|
// express a tilted detector (XDS) needs. It applies to the two buttons and to "Analyze dataset".
|
|
refineTiltCheck = new QCheckBox("Refine detector tilt", this);
|
|
refineTiltCheck->setChecked(true);
|
|
refineTiltCheck->setToolTip("Fit the detector tilt (PONI rot1/rot2) together with the beam centre "
|
|
"and the distance. Untick to hold the tilt where it is and fit only the "
|
|
"beam centre and the distance - for a calibration that will be given to "
|
|
"a program which cannot express a tilted detector, such as XDS.");
|
|
|
|
auto findBeamCenterButton = new QPushButton("Guess detector calibration", this);
|
|
connect(findBeamCenterButton, &QPushButton::clicked,this, &PowderCalibrationWidget::findBeamCenterClicked);
|
|
|
|
auto optimizeBeamCenterButton = new QPushButton("Refine detector calibration", this);
|
|
connect(optimizeBeamCenterButton, &QPushButton::clicked,this, &PowderCalibrationWidget::optimizeBeamCenterClicked);
|
|
|
|
auto calibrantRingsButton = new QPushButton("Display calibrant rings", this);
|
|
connect(calibrantRingsButton, &QPushButton::clicked, this, [this]() {
|
|
QVector<float> d_rings;
|
|
for (float q : GetCalibrantRings())
|
|
d_rings.append(2 * PI / q);
|
|
emit ringsFromCalibration(d_rings);
|
|
});
|
|
|
|
// One button per row rather than two side by side: the panel lives in a narrow left-hand dock,
|
|
// and two buttons abreast cannot be narrower than the sum of their two labels.
|
|
auto refine_row = new QGridLayout();
|
|
refine_row->setSpacing(12);
|
|
refine_row->addWidget(new QLabel("Calibrant:"),0,0);
|
|
refine_row->addWidget(calibrantCombo,0,1);
|
|
|
|
refine_row->addWidget(new QLabel("Dataset method:"),1,0);
|
|
refine_row->addWidget(methodCombo,1,1);
|
|
|
|
refine_row->addWidget(findBeamCenterButton,2, 0, 1, 2);
|
|
refine_row->addWidget(optimizeBeamCenterButton,3, 0, 1, 2);
|
|
refine_row->addWidget(calibrantRingsButton,4, 0, 1, 2);
|
|
refine_row->addWidget(refineTiltCheck,5, 0, 1, 2);
|
|
|
|
auto hint = new QLabel("The two buttons fit the image on screen; \"Analyze dataset\" fits the whole "
|
|
"run and writes a .poni.", this);
|
|
hint->setWordWrap(true);
|
|
hint->setStyleSheet("color: gray;");
|
|
|
|
layout->addLayout(refine_row);
|
|
layout->addWidget(hint);
|
|
setLayout(layout);
|
|
}
|
|
|
|
std::vector<float> PowderCalibrationWidget::GetCalibrantRings() const {
|
|
// The combo lists the shared calibrant table (in its order), then the current sample's own cell,
|
|
// which is not a powder standard but is what a single-crystal image's spots actually sit on.
|
|
const int idx = calibrantCombo->currentIndex();
|
|
const auto &table = Calibrants();
|
|
if (idx >= 0 && idx < static_cast<int>(table.size()))
|
|
return CalibrantRings(table[idx].name);
|
|
if (sample_cell) {
|
|
// With the group where the dataset has one: the absences then come from the symmetry rather
|
|
// than from a bare P-lattice assumption, and a centred cell's list no longer opens with a
|
|
// reflection that is not there - which would scale the whole calibration by the ratio between
|
|
// that ring and the first real one. Same call the CLI makes.
|
|
if (sample_sg)
|
|
return CalculateXtalRings(sample_cell.value(), *sample_sg);
|
|
return CalculateXtalRings(sample_cell.value());
|
|
}
|
|
return CalibrantRings(table.front().name);
|
|
}
|
|
|
|
CalibrationSelection PowderCalibrationWidget::Selection() const {
|
|
return {calibrantCombo->currentText(), GetCalibrantRings(),
|
|
static_cast<CalibrationMethod>(methodCombo->currentData().toInt()),
|
|
refineTiltCheck->isChecked()};
|
|
}
|
|
|
|
void PowderCalibrationWidget::updateCalibrantList() {
|
|
calibrantCombo->clear();
|
|
|
|
for (const auto &c : Calibrants())
|
|
calibrantCombo->addItem(QString::fromStdString(c.name));
|
|
if (sample_cell) {
|
|
// The cell goes in the tooltip, not in the entry: a 40-character item would set the combo's
|
|
// minimum width and, through it, the minimum width of the dock this widget sits in.
|
|
calibrantCombo->addItem("Current sample cell");
|
|
calibrantCombo->setItemData(calibrantCombo->count() - 1,
|
|
QString("%1 %2 %3 %4 %5 %6")
|
|
.arg(QString::number(sample_cell->a, 'f', 1))
|
|
.arg(QString::number(sample_cell->b, 'f', 1))
|
|
.arg(QString::number(sample_cell->c, 'f', 1))
|
|
.arg(QString::number(sample_cell->alpha, 'f', 1))
|
|
.arg(QString::number(sample_cell->beta, 'f', 1))
|
|
.arg(QString::number(sample_cell->gamma, 'f', 1)), Qt::ToolTipRole);
|
|
}
|
|
calibrantCombo->setCurrentIndex(0);
|
|
}
|
|
|
|
void PowderCalibrationWidget::loadImage(std::shared_ptr<const JFJochReaderImage> image) {
|
|
if (image) {
|
|
sample_cell = image->Dataset().experiment.GetUnitCell();
|
|
sample_sg = image->Dataset().experiment.GetGemmiSpaceGroup();
|
|
}
|
|
updateCalibrantList();
|
|
}
|
|
|
|
void PowderCalibrationWidget::findBeamCenterClicked() {
|
|
const std::vector<float> rings = GetCalibrantRings();
|
|
emit findBeamCenter(QVector<float>(rings.begin(), rings.end()), true, refineTiltCheck->isChecked());
|
|
}
|
|
|
|
void PowderCalibrationWidget::optimizeBeamCenterClicked() {
|
|
const std::vector<float> rings = GetCalibrantRings();
|
|
emit findBeamCenter(QVector<float>(rings.begin(), rings.end()), false, refineTiltCheck->isChecked());
|
|
}
|