From c936e9bab732dac80cc635b8f8512709e3224a7c Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Wed, 10 Sep 2025 12:33:39 +0200 Subject: [PATCH] v1.0.0-rc.74 --- CMakeLists.txt | 2 +- VERSION | 2 +- broker/JFJochStateMachine.cpp | 10 ++++++++++ broker/jfjoch_api.yaml | 2 +- broker/redoc-static.html | 4 ++-- detector_control/SLSDetectorWrapper.cpp | 3 +++ docs/CHANGELOG.md | 6 ++++++ docs/conf.py | 2 +- fpga/hdl/action_config.v | 2 +- fpga/pcie_driver/dkms.conf | 2 +- fpga/pcie_driver/install_dkms.sh | 2 +- fpga/pcie_driver/jfjoch_drv.c | 2 +- fpga/pcie_driver/postinstall.sh | 2 +- fpga/pcie_driver/preuninstall.sh | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- frontend/src/openapi/core/OpenAPI.ts | 2 +- frontend/src/version.ts | 2 +- image_analysis/indexing/CMakeLists.txt | 2 +- writer/writer_api.yaml | 2 +- 20 files changed, 38 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f7973d4..79012ce8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(PNG_TESTS OFF) INCLUDE(CheckLanguage) CHECK_LANGUAGE(CUDA) -SET(CMAKE_CUDA_ARCHITECTURES 70 75 80 86 89) # V100, T4, A100, RTX A4000, L4 +SET(CMAKE_CUDA_ARCHITECTURES 75 80 86 89) # T4, A100, RTX A4000, L4 SET(CMAKE_CUDA_STANDARD 17) SET(CMAKE_CUDA_FLAGS_RELEASE "-O3") diff --git a/VERSION b/VERSION index 39494d5a..f88e01fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc.73 +1.0.0-rc.74 diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp index c37b83fc..93e6f9cf 100644 --- a/broker/JFJochStateMachine.cpp +++ b/broker/JFJochStateMachine.cpp @@ -62,6 +62,7 @@ bool JFJochStateMachine::ImportPedestalG1G2(const JFJochReceiverOutput &receiver void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock &ul) { if (experiment.GetDetectorSetup().GetDetectorType() != DetectorType::JUNGFRAU) { try { + calibration.reset(); logger.Info("EIGER configuration"); services.ConfigureDetector(experiment); logger.Info(" ... done "); @@ -484,6 +485,15 @@ void JFJochStateMachine::LoadDetectorSettings(const DetectorSettings &settings) if (ImportDetectorSettings(settings)) { SetState(JFJochState::Busy, "Loading settings", BrokerStatus::MessageSeverity::Info); measurement = std::async(std::launch::async, &JFJochStateMachine::PedestalThread, this, std::move(ul)); + } else { + try { + SetState(JFJochState::Busy, "Configure detector", BrokerStatus::MessageSeverity::Info); + services.ConfigureDetector(experiment); + SetState(JFJochState::Idle, "Detector configured", BrokerStatus::MessageSeverity::Info); + } catch (const std::exception &e) { + logger.Error("Detector configuration error {}", e.what()); + SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error); + } } break; case JFJochState::Measuring: diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 67760a25..028805aa 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -22,7 +22,7 @@ info: requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. - version: 1.0.0-rc.73 + version: 1.0.0-rc.74 contact: name: Filip Leonarski (Paul Scherrer Institute) email: filip.leonarski@psi.ch diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 9fe4d08d..05f9dfbb 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -405,7 +405,7 @@ Get user mask of the detector (TIFF) 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Jungfraujoch (1.0.0-rc.73)

Download OpenAPI specification:

Filip Leonarski (Paul Scherrer Institute): filip.leonarski@psi.ch License: GPL-3.0

Jungfraujoch (1.0.0-rc.74)

Download OpenAPI specification:

Filip Leonarski (Paul Scherrer Institute): filip.leonarski@psi.ch License: GPL-3.0

API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). @@ -1387,7 +1387,7 @@ then image might be replaced in the buffer between calling /images and /image.cb " class="sc-eVqvcJ sc-fszimp kIppRw drqpJr">

Test Jungfraujoch system

http://localhost:5232/version