Build Packages / Create release (push) Successful in 8s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m11s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 10m32s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 18m26s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m11s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 23m32s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 25m36s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 27m28s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 28m10s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 28m10s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 29m24s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 21m45s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 24m2s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 29m25s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 30m27s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 27m12s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 32m20s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 33m36s
Build Packages / Unit tests (push) Successful in 2h7m18s
Build Packages / Validation Battery (push) Successful in 33m19s
* Rugnux: Stills processing needs only the unit cell and space group beyond what the file records - detector distance, beam centre, tilt, panel placement, saturation level, gain and polarisation plane are found from the images - and is up to twice as fast. * Rugnux: Stills can be indexed without a GPU, with a CPU implementation of the fast-feedback indexer (macOS, computers without a GPU). * Rugnux: Rotation and stills data are integrated in the detector's own units with one gain model, improving data from CCD detectors. * Web frontend: The Rugnux live page shows the placed model with its electron density and anomalous difference map in a Mol* viewer. Reviewed-on: #90 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
196 lines
7.1 KiB
C++
196 lines
7.1 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "DetectorModules.h"
|
|
#include "DetectorGeometry.h"
|
|
#include "Definitions.h"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <tuple>
|
|
|
|
DetectorModule DetectorModule::AsImaged(int64_t x0, int64_t y0, int64_t width, int64_t height) {
|
|
DetectorModule m;
|
|
m.x0 = x0;
|
|
m.y0 = y0;
|
|
m.width = width;
|
|
m.height = height;
|
|
m.ox = static_cast<double>(x0);
|
|
m.oy = static_cast<double>(y0);
|
|
return m;
|
|
}
|
|
|
|
bool DetectorModule::ContainsImagePixel(double x, double y) const {
|
|
// A pixel's centre is at its index, so the module covers [x0 - 0.5, x0 + width - 0.5).
|
|
return x >= static_cast<double>(x0) - 0.5 && x < static_cast<double>(x0 + width) - 0.5
|
|
&& y >= static_cast<double>(y0) - 0.5 && y < static_cast<double>(y0 + height) - 0.5;
|
|
}
|
|
|
|
std::pair<double, double> DetectorModule::ImageToPlane(double x, double y) const {
|
|
const double u = x - static_cast<double>(x0), v = y - static_cast<double>(y0);
|
|
return {ox + u * fx + v * sx, oy + u * fy + v * sy};
|
|
}
|
|
|
|
std::pair<double, double> DetectorModule::PlaneToImage(double px, double py) const {
|
|
// Inverse of the 2x2 [f s]
|
|
const double det = fx * sy - sx * fy;
|
|
const double dx = px - ox, dy = py - oy;
|
|
const double u = (sy * dx - sx * dy) / det;
|
|
const double v = (-fy * dx + fx * dy) / det;
|
|
return {static_cast<double>(x0) + u, static_cast<double>(y0) + v};
|
|
}
|
|
|
|
std::pair<double, double> DetectorModule::PlaneCentre() const {
|
|
return ImageToPlane(static_cast<double>(x0) + 0.5 * static_cast<double>(width - 1),
|
|
static_cast<double>(y0) + 0.5 * static_cast<double>(height - 1));
|
|
}
|
|
|
|
void DetectorModule::Apply(const ModuleShift &shift) {
|
|
const double c = std::cos(shift.rot_rad), s = std::sin(shift.rot_rad);
|
|
const double ux = ox - shift.x0, uy = oy - shift.y0;
|
|
ox = shift.x0 + c * ux - s * uy + shift.dx;
|
|
oy = shift.y0 + s * ux + c * uy + shift.dy;
|
|
const double nfx = c * fx - s * fy, nfy = s * fx + c * fy;
|
|
const double nsx = c * sx - s * sy, nsy = s * sx + c * sy;
|
|
fx = nfx; fy = nfy;
|
|
sx = nsx; sy = nsy;
|
|
}
|
|
|
|
DetectorModules::DetectorModules(std::vector<DetectorModule> in) : modules(std::move(in)) {}
|
|
|
|
bool DetectorModules::empty() const {
|
|
return modules.empty();
|
|
}
|
|
|
|
size_t DetectorModules::size() const {
|
|
return modules.size();
|
|
}
|
|
|
|
const DetectorModule &DetectorModules::operator[](size_t i) const {
|
|
return modules.at(i);
|
|
}
|
|
|
|
const std::vector<DetectorModule> &DetectorModules::Get() const {
|
|
return modules;
|
|
}
|
|
|
|
bool DetectorModules::Moved() const {
|
|
for (const auto &m: modules)
|
|
if (m.ox != static_cast<double>(m.x0) || m.oy != static_cast<double>(m.y0)
|
|
|| m.fx != 1.0 || m.fy != 0.0 || m.sx != 0.0 || m.sy != 1.0)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
int64_t DetectorModules::ModuleOfImagePixel(double x, double y) const {
|
|
for (size_t i = 0; i < modules.size(); i++)
|
|
if (modules[i].ContainsImagePixel(x, y))
|
|
return static_cast<int64_t>(i);
|
|
return -1;
|
|
}
|
|
|
|
int64_t DetectorModules::ModuleOfPlanePoint(double px, double py) const {
|
|
for (size_t i = 0; i < modules.size(); i++) {
|
|
const auto [x, y] = modules[i].PlaneToImage(px, py);
|
|
if (modules[i].ContainsImagePixel(x, y))
|
|
return static_cast<int64_t>(i);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
std::pair<double, double> DetectorModules::ImageToPlane(double x, double y) const {
|
|
const int64_t m = ModuleOfImagePixel(x, y);
|
|
if (m < 0)
|
|
return {x, y};
|
|
return modules[m].ImageToPlane(x, y);
|
|
}
|
|
|
|
std::pair<double, double> DetectorModules::PlaneToImage(double px, double py) const {
|
|
const int64_t m = ModuleOfPlanePoint(px, py);
|
|
if (m < 0)
|
|
return {px, py};
|
|
return modules[m].PlaneToImage(px, py);
|
|
}
|
|
|
|
std::pair<double, double> DetectorModules::ImageToPlane(int64_t panel, double x, double y) const {
|
|
if (panel < 0)
|
|
return {x, y};
|
|
return modules.at(panel).ImageToPlane(x, y);
|
|
}
|
|
|
|
std::pair<double, double> DetectorModules::PlaneToImage(int64_t panel, double px, double py) const {
|
|
if (panel < 0)
|
|
return {px, py};
|
|
return modules.at(panel).PlaneToImage(px, py);
|
|
}
|
|
|
|
std::optional<PanelPoint> DetectorModules::PlaneToPanel(double px, double py) const {
|
|
if (modules.empty())
|
|
return PanelPoint{-1, px, py};
|
|
for (size_t i = 0; i < modules.size(); i++) {
|
|
const auto [x, y] = modules[i].PlaneToImage(px, py);
|
|
if (modules[i].ContainsImagePixel(x, y))
|
|
return PanelPoint{static_cast<int64_t>(i), x, y};
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
PlaneBox DetectorModules::PlaneBounds(int64_t width, int64_t height) const {
|
|
if (modules.empty())
|
|
return {0.0, 0.0, static_cast<double>(width), static_cast<double>(height)};
|
|
PlaneBox box{INFINITY, INFINITY, -INFINITY, -INFINITY};
|
|
for (const auto &m: modules) {
|
|
const double xa = static_cast<double>(m.x0) - 0.5, xb = static_cast<double>(m.x0 + m.width) - 0.5;
|
|
const double ya = static_cast<double>(m.y0) - 0.5, yb = static_cast<double>(m.y0 + m.height) - 0.5;
|
|
for (const auto &[x, y]: {std::pair{xa, ya}, std::pair{xb, ya}, std::pair{xa, yb}, std::pair{xb, yb}}) {
|
|
const auto [px, py] = m.ImageToPlane(x, y);
|
|
box.x0 = std::min(box.x0, px);
|
|
box.y0 = std::min(box.y0, py);
|
|
box.x1 = std::max(box.x1, px);
|
|
box.y1 = std::max(box.y1, py);
|
|
}
|
|
}
|
|
return box;
|
|
}
|
|
|
|
void DetectorModules::Apply(const std::vector<ModuleShift> &shifts) {
|
|
for (auto &m: modules) {
|
|
const auto [cx, cy] = m.PlaneCentre();
|
|
const double reach = 0.5 * static_cast<double>(std::min(m.width, m.height));
|
|
const ModuleShift *best = nullptr;
|
|
for (const auto &s: shifts)
|
|
if (std::hypot(s.x0 - cx, s.y0 - cy) < reach
|
|
&& (!best || std::hypot(s.x0 - cx, s.y0 - cy) < std::hypot(best->x0 - cx, best->y0 - cy)))
|
|
best = &s;
|
|
if (best)
|
|
m.Apply(*best);
|
|
}
|
|
}
|
|
|
|
std::vector<ModuleShift> DetectorModules::Centres() const {
|
|
std::vector<ModuleShift> out;
|
|
for (const auto &m: modules) {
|
|
ModuleShift s;
|
|
std::tie(s.x0, s.y0) = m.PlaneCentre();
|
|
out.push_back(s);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
DetectorModules ModulesAsImaged(const DetectorGeometry &geom) {
|
|
if (geom.GetModulesNum() < 2)
|
|
return {};
|
|
std::vector<DetectorModule> out;
|
|
for (int64_t m = 0; m < geom.GetModulesNum(); m++) {
|
|
const Coord f = geom.GetFastDirection(m), s = geom.GetSlowDirection(m);
|
|
const double cols = CONVERTED_MODULE_COLS - 1, lines = CONVERTED_MODULE_LINES - 1;
|
|
const double xa = static_cast<double>(geom.GetX0(m)), ya = static_cast<double>(geom.GetY0(m));
|
|
const double xb = xa + cols * f.x + lines * s.x, yb = ya + cols * f.y + lines * s.y;
|
|
const auto x0 = static_cast<int64_t>(std::lround(std::min(xa, xb)));
|
|
const auto y0 = static_cast<int64_t>(std::lround(std::min(ya, yb)));
|
|
out.push_back(DetectorModule::AsImaged(x0, y0, std::lround(std::abs(xb - xa)) + 1,
|
|
std::lround(std::abs(yb - ya)) + 1));
|
|
}
|
|
return DetectorModules(out);
|
|
}
|