Merge branch '2509-eiger-fix' into 'main'

v1.0.0-rc.74

See merge request jungfraujoch/nextgendcu!163

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")
 

VERSION

@@ -1 +1 @@
-1.0.0-rc.73
+1.0.0-rc.74

broker/JFJochStateMachine.cpp

@@ -62,6 +62,7 @@ bool JFJochStateMachine::ImportPedestalG1G2(const JFJochReceiverOutput &receiver
 void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock<std::mutex> &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:

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

detector_control/SLSDetectorWrapper.cpp

@@ -131,7 +131,10 @@ void SLSDetectorWrapper::Initialize(DiffractionExperiment& experiment,
                 auto &cfg = mod_cfg[i];
 
                 det.setDestinationUDPPort(16384 + (cfg.data_stream<<8) + cfg.module_id_in_data_stream * 2, 2 * i);
+                det.setDestinationUDPPort2(16384 + (cfg.data_stream<<8) + cfg.module_id_in_data_stream * 2, 2 * i);
+                det.setDestinationUDPPort(16384 + (cfg.data_stream<<8) + cfg.module_id_in_data_stream * 2 + 1, 2 * i + 1);
                 det.setDestinationUDPPort2(16384 + (cfg.data_stream<<8) + cfg.module_id_in_data_stream * 2 + 1, 2 * i + 1);
+
                 det.setSourceUDPIP(sls::IpAddr(cfg.ipv4_src_addr_1), {2 * i, 2 * i + 1});
                 det.setDestinationUDPIP(sls::IpAddr(cfg.ipv4_dest_addr_1), {2 * i, 2 * i + 1});
                 det.setDestinationUDPMAC(sls::MacAddr(cfg.mac_addr_dest_1), {2 * i, 2 * i + 1});

docs/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## 1.0.0-rc.74
+This is an UNSTABLE release.
+
+* jfjoch_broker: Fix for EIGER UDP port settings (vertical half of the module missing)
+* jfjoch_broker: Detector settings were not applied for EIGER/DECTRIS detector when changed after initialization
+
 ## 1.0.0-rc.73
 This is an UNSTABLE release.
 

docs/conf.py

@@ -9,7 +9,7 @@
 project = 'Jungfraujoch'
 copyright = '2024, Paul Scherrer Institute'
 author = 'Filip Leonarski'
-release = '1.0.0-rc.73'
+release = '1.0.0-rc.74'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

fpga/hdl/action_config.v

@@ -8,7 +8,7 @@
 `define JFJOCH_FPGA_MAJOR_VERSION 8'd1
 `define JFJOCH_FPGA_MINOR_VERSION 8'd0
 `define JFJOCH_FPGA_PATCH_VERSION 8'd0
-`define JFJOCH_FPGA_PRERELEASE 64'h33372E6372
+`define JFJOCH_FPGA_PRERELEASE 64'h34372E6372
 
 `define GIT_SHA1 32'h
 `define MAX_MODULES_FPGA 32'd16

fpga/pcie_driver/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME=jfjoch
-PACKAGE_VERSION=1.0.0-rc.73
+PACKAGE_VERSION=1.0.0-rc.74
 
 DEST_MODULE_LOCATION=/extra
 BUILT_MODULE_NAME=jfjoch

fpga/pcie_driver/install_dkms.sh

@@ -2,7 +2,7 @@
 
 # Copyright (2019-2024) Paul Scherrer Institute
 
-VERSION=1.0.0-rc.73
+VERSION=1.0.0-rc.74
 
 mkdir -p /usr/src/jfjoch-${VERSION}/src
 cp dkms.conf /usr/src/jfjoch-${VERSION}

fpga/pcie_driver/jfjoch_drv.c

@@ -12,7 +12,7 @@
 MODULE_AUTHOR("Filip Leonarski; Paul Scherrer Institute");
 MODULE_DESCRIPTION("Jungfraujoch device module");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0-rc.73");
+MODULE_VERSION("1.0.0-rc.74");
 
 #define PCI_DEV_ID_JUNGFRAUJOCH        (0x3450)
 

fpga/pcie_driver/postinstall.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.73
+VERSION=1.0.0-rc.74
 
 occurrences=`/usr/sbin/dkms status | grep jfjoch | grep ${VERSION} | wc -l`
 

fpga/pcie_driver/preuninstall.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.73
+VERSION=1.0.0-rc.74
 
 /usr/sbin/dkms remove -m jfjoch -v ${VERSION} --all
 

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.72",
+  "version": "1.0.0-rc.73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jungfraujoch-frontend",
-      "version": "1.0.0-rc.72",
+      "version": "1.0.0-rc.73",
       "license": "GPL-3.0",
       "dependencies": {
         "@emotion/react": "^11.10.4",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.73",
+  "version": "1.0.0-rc.74",
   "license": "GPL-3.0",
   "private": true,
   "homepage": "/frontend",

frontend/src/openapi/core/OpenAPI.ts

@@ -21,7 +21,7 @@ export type OpenAPIConfig = {
 
 export const OpenAPI: OpenAPIConfig = {
     BASE: 'http://localhost:5232',
-    VERSION: '1.0.0-rc.73',
+    VERSION: '1.0.0-rc.74',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
     TOKEN: undefined,

frontend/src/version.ts

@@ -1 +1 @@
-export const JFJOCH_VERSION : string = "1.0.0-rc.73";
+export const JFJOCH_VERSION : string = "1.0.0-rc.74";

image_analysis/indexing/CMakeLists.txt

@@ -12,7 +12,7 @@ ADD_LIBRARY(JFJochIndexing STATIC
 TARGET_LINK_LIBRARIES(JFJochIndexing JFJochCommon)
 
 IF (JFJOCH_CUDA_AVAILABLE)
-    SET(CMAKE_CUDA_ARCHITECTURES 70 75 80 86 89)
+    SET(CMAKE_CUDA_ARCHITECTURES 75 80 86 89)
 
     FetchContent_Declare(
             fast-indexer

writer/writer_api.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Jungfraujoch writer
   description: Jungfraujoch Writer Web API
-  version: 1.0.0-rc.73
+  version: 1.0.0-rc.74
   contact:
     name: Filip Leonarski (Paul Scherrer Institute)
     email: filip.leonarski@psi.ch