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>
135 lines
5.2 KiB
C++
135 lines
5.2 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "ModuleSummation.h"
|
|
#include "JFJochException.h"
|
|
|
|
ModuleSummation::ModuleSummation(bool in_pixel_signed, uint32_t in_fpga_depth_bytes) {
|
|
pixel_signed = in_pixel_signed;
|
|
first = true;
|
|
is_empty = false;
|
|
output_depth_bytes = 4;
|
|
fpga_depth_bytes = in_fpga_depth_bytes;
|
|
|
|
if ((fpga_depth_bytes != 4)
|
|
&& (fpga_depth_bytes != 2)
|
|
&& (fpga_depth_bytes != 1))
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "FPGA byte depth can be only 1, 2 or 4");
|
|
|
|
output = std::make_unique<DeviceOutput>();
|
|
Clear();
|
|
}
|
|
|
|
void ModuleSummation::Clear() {
|
|
std::unique_lock ul(module_summation_mutex);
|
|
first = true;
|
|
is_empty = false;
|
|
memset(output.get(), 0, sizeof(DeviceOutput));
|
|
}
|
|
|
|
ModuleSummation::ModuleSummation(const DiffractionExperiment &experiment) : ModuleSummation(
|
|
experiment.IsPixelSigned(), experiment.GetByteDepthFPGA()) {
|
|
if (!experiment.IsCPUSummation())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"CPU summation not turned on");
|
|
if (experiment.GetByteDepthImage() != 4)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"CPU summation works only for 32-bit output");
|
|
}
|
|
|
|
const DeviceOutput &ModuleSummation::GetOutput() const {
|
|
return *output;
|
|
}
|
|
|
|
DeviceOutput &ModuleSummation::GetOutput() {
|
|
return *output;
|
|
}
|
|
|
|
template<class Tdst, class Tsrc>
|
|
void Add(DeviceOutput &output, const DeviceOutput &input) {
|
|
auto in_pixel = reinterpret_cast<const Tsrc *>(input.pixels);
|
|
auto out_pixel = reinterpret_cast<Tdst *>(output.pixels);
|
|
|
|
Tdst err_val_dst = std::is_signed_v<Tdst> ? std::numeric_limits<Tdst>::min() : std::numeric_limits<Tdst>::max();
|
|
Tsrc err_val_src = std::is_signed_v<Tsrc> ? std::numeric_limits<Tsrc>::min() : std::numeric_limits<Tsrc>::max();
|
|
|
|
for (int i = 0; i < RAW_MODULE_SIZE; i++) {
|
|
if ((in_pixel[i] == err_val_src) || (out_pixel[i] == err_val_dst))
|
|
out_pixel[i] = err_val_dst;
|
|
else if ((in_pixel[i] == std::numeric_limits<Tsrc>::max())
|
|
|| (out_pixel[i] == std::numeric_limits<Tdst>::max())
|
|
|| (static_cast<int64_t>(out_pixel[i]) + static_cast<int64_t>(in_pixel[i]) >= std::numeric_limits<
|
|
Tdst>::max()))
|
|
out_pixel[i] = std::numeric_limits<Tdst>::max();
|
|
else
|
|
out_pixel[i] = out_pixel[i] + in_pixel[i];
|
|
}
|
|
}
|
|
|
|
void ModuleSummation::AddFPGAOutput(const DeviceOutput &input, const std::optional<uint32_t> &in_fpga_depth_bytes) {
|
|
std::unique_lock ul(module_summation_mutex);
|
|
|
|
if (first) {
|
|
output->module_statistics = input.module_statistics;
|
|
first = false;
|
|
} else {
|
|
output->module_statistics.err_pixels += input.module_statistics.err_pixels;
|
|
output->module_statistics.saturated_pixels += input.module_statistics.saturated_pixels;
|
|
output->module_statistics.packet_count += input.module_statistics.packet_count;
|
|
output->module_statistics.pixel_sum += input.module_statistics.pixel_sum;
|
|
}
|
|
|
|
// The only function not handled is spot finding
|
|
switch (in_fpga_depth_bytes.value_or(fpga_depth_bytes)) {
|
|
case 2:
|
|
if (pixel_signed)
|
|
Add<int32_t, int16_t>(*output, input);
|
|
else
|
|
Add<uint32_t, uint16_t>(*output, input);
|
|
break;
|
|
case 4:
|
|
if (pixel_signed)
|
|
Add<int32_t, int32_t>(*output, input);
|
|
else
|
|
Add<uint32_t, uint32_t>(*output, input);
|
|
break;
|
|
case 1:
|
|
if (pixel_signed)
|
|
Add<int32_t, int8_t>(*output, input);
|
|
else
|
|
Add<uint32_t, uint8_t>(*output, input);
|
|
break;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Unknown bit depth");
|
|
}
|
|
|
|
for (int i = 0; i < FPGA_INTEGRATION_BIN_COUNT; i++) {
|
|
output->integration_result[i].count += input.integration_result[i].count;
|
|
output->integration_result[i].sum += input.integration_result[i].sum;
|
|
}
|
|
|
|
for (int i = 0; i < ADU_HISTO_BIN_COUNT; i++)
|
|
output->adu_histogram[i] += input.adu_histogram[i];
|
|
|
|
for (int i = 0; i < FPGA_ROI_COUNT; i++) {
|
|
output->roi_counts[i].sum += input.roi_counts[i].sum;
|
|
output->roi_counts[i].sum2 += input.roi_counts[i].sum2;
|
|
output->roi_counts[i].good_pixels += input.roi_counts[i].good_pixels;
|
|
output->roi_counts[i].sum_x_weighted += input.roi_counts[i].sum_x_weighted;
|
|
output->roi_counts[i].sum_y_weighted += input.roi_counts[i].sum_y_weighted;
|
|
if (output->roi_counts[i].max_value < input.roi_counts[i].max_value)
|
|
output->roi_counts[i].max_value = input.roi_counts[i].max_value;
|
|
}
|
|
}
|
|
|
|
void ModuleSummation::AddEmptyOutput() {
|
|
std::unique_lock ul(module_summation_mutex);
|
|
is_empty = true;
|
|
}
|
|
|
|
bool ModuleSummation::empty() const {
|
|
std::unique_lock ul(module_summation_mutex);
|
|
return is_empty;
|
|
}
|