Files
Jungfraujoch/common/DetectorModules.cpp
T
leonarski_f afbe844b20
Build Packages / Create release (push) Successful in 17s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 20m49s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 13m6s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 23m44s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 7m28s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 11m50s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 14m9s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 16m25s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 15m42s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 20m36s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 22m18s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 23m29s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / Build documentation (push) Successful in 1m10s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 21m38s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 17m8s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 23m10s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 19m16s
Build Packages / Unit tests (push) Successful in 2h8m4s
Build Packages / Validation Battery (push) Successful in 40m53s
v1.0.0-rc.178 (#88)
* Rugnux: Processes serial crystallography data from XFELs - SACLA (MPCCD), PAL-XFEL and European XFEL (CXI), LCLS (XTC) and SwissFEL Alvra (JUNGFRAU with a CrystFEL module geometry) - with several files or Jungfraujoch master files merged in one run (`rugnux *_master.h5`).
* Rugnux: Stills processing takes a known unit cell and space group as a starting point, finds the beam centre (and, with a cell, the detector distance) from the images, detects the saturation level in other facilities' files and refines the placement of individual detector panels.
* Rugnux: The stills report gives R_split and CC1/2 from frame half-sets, comparable with CrystFEL.
* jfjoch_viewer: Opens the same XFEL file formats.
* Validation: A stills battery checks Rugnux against deposited structures from SACLA, PAL-XFEL, LCLS, European XFEL and SwissFEL.
* Rugnux: More reliable convergence of rotation scaling, and live molecular replacement starts as soon as the model is uploaded.
* jfjoch_broker: Initialize clears the previous dataset's bearer tokens, image buffer and live Rugnux status, and a slow CUDA JIT cache is reported at start.

Reviewed-on: #88
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-10-21 11:20:01 +02:00

155 lines
5.5 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);
}
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);
}