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>
84 lines
3.7 KiB
C++
84 lines
3.7 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <chrono>
|
|
#include <optional>
|
|
|
|
#include "DarkMaskSettings.h"
|
|
#include "../common/Definitions.h"
|
|
|
|
enum class DetectorTiming {Auto, Trigger, Burst, Gated};
|
|
|
|
class DetectorSettings {
|
|
std::chrono::nanoseconds frame_time_pedestalG1G2 = FRAME_TIME_PEDE_G1G2;
|
|
|
|
bool internal_fpga_packet_generator = false;
|
|
int64_t internal_fpga_packet_generator_images = 1;
|
|
|
|
int64_t storage_cells = 1;
|
|
int64_t storage_cell_start = 15;
|
|
std::chrono::nanoseconds storage_cell_delay = MIN_STORAGE_CELL_DELAY;
|
|
std::chrono::nanoseconds detector_delay = std::chrono::nanoseconds{0};
|
|
int64_t pedestal_g0_frames = 0;
|
|
int64_t pedestal_g1_frames = 0;
|
|
int64_t pedestal_g2_frames = 0;
|
|
bool use_gain_hg0 = false;
|
|
bool fix_gain_g1 = false;
|
|
std::chrono::nanoseconds frame_time = std::chrono::microseconds{500};
|
|
std::optional<std::chrono::nanoseconds> count_time;
|
|
int64_t pedestal_min_image_count = PEDESTAL_MIN_IMAGE_COUNT;
|
|
|
|
std::optional<float> eiger_threshold_keV;
|
|
std::optional<int64_t> eiger_bitwidth;
|
|
|
|
DetectorTiming timing = DetectorTiming::Trigger;
|
|
public:
|
|
DetectorSettings& InternalGeneratorEnable(bool input);
|
|
// The broker's limit; the firmware's own is FPGA_INTERNAL_GENERATOR_MAX_IMAGES
|
|
static constexpr int64_t DefaultMaxInternalGeneratorImages = 64;
|
|
DetectorSettings& InternalGeneratorImages(int64_t input, int64_t max_images = DefaultMaxInternalGeneratorImages);
|
|
DetectorSettings& StorageCells(int64_t input);
|
|
DetectorSettings& StorageCellStart(int64_t input);
|
|
DetectorSettings& StorageCellDelay(const std::chrono::nanoseconds &input);
|
|
DetectorSettings& DetectorDelay(const std::chrono::nanoseconds &input);
|
|
DetectorSettings& PedestalG0Frames(int64_t input);
|
|
DetectorSettings& PedestalG1Frames(int64_t input);
|
|
DetectorSettings& PedestalG2Frames(int64_t input);
|
|
DetectorSettings& UseGainHG0(bool input);
|
|
DetectorSettings& FixGainG1(bool input);
|
|
DetectorSettings& FrameTime(const std::chrono::nanoseconds& input);
|
|
DetectorSettings& FrameTime(const std::chrono::nanoseconds& input,
|
|
const std::chrono::nanoseconds &count_time);
|
|
DetectorSettings& PedestalMinImageCount(uint32_t input);
|
|
DetectorSettings& EigerThreshold_keV(const std::optional<float> &input);
|
|
DetectorSettings& Timing(DetectorTiming input);
|
|
DetectorSettings& EigerBitDepth(const std::optional<int64_t> &input);
|
|
|
|
[[nodiscard]] bool IsInternalGeneratorEnable() const;
|
|
[[nodiscard]] int64_t GetInternalGeneratorImages() const;
|
|
[[nodiscard]] int64_t GetStorageCells() const;
|
|
[[nodiscard]] int64_t GetStorageCellStart() const;
|
|
[[nodiscard]] std::chrono::nanoseconds GetStorageCellDelay() const;
|
|
[[nodiscard]] std::chrono::nanoseconds GetDetectorDelay() const;
|
|
[[nodiscard]] int64_t GetPedestalG0Frames() const;
|
|
[[nodiscard]] int64_t GetPedestalG1Frames() const;
|
|
[[nodiscard]] int64_t GetPedestalG2Frames() const;
|
|
[[nodiscard]] bool IsUseGainHG0() const;
|
|
[[nodiscard]] bool IsFixGainG1() const;
|
|
[[nodiscard]] std::chrono::nanoseconds GetFrameTime() const;
|
|
[[nodiscard]] std::optional<std::chrono::nanoseconds> GetCountTime() const;
|
|
[[nodiscard]] std::chrono::nanoseconds GetFrameTimePedestalG1G2() const;
|
|
[[nodiscard]] uint32_t GetPedestalMinImageCount() const;
|
|
[[nodiscard]] std::optional<float> GetEigerThreshold_keV() const;
|
|
[[nodiscard]] std::optional<int64_t> GetEigerBitDepth() const;
|
|
[[nodiscard]] DetectorTiming GetTiming() const;
|
|
|
|
[[nodiscard]] bool NeedsJUNGFRAURecalibration(const DetectorSettings& other) const;
|
|
};
|
|
|
|
|
|
|