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
* 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>
146 lines
7.2 KiB
C++
146 lines
7.2 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <cstring>
|
|
|
|
#include "bitshuffle/bitshuffle.h"
|
|
|
|
#include "FrameTransformation.h"
|
|
#include "../common/RawToConvertedGeometry.h"
|
|
#include "../common/JFJochException.h"
|
|
|
|
template <class T> void FillVector(std::vector<char> &v, int64_t fill_value) {
|
|
auto ptr = (T *) v.data();
|
|
for (int i = 0; i < v.size() / sizeof(T); i++)
|
|
ptr[i] = static_cast<T>(fill_value);
|
|
}
|
|
|
|
FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experiment) :
|
|
experiment(in_experiment),
|
|
image_mode(in_experiment.GetImageMode()),
|
|
pixel_depth(in_experiment.GetByteDepthImage()),
|
|
compressor(in_experiment.GetCompressionAlgorithm()),
|
|
err_value(experiment.GetByteDepthImage() * RAW_MODULE_SIZE) {
|
|
|
|
precompression_buffer.resize(experiment.GetPixelsNum() * pixel_depth);
|
|
|
|
switch (image_mode) {
|
|
case CompressedImageMode::Int8:
|
|
FillVector<int8_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<int8_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
case CompressedImageMode::Int16:
|
|
FillVector<int16_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<int16_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
case CompressedImageMode::Int32:
|
|
FillVector<int32_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<int32_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
case CompressedImageMode::Uint8:
|
|
FillVector<uint8_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<uint8_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
case CompressedImageMode::Uint16:
|
|
FillVector<uint16_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<uint16_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
case CompressedImageMode::Uint32:
|
|
FillVector<uint32_t>(precompression_buffer, experiment.GetImageFillValue());
|
|
FillVector<uint32_t>(err_value, experiment.GetImageFillValue());
|
|
break;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Image mode not supprted for FrameTransformation");
|
|
}
|
|
}
|
|
|
|
size_t FrameTransformation::CompressImage(void *output, size_t output_size) {
|
|
return compressor.Compress(output, output_size, precompression_buffer.data(), experiment.GetPixelsNum(),
|
|
experiment.GetByteDepthImage());
|
|
}
|
|
|
|
void FrameTransformation::ReserveCompressedBuffer() {
|
|
if (experiment.GetCompressionAlgorithm() != CompressionAlgorithm::NO_COMPRESSION)
|
|
compressed_buffer.resize(MaxCompressedSize(experiment.GetCompressionAlgorithm(),
|
|
experiment.GetPixelsNum(),
|
|
experiment.GetByteDepthImage()));
|
|
}
|
|
|
|
CompressedImage FrameTransformation::GetCompressedImage() {
|
|
const uint8_t *data;
|
|
size_t size;
|
|
if (experiment.GetCompressionAlgorithm() == CompressionAlgorithm::NO_COMPRESSION) {
|
|
data = reinterpret_cast<uint8_t *>(precompression_buffer.data());
|
|
size = experiment.GetPixelsNum() * experiment.GetByteDepthImage();
|
|
} else {
|
|
ReserveCompressedBuffer();
|
|
data = reinterpret_cast<uint8_t *>(compressed_buffer.data());
|
|
size = CompressImage(compressed_buffer.data(), compressed_buffer.size());
|
|
}
|
|
|
|
return CompressedImage(data, size,experiment.GetXPixelsNum(),
|
|
experiment.GetYPixelsNum(), image_mode,
|
|
experiment.GetCompressionAlgorithm());
|
|
}
|
|
|
|
void FrameTransformation::ProcessModule(const void *input, uint16_t module_number, int data_stream) {
|
|
size_t module_number_abs = experiment.GetFirstModuleOfDataStream(data_stream) + module_number;
|
|
|
|
if (!experiment.IsGeometryTransformed()) {
|
|
size_t mod_size = RAW_MODULE_SIZE * pixel_depth;
|
|
memcpy(precompression_buffer.data() + module_number_abs * mod_size, input, mod_size);
|
|
} else {
|
|
auto pixel0 = experiment.GetPixel0OfModuleConv(module_number_abs);
|
|
auto fast_step = experiment.GetModuleFastDirectionStep(module_number_abs);
|
|
auto slow_step = experiment.GetModuleSlowDirectionStep(module_number_abs);
|
|
|
|
switch (image_mode) {
|
|
case CompressedImageMode::Int8:
|
|
TransferModuleAdjustMultipixels((int8_t *) precompression_buffer.data(), (int8_t *) input,
|
|
slow_step, static_cast<int8_t>(INT8_MIN), static_cast<int8_t>(INT8_MAX),
|
|
fast_step, pixel0);
|
|
break;
|
|
case CompressedImageMode::Int16:
|
|
TransferModuleAdjustMultipixels((int16_t *) precompression_buffer.data(), (int16_t *) input,
|
|
slow_step, static_cast<int16_t>(INT16_MIN), static_cast<int16_t>(INT16_MAX),
|
|
fast_step, pixel0);
|
|
break;
|
|
case CompressedImageMode::Int32:
|
|
TransferModuleAdjustMultipixels((int32_t *) precompression_buffer.data(), (int32_t *) input,
|
|
slow_step, static_cast<int32_t>(INT32_MIN), static_cast<int32_t>(INT32_MAX),
|
|
fast_step, pixel0);
|
|
|
|
break;
|
|
case CompressedImageMode::Uint8:
|
|
TransferModuleAdjustMultipixels((uint8_t *) precompression_buffer.data(), (uint8_t *) input,
|
|
slow_step, static_cast<uint8_t>(0), static_cast<uint8_t>(UINT8_MAX - 1),
|
|
fast_step, pixel0);
|
|
break;
|
|
case CompressedImageMode::Uint16:
|
|
TransferModuleAdjustMultipixels((uint16_t *) precompression_buffer.data(), (uint16_t *) input,
|
|
slow_step, static_cast<uint16_t>(0), static_cast<uint16_t>(UINT16_MAX - 1),
|
|
fast_step, pixel0);
|
|
break;
|
|
case CompressedImageMode::Uint32:
|
|
TransferModuleAdjustMultipixels((uint32_t *) precompression_buffer.data(), (uint32_t *) input,
|
|
slow_step, static_cast<uint32_t>(0), static_cast<uint32_t>(UINT32_MAX - 1),
|
|
fast_step, pixel0);
|
|
break;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Image mode not supprted for FrameTransformation");
|
|
}
|
|
}
|
|
}
|
|
|
|
void FrameTransformation::ProcessModule(const DeviceOutput *output, int data_stream) {
|
|
ProcessModule(output->pixels, output->module_statistics.module_number, data_stream);
|
|
}
|
|
|
|
const void *FrameTransformation::GetImage() const {
|
|
return precompression_buffer.data();
|
|
}
|
|
|
|
void FrameTransformation::FillNotCollectedModule(uint16_t module_number, int data_stream) {
|
|
ProcessModule(err_value.data(), module_number, data_stream);
|
|
}
|