Files
Jungfraujoch/receiver/JFJochReceiverTest.cpp
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

114 lines
4.1 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "JFJochReceiverTest.h"
#include "JFJochReceiverService.h"
#include "../image_pusher/ZMQStream2Pusher.h"
#include "../image_pusher/TestImagePusher.h"
#define STORAGE_CELL_FOR_TEST 11
JFCalibration GeneratePedestalCalibration(const DiffractionExperiment &x) {
JFCalibration ret(x);
std::vector<float> pedestal_g0( RAW_MODULE_SIZE), pedestal_g1(RAW_MODULE_SIZE), pedestal_g2(RAW_MODULE_SIZE);
for (int s = 0; s < x.GetStorageCellNumber(); s++) {
for (int m = 0; m < x.GetModulesNum(); m++) {
for (int i = 0; i < RAW_MODULE_SIZE; i++) {
pedestal_g0[i] = 3000 + 100 * s + 10 * m + i % 50;
if (x.IsFixedGainG1())
pedestal_g1[i] = 2500 + 100 * s + 10 * m + i % 50;
else
pedestal_g1[i] = 15000 - 100 * s + 10 * m + i % 50;
pedestal_g2[i] = 14000 - 100 * s + 10 * m + i % 50;
}
ret.Pedestal(m, 0, s).LoadPedestal(pedestal_g0);
ret.Pedestal(m, 1, s).LoadPedestal(pedestal_g1);
ret.Pedestal(m, 2, s).LoadPedestal(pedestal_g2);
}
}
return ret;
}
bool JFJochReceiverTest(JFJochReceiverOutput &output, Logger &logger,
AcquisitionDeviceGroup &aq_devices,
const DiffractionExperiment &x,
const PixelMask &pixel_mask,
uint16_t nthreads,
size_t send_buf_size_MiB) {
std::vector<uint16_t> raw_expected_image(RAW_MODULE_SIZE * x.GetModulesNum());
for (int i = 0; i < raw_expected_image.size(); i++)
raw_expected_image[i] = i % 65536;
return JFJochReceiverTest(output, logger, aq_devices, x, pixel_mask, raw_expected_image, nthreads,
send_buf_size_MiB);
}
bool JFJochReceiverTest(JFJochReceiverOutput &output, Logger &logger,
AcquisitionDeviceGroup &aq_devices,
const DiffractionExperiment &x,
const PixelMask &pixel_mask,
const std::vector<uint16_t> &raw_expected_image,
uint16_t nthreads,
size_t send_buf_size_MiB) {
std::vector<uint16_t> raw_expected_image_with_mask = raw_expected_image;
if (x.IsApplyPixelMask()) {
for (int i = 0; i < raw_expected_image_with_mask.size(); i++)
if (pixel_mask.GetMaskRaw().at(i) != 0)
raw_expected_image_with_mask[i] = UINT16_MAX;
}
JFCalibration calib = GeneratePedestalCalibration(x);
int64_t image_number = x.GetImageNum() - 1;
if (x.GetStorageCellNumber() > 1)
image_number = STORAGE_CELL_FOR_TEST;
if (image_number < 0)
image_number = 0;
TestImagePusher pusher(image_number);
JFJochReceiverService service(aq_devices, logger, pusher, send_buf_size_MiB);
service.NumThreads(nthreads);
service.LoadInternalGeneratorImage(x, raw_expected_image, 0);
service.Indexing(x.GetIndexingSettings());
SpotFindingSettings settings = DiffractionExperiment::DefaultDataProcessingSettings();
settings.signal_to_noise_threshold = 2.5;
settings.photon_count_threshold = 5;
settings.min_pix_per_spot = 1;
settings.max_pix_per_spot = 200;
service.SetSpotFindingSettings(settings);
service.Start(x, pixel_mask, &calib);
output = service.Stop();
bool no_errors = true;
if (x.GetImageNum() > 0) {
no_errors = pusher.CheckImage(x, raw_expected_image_with_mask, calib, logger);
if (output.efficiency != 1.0) {
logger.Error("Not all frames were received");
no_errors = false;
}
if (!pusher.CheckSequence()) {
logger.Error("Wrong sequence of operations for pusher");
no_errors = false;
}
if (pusher.GetCounter() != x.GetImageNum()) {
logger.Error("Wrong frame number from pusher");
no_errors = false;
}
}
return no_errors;
}