Files
Jungfraujoch/common/RawToConvertedGeometry.h
leonarski_f 4809c1622c
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m46s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 39m44s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m30s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 31m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m51s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m6s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m44s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m22s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 34m6s
Build Packages / Unit tests (push) Successful in 1h2m47s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 35m59s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 34m8s
Build Packages / Validation Battery (push) Successful in 38m31s
v1.0.0-rc.187 (#98)
* Rugnux: Refinement several times faster, one protocol on the CPU and the GPU, parts of it on the Apple GPU; its random draws are the same on every platform.
* Rugnux: Refinement follows common practice: the free set decides only the restraint weights and the displacement model (isotropic, TLS or anisotropic, by Hamilton's test), everything else is decided on the working set; lower R-free for placed and predicted models.
* Rugnux: Restraint dictionaries via `--restraints` (or among the inputs) and more built-in ligands; a model whose space group is a subgroup of the data's is refined in its own group; reflections plus a model select `--mode refine` on their own.
* Rugnux: `-C` fixes the crystal system on the axes as typed; `-S` alone fixes the space group only, the cell is still found and reduced; a space group or cell stored in the input file is ignored, with a line in the log.
* Rugnux: More reliable multi-sweep merging; `--mode scale` merges several stills runs as one; `_plot.txt` and the report name each input; a second crystal form is reported for stills given a cell.
* jfjoch_broker (experimental): Live Rugnux on FPGA detectors (JUNGFRAU) takes the same path as a DECTRIS stream, rotation and serial alike, model step included, with analysis threads per GPU; frames waiting for the analysis can be viewed; no host stage drops a frame - a source faster than the analysis is held at the card.
* jfjoch_broker: Summation of more than 256 frames per image is split between the card and the host (`summation_mode` is then `hybrid`), and live Rugnux runs on such collections; pedestal runs take a receiver of their own.
* jfjoch_broker (experimental): `stills_downsample` analyses 1 of every N serial images (chosen by a hash; the first 2000 all; the others written without analysis; reset to 1 by `/initialize`); `max_spot_count` left out means 250 for per-image indexing and up to 1000 for live stills; the live status gives the merge before the model work, the fitted resolution and the anomalous peak height of each unexplained blob.
* jfjoch_broker: Without a `pcie` entry the broker runs on a mock of the card instead of the HLS simulation; its spot, ROI and azimuthal results are zero then.
* Web frontend: Redesigned Rugnux live page; Vite 8, TypeScript 6, Mol* 5.13 and dependency security updates.
* Tools: `jfjoch_fpga_stills_test` measures live stills on the cards with a stored dataset; `jfjoch_fpga_test` loses the HLS-simulation option.
* Other: FFTW no longer fetched or linked (the CPU FFT indexer keeps the name `FFTW`); PCIe driver now GPL-2.0-or-later and third-party notices complete; several crash fixes.

Reviewed-on: #98
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-19 20:49:28 +01:00

163 lines
7.8 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <cmath>
#include "RawToConvertedGeometryCore.h"
#include "Coord.h"
#include "DiffractionExperiment.h"
// An assembled image back to raw module frames, the multipixels summed (SqueezeMultipixelsToModule)
template<class Td, class Ts>
void SqueezeToRawGeometry(const DiffractionExperiment &experiment, Td *destination, const Ts *source,
Ts min, Ts max, Td dest_min, Td dest_max) {
for (size_t module_number = 0; module_number < experiment.GetModulesNum(); module_number++)
SqueezeMultipixelsToModule<Td, Ts>(destination + module_number * RAW_MODULE_SIZE, source,
experiment.GetModuleSlowDirectionStep(module_number), min, max,
dest_min, dest_max,
experiment.GetModuleFastDirectionStep(module_number),
experiment.GetPixel0OfModuleConv(module_number));
}
// Input coord is column + 1024 * (line + 512 * module)
// Copies result over multipixel - can be used for example for mask calculation
template<class Td, class Ts>
void RawToConvertedGeometry(const DiffractionExperiment &experiment, Td *destination, const Ts *source) {
for (size_t module_number = 0; module_number < experiment.GetModulesNum(); module_number++)
TransferModule<Td, Ts>(destination + experiment.GetPixel0OfModuleConv(module_number),
source + module_number * RAW_MODULE_SIZE,
experiment.GetModuleSlowDirectionStep(module_number),
experiment.GetModuleFastDirectionStep(module_number));
}
inline std::pair<int64_t, int64_t> RawToConvertedCoordinate(const DiffractionExperiment& experiment,
uint32_t module_number,
uint32_t pixel_within_module) {
int64_t pixel0 = experiment.GetPixel0OfModuleConv(module_number);
int64_t line = pixel_within_module / RAW_MODULE_COLS;
int64_t col = pixel_within_module % RAW_MODULE_COLS;
line += (line / 256) * 2;
col += (col / 256) * 2;
int64_t pixel = pixel0
+ col * experiment.GetModuleFastDirectionStep(module_number)
+ line * experiment.GetModuleSlowDirectionStep(module_number);
return {pixel % experiment.GetXPixelsNumConv() , pixel / experiment.GetXPixelsNumConv()};
}
inline Coord RawToConvertedCoordinate(const DiffractionExperiment& experiment, uint32_t module_number, const Coord &c) {
int64_t pixel0 = experiment.GetPixel0OfModuleConv(module_number);
Coord pixel0_coord(pixel0 % experiment.GetXPixelsNumConv(),
pixel0 / experiment.GetXPixelsNumConv(),
0);
return pixel0_coord
+ experiment.GetModuleFastDirection(module_number) * (c.x + (static_cast<int32_t>(c.x) / 256) * 2)
+ experiment.GetModuleSlowDirection(module_number) * (c.y + (static_cast<int32_t>(c.y) / 256) * 2);
}
template<class T>
void ConvertedToRawGeometry(const DiffractionExperiment &experiment, size_t module_number,
T *destination, const T *source) {
// Ensure that converted geometry is used, even if raw data mode is set
const auto &geom = experiment.GetDetectorSetup().GetGeometry();
for (size_t line = 0; line < RAW_MODULE_LINES; line++)
LineConvtToRaw<T>(destination + RAW_MODULE_COLS * line,
source + geom.GetPixel0(module_number, true) +
geom.GetSlowDirectionStep(module_number) * (line + ((line > 255) ? 2 : 0)),
experiment.GetModuleFastDirectionStep(module_number));
}
template<class T>
void ConvertedToRawGeometry(const DiffractionExperiment &experiment, T *destination, const T *source) {
for (size_t module_number = 0; module_number < experiment.GetModulesNum(); module_number++)
ConvertedToRawGeometry(experiment, module_number, destination + module_number * RAW_MODULE_SIZE, source);
}
// Input coord is column + 1024 * (line + 512 * module)
template<class Ts>
void RawToConvertedGeometryAdjustMultipixels(const DiffractionExperiment &experiment, Ts *destination, const Ts *source) {
Ts min = experiment.GetUnderflow() + 1;
if (min > 0) min = 0;
Ts max = experiment.GetSaturationLimit() - 1;
for (size_t module_number = 0; module_number < experiment.GetModulesNum(); module_number++) {
TransferModuleAdjustMultipixels<Ts, Ts>(destination,
source + module_number * RAW_MODULE_SIZE,
experiment.GetModuleSlowDirectionStep(module_number),
min, max,
experiment.GetModuleFastDirectionStep(module_number),
experiment.GetPixel0OfModuleConv(module_number));
}
}
template <int HALF_LINES_PER_PACKET = 4, class T>
inline void RawToEigerInput(T *dest, const T *source) {
int half_lines_per_packet = HALF_LINES_PER_PACKET;
int pixels_per_packet = half_lines_per_packet * RAW_MODULE_COLS / 2;
int total_packets = 2 * (RAW_MODULE_LINES / half_lines_per_packet);
// bottom left corner
for (int packet = 0; packet < total_packets / 4; packet++) {
for (int i = 0; i < pixels_per_packet; i++) {
size_t line = packet * half_lines_per_packet + (half_lines_per_packet - 1 - i / 512);
size_t col = i % (RAW_MODULE_COLS / 2);
dest[(total_packets / 2 - 1 - (packet * 2 + 1)) * pixels_per_packet + i] = source[line * RAW_MODULE_COLS + col];
dest[(total_packets / 2 - 1 - (packet * 2)) * pixels_per_packet + i] = source[line * RAW_MODULE_COLS + col + RAW_MODULE_COLS / 2];
}
}
// top left corner
for (int packet = 0; packet < total_packets / 4; packet++) {
for (int i = 0; i < pixels_per_packet; i++) {
size_t line = RAW_MODULE_LINES / 2 + packet * half_lines_per_packet + i / 512;
size_t col = i % (RAW_MODULE_COLS / 2);
dest[(total_packets / 2 + (packet * 2)) * pixels_per_packet + i] = source[line * RAW_MODULE_COLS + col];
dest[(total_packets / 2 + (packet * 2 + 1)) * pixels_per_packet + i] = source[line * RAW_MODULE_COLS + col + RAW_MODULE_COLS / 2];
}
}
}
inline void RawToEigerInput32(uint32_t *dest, const uint32_t *source) {
// bottom left corner
for (int packet = 0; packet < 128; packet++) {
for (int i = 0; i < 1024; i++) {
size_t line = packet * 2 + (1 - i / 512);
size_t col = i % 512;
dest[(254 - (packet * 2)) * 1024 + i] = source[line * RAW_MODULE_COLS + col];
}
}
// bottom right corner
for (int packet = 0; packet < 128; packet++) {
for (int i = 0; i < 1024; i++) {
size_t line = packet * 2 + (1 - i / 512);
size_t col = 512 + i % 512;
dest[(255 - (packet * 2)) * 1024 + i] = source[line * RAW_MODULE_COLS + col];
}
}
// top left corner
for (int packet = 0; packet < 128; packet++) {
for (int i = 0; i < 1024; i++) {
size_t line = 256 + packet * 2 + i / 512;
size_t col = i % 512;
dest[(256 + (packet * 2)) * 1024 + i] = source[line * RAW_MODULE_COLS + col];
}
}
// top right corner
for (int packet = 0; packet < 128; packet++) {
for (int i = 0; i < 1024; i++) {
size_t line = 256 + packet * 2 + i / 512;
size_t col = 512 + i % 512;
dest[(257 + (packet * 2)) * 1024 + i] = source[line * RAW_MODULE_COLS + col];
}
}
}