v1.0.0-rc.126 (#33)

This is an UNSTABLE release. If things go wrong with analysis, it is better to revert to 1.0.0-rc.124.

* jfjoch_broker: Fix bug for monoclinic space groups being wrongly refined when beta is much different from 90 deg.

Reviewed-on: #33
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>

.gitattributes

@@ -0,0 +1,2 @@
+*.mcs filter=lfs diff=lfs merge=lfs -text
+*.mcs.gz filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/build_and_test.yml

@@ -0,0 +1,213 @@
+name: Build Packages
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - '**'
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      create_release:
+        type: boolean
+        description: 'Create release'
+        required: false
+        default: false
+
+jobs:
+  build-rpm:
+    name: build:rpm (${{ matrix.distro }})
+    if: github.ref_type != 'workflow_dispatch'
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: jfjoch_rocky8
+            distro: rocky8
+            cmake_flags: -DJFJOCH_USE_CUDA=ON
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet8-cuda12/upload
+          - runner: jfjoch_rocky8
+            distro: rocky8_sls9
+            cmake_flags: -DJFJOCH_USE_CUDA=ON -DSLS9=ON
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet9-cuda12/upload
+          - runner: jfjoch_rocky8
+            distro: rocky8_nocuda
+            cmake_flags: -DJFJOCH_USE_CUDA=OFF
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet8-nocuda/upload
+          - runner: jfjoch_rocky9
+            distro: rocky9
+            cmake_flags: -DJFJOCH_USE_CUDA=ON
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet8-cuda13/upload
+          - runner: jfjoch_rocky9
+            distro: rocky9_sls9
+            cmake_flags: -DJFJOCH_USE_CUDA=ON -DSLS9=ON
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet9-cuda13/upload
+          - runner: jfjoch_rocky9
+            distro: rocky9_nocuda
+            cmake_flags: -DJFJOCH_USE_CUDA=OFF
+            pkg_glob: "*.rpm"
+            upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet8-nocuda/upload
+          - runner: jfjoch_ubuntu2204
+            distro: ubuntu2204
+            cmake_flags: -DJFJOCH_USE_CUDA=ON
+            pkg_glob: "*.deb"
+            upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/jammy/cuda13/upload
+          - runner: jfjoch_ubuntu2204
+            distro: ubuntu2204_nocuda
+            cmake_flags: -DJFJOCH_USE_CUDA=OFF
+            pkg_glob: "*.deb"
+            upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/jammy/nocuda/upload
+          - runner: jfjoch_ubuntu2404
+            distro: ubuntu2404
+            cmake_flags: -DJFJOCH_USE_CUDA=ON
+            pkg_glob: "*.deb"
+            upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/noble/cuda13/upload
+          - runner: jfjoch_ubuntu2404
+            distro: ubuntu2404_nocuda
+            cmake_flags: -DJFJOCH_USE_CUDA=OFF
+            pkg_glob: "*.deb"
+            upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/noble/nocuda/upload
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build packages
+        shell: bash
+        run: |
+          mkdir -p build
+          cd build
+          cmake -G Ninja -DJFJOCH_INSTALL_DRIVER_SOURCE=ON -DJFJOCH_VIEWER_BUILD=ON -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} ..
+          ninja frontend
+          ninja -j16 package
+      - name: Upload packages
+        if: github.ref_type == 'tag'
+        shell: bash
+        env:
+          TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
+        run: |
+          set -euo pipefail
+          cd build
+          shopt -s nullglob
+          files=(${{ matrix.pkg_glob }})
+          if [ ${#files[@]} -eq 0 ]; then
+            echo "No package files found for pattern: ${{ matrix.pkg_glob }}"
+            exit 1
+          fi
+          for file in "${files[@]}"; do
+            echo "Uploading $file -> ${{ matrix.upload_url }}"
+            curl --fail --user __token__:"$TOKEN" --upload-file "$file" "${{ matrix.upload_url }}"                      
+          done
+          
+          cd ..
+          
+          if [ "${{ matrix.distro }}" = "rocky8_nocuda" ]; then
+            for file in build/jfjoch-viewer*.rpm build/jfjoch-writer*rpm; do
+                 python3 gitea_upload_file.py "$file"
+            done
+          elif [ "${{ matrix.distro }}" = "rocky9_nocuda" ]; then
+            for file in build/jfjoch-viewer*.rpm build/jfjoch-writer*rpm; do
+                 python3 gitea_upload_file.py "$file"
+            done
+          elif [ "${{ matrix.distro }}" = "ubuntu2204_nocuda" ]; then
+            for file in build/jfjoch*viewer*.deb build/jfjoch*writer*.deb; do
+                 python3 gitea_upload_file.py "$file"
+            done
+          fi
+  python-client:
+    name: Generate python client
+    runs-on: jfjoch_rocky8
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build python client
+        shell: bash
+        run: bash gen_python_client.sh
+      - name: Upload Package to Gitea PyPI
+        if: github.ref_type == 'tag'
+        run: |
+          twine upload -u __token__ -p ${{ secrets.CI_PYPI_TOKEN }} --skip-existing dist/*
+          twine upload -u __token__ -p ${{ secrets.PIP_REPOSITORY_API_TOKEN }} --repository-url https://gitea.psi.ch/api/packages/mx/pypi dist/*
+  documentation:
+    name: Build documentation
+    runs-on: jfjoch_rocky8
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build documentation
+        shell: bash
+        run: bash make_doc.sh
+      - name: Upload documentation
+        if: github.ref_type == 'tag'
+        shell: bash
+        run: |
+          git config --global user.email "filip.leonarski@psi.ch"
+          git config --global user.name "Filip Leonarski (Gitea)"
+          git checkout --orphan gitea-pages
+          git reset --hard
+          # Remove everything except .git and public
+          git clean -fdx -e public -e .git
+  
+          # Move public contents to root and remove the now-empty public dir
+          shopt -s dotglob nullglob
+          mv public/* .
+          rm -rf public
+          git add .
+          git commit -m "Deploy site"
+          git push -f https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git gitea-pages
+  unit-tests:
+    name: Unit tests
+    runs-on: jfjoch_rocky8
+    if: github.ref_type != 'tag' && github.ref_type != 'workflow_dispatch'
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2511
+      options: --gpus all
+    timeout-minutes: 90
+    env:
+      CTEST_OUTPUT_ON_FAILURE: '1'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build tests
+        shell: bash
+        run: |
+          mkdir -p build
+          cd build
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          ninja -j48 jfjoch_test jfjoch_hdf5_test
+      - name: Run unit tests
+        shell: bash
+        run: |
+          cd build/tests
+          ./jfjoch_test
+      - name: Run hdf5 test
+        shell: bash
+        run: |
+          cd build/tools
+          ./jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5
+
+  create-release:
+    name: Create release
+    runs-on: jfjoch_rocky8
+    if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: 'true' # Optional; should be the default
+      - name: Configure auth and fetch LFS
+        shell: bash
+        env:
+          GITEA_TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
+        run: |
+          git lfs install --local
+          AUTH=$(git config --local http.${{ github.server_url }}/.extraheader)
+          git config --local --unset http.${{ github.server_url }}/.extraheader
+          git config --local http.${{ github.server_url }}/${{ github.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH"
+          git lfs pull
+      - name: Create release
+        env:
+          TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
+        shell: bash
+        run: |
+          python3 gitea_create_release.py

.gitlab-ci.yml

@@ -5,23 +5,8 @@ stages:
   - release
 
 variables:
-  CMAKE_PREFIX_PATH: /opt/qt6
-
-build:x86:gcc-11:
-  stage: build
-  variables:
-    CC: gcc
-    CXX: g++
-  tags:
-    - gcc
-    - x86
-  needs: []
-  script:
-    - mkdir build
-    - cd build
-    - source /opt/rh/gcc-toolset-11/enable
-    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_VIEWER_BUILD=ON ..
-    - make -j48
+  PKG_CONFIG_PATH: /opt/openssl-3.5.4/lib/pkgconfig:/opt/openssl-3.5.4/lib64/pkgconfig
+  CMAKE_PREFIX_PATH: /opt/qt-6.9.0-static:/opt/eigen-3.4
 
 build:x86:gcc-12:
   stage: build
@@ -109,8 +94,8 @@ build:x86:python_client:
     - bash gen_python_client.sh
   artifacts:
     paths:
-      - jfjoch_client-*whl
-      - jfjoch_client-*tar.gz
+      - dist/jfjoch_client-*whl
+      - dist/jfjoch_client-*tar.gz
     expire_in: 1 week
 
 build:x86:frontend:
@@ -145,7 +130,44 @@ build:x86:rpm:
     - mv *.rpm ..
   artifacts:
     paths:
-      - "*.rpm"
+      - "jfjoch-*.rpm"
+    expire_in: 1 week
+
+build:x86:rpm_nocuda:
+  stage: build
+  tags:
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-12/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_INSTALL_DRIVER_SOURCE=ON -DJFJOCH_VIEWER_BUILD=ON -DJFJOCH_USE_CUDA=OFF ..
+    - make frontend
+    - make -j48 package
+    - mv *.rpm ..
+  artifacts:
+    paths:
+      - "jfjoch-viewer*.rpm"
+    expire_in: 1 week
+
+
+build:x86:sls9:rpm:
+  stage: build
+  tags:
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-12/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_INSTALL_DRIVER_SOURCE=OFF -DJFJOCH_VIEWER_BUILD=OFF -DSLS9=ON ..
+    - make frontend
+    - make -j48 package
+    - mv *.rpm ..
+  artifacts:
+    paths:
+      - "jfjoch-slsdet9*.rpm"
     expire_in: 1 week
 
 test:x86:gcc:
@@ -377,6 +399,8 @@ release:
   dependencies:
     - build:x86:frontend
     - build:x86:rpm
+    - build:x86:rpm_nocuda
+    - build:x86:sls9:rpm
     - build:x86:python_client
   script:
     - bash gitlab_upload_release.sh

CMakeLists.txt

@@ -16,6 +16,9 @@ SET(JFJOCH_INSTALL_DRIVER_SOURCE OFF CACHE BOOL "Install kernel driver source (i
 SET(JFJOCH_USE_CUDA              ON CACHE BOOL "Compile Jungfraujoch with CUDA")
 SET(JFJOCH_VIEWER_BUILD          OFF CACHE BOOL "Compile Jungfraujoch viewer")
 
+SET (ZLIB_USE_STATIC_LIBS TRUE)
+
+OPTION(SLS9 "Build with sls_detector_package v9.2.0" OFF)
 
 SET(BUILD_SHARED_LIBS OFF)
 SET(BUILD_TESTING OFF)
@@ -32,30 +35,11 @@ SET(SLS_BUILD_SHARED_LIBRARIES OFF)
 SET(BUILD_FAST_INDEXER OFF)
 SET(BUILD_FAST_INDEXER_STATIC ON)
 
-SET(HDF5_ENABLE_SZIP_SUPPORT OFF)
-SET(HDF5_ENABLE_SZIP_ENCODING OFF)
-SET(HDF5_BUILD_EXAMPLES OFF)
-SET(HDF5_BUILD_CPP_LIB OFF)
-SET(HDF5_ENABLE_Z_LIB_SUPPORT OFF)
-SET(HDF5_EXTERNALLY_CONFIGURED 1)
-
-# TIFF
-SET(jbig OFF)
-SET(zstd OFF)
-SET(lzma OFF)
-SET(jpeg OFF)
-SET(old-jpeg OFF)
-
-# PNG
-set(PNG_SHARED OFF)
-set(PNG_STATIC ON)
-set(PNG_EXECUTABLES OFF)
-set(PNG_TESTS OFF)
-
 INCLUDE(CheckLanguage)
+INCLUDE(CheckIncludeFile)
 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")
 
@@ -65,6 +49,7 @@ IF (CMAKE_CUDA_COMPILER)
     IF (JFJOCH_USE_CUDA)
         ENABLE_LANGUAGE(CUDA)
         FIND_PACKAGE(CUDAToolkit REQUIRED)
+        SET(CMAKE_CUDA_RUNTIME_LIBRARY Static)
         MESSAGE(STATUS "CUDA VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
         ADD_COMPILE_DEFINITIONS(JFJOCH_USE_CUDA)
         FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
@@ -74,6 +59,14 @@ IF (CMAKE_CUDA_COMPILER)
     ENDIF()
 ENDIF()
 
+FIND_LIBRARY(FFTWF_LIBRARY NAMES libfftw3f.a libfftw3f.so fftw3f DOC "FFTW single-precision library"
+        PATHS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu/)
+CHECK_INCLUDE_FILE(fftw3.h HAS_FFTW3_H)
+
+IF(HAS_FFTW3_H AND FFTWF_LIBRARY)
+    ADD_COMPILE_DEFINITIONS(JFJOCH_USE_FFTW)
+ENDIF()
+
 INCLUDE_DIRECTORIES(include)
 INCLUDE(CheckIncludeFile)
 
@@ -83,31 +76,21 @@ CHECK_INCLUDE_FILE(numa.h HAS_NUMA_H)
 
 include(FetchContent)
 
-FetchContent_Declare(tiff
-        GIT_REPOSITORY https://github.com/fleon-psi/libtiff
-        GIT_TAG v4.6.0
-        EXCLUDE_FROM_ALL)
-
-FetchContent_Declare(
-        png
-        GIT_REPOSITORY  https://github.com/pnggroup/libpng
-        GIT_TAG        v1.6.49
-        EXCLUDE_FROM_ALL
-)
-
-FetchContent_Declare(hdf5
-        GIT_REPOSITORY https://github.com/HDFGroup/hdf5/
-        GIT_TAG hdf5_1.14.5
-        GIT_SHALLOW 1
-        EXCLUDE_FROM_ALL)
-
 SET(PISTACHE_USE_CONTENT_ENCODING_DEFLATE ON)
 SET(PISTACHE_BUILD_TESTS OFF)
+SET(PISTACHE_USE_SSL ON)
+
+SET(HDF5_ENABLE_SZIP_SUPPORT OFF)
+SET(HDF5_ENABLE_SZIP_ENCODING OFF)
+SET(HDF5_BUILD_EXAMPLES OFF)
+SET(HDF5_BUILD_CPP_LIB OFF)
+SET(HDF5_ENABLE_Z_LIB_SUPPORT ON)
+SET(HDF5_EXTERNALLY_CONFIGURED 1)
 
 FetchContent_Declare(
         pistache_http
         GIT_REPOSITORY https://github.com/fleon-psi/pistache
-        GIT_TAG        280b0f6f28f81745870bccb31f4a3a59958807f6
+        GIT_TAG        0393f6c
         EXCLUDE_FROM_ALL
 )
 
@@ -119,10 +102,21 @@ FetchContent_Declare(
         EXCLUDE_FROM_ALL
 )
 
+FetchContent_Declare(hdf5
+        GIT_REPOSITORY https://github.com/HDFGroup/hdf5/
+        GIT_TAG hdf5_1.14.6
+        GIT_SHALLOW 1
+        EXCLUDE_FROM_ALL)
+
+SET(SLS_DETECTOR_GIT_TAG "8.0.2")
+IF(SLS9)
+    SET(SLS_DETECTOR_GIT_TAG "9.2.0")
+ENDIF()
+
 FetchContent_Declare(
         sls_detector_package
         GIT_REPOSITORY https://github.com/slsdetectorgroup/slsDetectorPackage
-        GIT_TAG 8.0.2
+        GIT_TAG ${SLS_DETECTOR_GIT_TAG}
 )
 
 FetchContent_Declare(
@@ -132,7 +126,7 @@ FetchContent_Declare(
         EXCLUDE_FROM_ALL
 )
 
-FetchContent_MakeAvailable(pistache_http zstd sls_detector_package catch2 hdf5 tiff png)
+FetchContent_MakeAvailable(pistache_http zstd sls_detector_package catch2 hdf5)
 
 ADD_SUBDIRECTORY(jungfrau)
 ADD_SUBDIRECTORY(compression)
@@ -143,6 +137,7 @@ ADD_SUBDIRECTORY(reader)
 ADD_SUBDIRECTORY(detector_control)
 ADD_SUBDIRECTORY(image_puller)
 ADD_SUBDIRECTORY(preview)
+ADD_SUBDIRECTORY(symmetry)
 
 IF (JFJOCH_WRITER_ONLY)
     MESSAGE(STATUS "Compiling HDF5 writer only")
@@ -189,44 +184,96 @@ IF (NOT JFJOCH_WRITER_ONLY)
 ENDIF()
 
 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  SET(CMAKE_INSTALL_PREFIX /opt/jfjoch CACHE PATH "Default directory" FORCE)
+    SET(CMAKE_INSTALL_PREFIX /opt/jfjoch CACHE PATH "Default directory" FORCE)
 ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 # Set Package Name
 # Initialize CPACK_COMPONENTS_ALL with common components
-SET(CPACK_COMPONENTS_ALL jfjoch writer)
+set(CPACK_COMPONENTS_ALL jfjoch writer)
+
 SET(CPACK_PACKAGE_NAME "jfjoch")
-SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/src /usr/share /usr/share/dbus-1 /usr/share/dbus-1/services)
 
-IF (JFJOCH_INSTALL_DRIVER_SOURCE)
-    LIST(APPEND CPACK_COMPONENTS_ALL driver-dkms)
-    SET(CPACK_RPM_DRIVER-DKMS_PACKAGE_REQUIRES "dkms, gcc, bash, sed")
-    SET(CPACK_RPM_DRIVER-DKMS_PACKAGE_ARCHITECTURE "noarch")
-    SET(CPACK_RPM_DRIVER-DKMS_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/postinstall.sh)
-    SET(CPACK_RPM_DRIVER-DKMS_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/preuninstall.sh)
-ELSE()
-    SET(CPACK_COMPONENTS_ALL jfjoch writer)
-ENDIF()
+# Add optional components
+if (JFJOCH_INSTALL_DRIVER_SOURCE)
+    list(APPEND CPACK_COMPONENTS_ALL driver-dkms)
+else()
+    set(CPACK_COMPONENTS_ALL jfjoch writer)
+endif()
 
-IF (JFJOCH_VIEWER_BUILD)
-    LIST(APPEND CPACK_COMPONENTS_ALL viewer)
-ENDIF()
+if (JFJOCH_VIEWER_BUILD)
+    list(APPEND CPACK_COMPONENTS_ALL viewer)
+endif()
 
-SET(CPACK_GENERATOR RPM)
-SET(CPACK_RPM_COMPONENT_INSTALL ON)
-SET(CPACK_RPM_MAIN_COMPONENT jfjoch)
-SET(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
-SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
-SET(CPACK_RPM_PACKAGE_VERSION ${JFJOCH_VERSION})
-SET(CPACK_RPM_PACKAGE_RELEASE 1)
-SET(CPACK_RPM_PACKAGE_SUMMARY "Jungfraujoch data acquisition system")
-SET(CPACK_RPM_PACKAGE_DESCRIPTION "Jungfraujoch")
+# Common metadata
+set(CPACK_PACKAGE_CONTACT "Filip Leonarski <filip.leonarski@psi.ch>")
+set(CPACK_PACKAGE_VENDOR "Paul Scherrer Institut")
+set(CPACK_PACKAGE_VERSION ${JFJOCH_VERSION})
 
-SET(CPACK_PACKAGE_CONTACT "Filip Leonarski <filip.leonarski@psi.ch>")
-# Set The Vendor Name
-SET(CPACK_PACKAGE_VENDOR "Paul Scherrer Institut")
+# OS-aware packaging: DEB on Debian/Ubuntu, RPM on RHEL/Rocky
+if (EXISTS "/etc/debian_version")
+    set(CPACK_PACKAGE_LICENSE "GPL-3.0-only")
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+
+    # Debian/Ubuntu: .deb with components
+    set(CPACK_GENERATOR "DEB")
+    set(CPACK_DEB_COMPONENT_INSTALL ON)
+    set(CPACK_DEBIAN_MAIN_COMPONENT broker)
+    set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+
+    # Enable automatic shlib dependency discovery
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
+    # Optional DEB metadata (tune as needed)
+    set(CPACK_DEBIAN_PACKAGE_SECTION "science")
+    # set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://example.org/jfjoch")
+
+    # DKMS component (maps from RPM settings)
+    if (JFJOCH_INSTALL_DRIVER_SOURCE)
+        # Dependencies and arch for the DKMS component
+        # Note: component name "driver-dkms" maps to variable suffix "DRIVER_DKMS"
+        set(CPACK_DEBIAN_DRIVER_DKMS_PACKAGE_DEPENDS "dkms, gcc, bash, sed")
+        set(CPACK_DEBIAN_DRIVER_DKMS_PACKAGE_ARCHITECTURE "all")
+
+        # Provide Debian control scripts (postinst/prerm).
+        # We rename existing scripts to Debian control names at configure time.
+        set(_dkms_ctrl_dir "${CMAKE_CURRENT_BINARY_DIR}/cpack-debian-driver-dkms")
+        file(MAKE_DIRECTORY "${_dkms_ctrl_dir}")
+        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/postinstall.sh
+                ${_dkms_ctrl_dir}/postinst COPYONLY)
+        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/preuninstall.sh
+                ${_dkms_ctrl_dir}/prerm COPYONLY)
+        set(CPACK_DEBIAN_DRIVER_DKMS_PACKAGE_CONTROL_EXTRA
+                "${_dkms_ctrl_dir}/postinst;${_dkms_ctrl_dir}/prerm")
+    endif()
+
+elseif (EXISTS "/etc/redhat-release")
+    # RHEL/Rocky: .rpm with components (original behavior)
+    set(CPACK_GENERATOR "RPM")
+    set(CPACK_RPM_COMPONENT_INSTALL ON)
+    set(CPACK_RPM_MAIN_COMPONENT jfjoch)
+    set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
+    set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+    set(CPACK_RPM_PACKAGE_VERSION ${JFJOCH_VERSION})
+    set(CPACK_RPM_PACKAGE_RELEASE 1)
+    set(CPACK_RPM_PACKAGE_SUMMARY "Jungfraujoch data acquisition system")
+    set(CPACK_RPM_PACKAGE_DESCRIPTION "Jungfraujoch")
+    set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
+    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+            /usr/src /usr/share /usr/share/dbus-1 /usr/share/dbus-1/services /usr/share/pixmaps /usr/share/applications)
+
+    # DKMS component scripts and requirements for RPM
+    if (JFJOCH_INSTALL_DRIVER_SOURCE)
+        set(CPACK_RPM_DRIVER-DKMS_PACKAGE_REQUIRES "dkms, gcc, bash, sed")
+        set(CPACK_RPM_DRIVER-DKMS_PACKAGE_ARCHITECTURE "noarch")
+        set(CPACK_RPM_DRIVER-DKMS_POST_INSTALL_SCRIPT_FILE
+                ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/postinstall.sh)
+        set(CPACK_RPM_DRIVER-DKMS_PRE_UNINSTALL_SCRIPT_FILE
+                ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/preuninstall.sh)
+    endif()
+else()
+    # Fallback if OS is unknown
+    set(CPACK_GENERATOR "TGZ")
+endif()
 
-# Set The License Information
-SET(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
 
 INCLUDE(CPack)

VERSION

@@ -1 +1 @@
-1.0.0-rc.64
+1.0.0-rc.126

acquisition_device/AcquisitionDevice.cpp

@@ -323,6 +323,7 @@ void AcquisitionDevice::RunInternalGenerator(const DiffractionExperiment &experi
     FrameGeneratorConfig config{};
     config.frames = experiment.GetFrameNum() + DELAY_FRAMES_STOP_AND_QUIT + 1;
     config.modules = experiment.GetModulesNum(data_stream);
+    config.data_stream = data_stream;
     config.pulse_id = INT_PKT_GEN_BUNCHID;
     config.exptime = INT_PKT_GEN_EXPTTIME;
     config.debug = INT_PKT_GEN_DEBUG;

acquisition_device/FPGAAcquisitionDevice.cpp

@@ -225,6 +225,7 @@ void FPGAAcquisitionDevice::FillActionRegister(const DiffractionExperiment& x, D
     job.nstorage_cells      = x.GetStorageCellNumber() - 1;
     job.mode                = data_collection_id << 16;
     job.nsummation          = x.GetFPGASummation() - 1;
+    job.data_stream         = data_stream;
 
     expected_descriptors_per_module = DMA_DESCRIPTORS_PER_MODULE;
 
@@ -255,10 +256,15 @@ void FPGAAcquisitionDevice::FillActionRegister(const DiffractionExperiment& x, D
         job.sqrtmult = x.GetLossyCompressionPoisson().value();
     }
 
-    if (x.GetPixelValueLowThreshold()) {
-        job.mode |= MODE_THRESHOLD;
-        job.pxlthreshold = x.GetPixelValueLowThreshold().value();
-    }
+    if (x.GetPixelValueLowThreshold())
+        job.pxlthreshold_min = x.GetPixelValueLowThreshold().value();
+    else
+        job.pxlthreshold_min = INT32_MIN;
+
+    if (x.GetPixelValueHighThreshold())
+        job.pxlthreshold_max = x.GetPixelValueHighThreshold().value();
+    else
+        job.pxlthreshold_max = INT32_MIN;
 }
 
 void FPGAAcquisitionDevice::Start(const DiffractionExperiment &experiment, uint32_t flag) {

acquisition_device/HLSSimulatedDevice.cpp

@@ -10,12 +10,8 @@ HLSSimulatedDevice::HLSSimulatedDevice(uint16_t data_stream, size_t in_frame_buf
 
     max_modules = MAX_MODULES_FPGA;
 
-    if (data_stream != 0)
-        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
-                              "HLS simulation can only work with 1 data_stream, due to use of static variables");
     MapBuffersStandard(in_frame_buffer_size_modules, numa_node);
 
-
     device = std::make_unique<HLSDevice>(buffer_device);
 }
 

broker/CMakeLists.txt

@@ -1,22 +1,22 @@
+# OpenAPI definition
+INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )
+
+# OpenAPI model
 AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
+ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES})
+TARGET_INCLUDE_DIRECTORIES(JFJochAPI PUBLIC gen/model)
 
-ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES} gen/api/DefaultApi.cpp gen/api/DefaultApi.h)
-
-TARGET_LINK_LIBRARIES(JFJochAPI pistache_static)
-TARGET_INCLUDE_DIRECTORIES(JFJochAPI PUBLIC gen/model gen/api)
-
+# Jungfraujoch Broker (abstract from HTTP service)
 ADD_LIBRARY(JFJochBroker STATIC
         JFJochStateMachine.cpp JFJochStateMachine.h
         JFJochServices.cpp JFJochServices.h
-        JFJochBrokerHttp.cpp JFJochBrokerHttp.h JFJochBrokerParser.cpp JFJochBrokerParser.h
-        OpenAPIConvert.h
-        OpenAPIConvert.cpp)
+        JFJochBrokerParser.cpp JFJochBrokerParser.h
+        OpenAPIConvert.h OpenAPIConvert.cpp)
 
 TARGET_LINK_LIBRARIES(JFJochBroker JFJochReceiver JFJochDetector JFJochCommon JFJochAPI JFJochPreview)
 
-ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker)
-
+ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp JFJochBrokerHttp.cpp JFJochBrokerHttp.h
+        gen/api/DefaultApi.cpp gen/api/DefaultApi.h gen/api/ApiBase.h gen/api/ApiBase.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker pistache_static ${CMAKE_DL_LIBS})
+TARGET_INCLUDE_DIRECTORIES(jfjoch_broker PUBLIC gen/api)
 INSTALL(TARGETS jfjoch_broker RUNTIME COMPONENT jfjoch)
-
-INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )

broker/JFJochBrokerHttp.cpp

@@ -9,9 +9,11 @@
 #include "OpenAPIConvert.h"
 #include "../preview/JFJochTIFF.h"
 
-JFJochBrokerHttp::JFJochBrokerHttp(const DiffractionExperiment &experiment, std::shared_ptr<Pistache::Rest::Router> &rtr)
+JFJochBrokerHttp::JFJochBrokerHttp(const DiffractionExperiment &experiment,
+    const SpotFindingSettings& spot_finding_settings,
+    std::shared_ptr<Pistache::Rest::Router> &rtr)
         : DefaultApi(rtr),
-          state_machine(experiment, services, logger) {
+          state_machine(experiment, services, logger, spot_finding_settings) {
     Pistache::Rest::Routes::Get(*rtr, "/", Pistache::Rest::Routes::bind(&JFJochBrokerHttp::GetStaticFile, this));
     Pistache::Rest::Routes::Get(*rtr, "/frontend", Pistache::Rest::Routes::bind(&JFJochBrokerHttp::GetStaticFile, this));
     Pistache::Rest::Routes::Get(*rtr, "/frontend/*", Pistache::Rest::Routes::bind(&JFJochBrokerHttp::GetStaticFile, this));
@@ -82,7 +84,7 @@ void JFJochBrokerHttp::wait_till_done_post(const std::optional<int32_t> &timeout
             throw WrongDAQStateException(status.message.value_or("Unknown error"));
         case JFJochState::Measuring:
         case JFJochState::Busy:
-        case JFJochState::Pedestal:
+        case JFJochState::Calibration:
             response.send(Pistache::Http::Code::Gateway_Timeout);
             break;
     }
@@ -412,6 +414,7 @@ void JFJochBrokerHttp::statistics_get(const std::optional<bool> &compression, Pi
     statistics.setAzInt(Convert(state_machine.GetRadialIntegrationSettings()));
     statistics.setBuffer(Convert(state_machine.GetImageBufferStatus()));
     statistics.setIndexing(Convert(state_machine.GetIndexingSettings()));
+    statistics.setDarkMask(Convert(state_machine.GetDarkMaskSettings()));
 
     auto zeromq_prev = state_machine.GetPreviewSocketSettings();
     if (!zeromq_prev.address.empty())
@@ -477,6 +480,7 @@ void JFJochBrokerHttp::image_buffer_image_jpeg_get(const std::optional<int64_t>
                                                    const std::optional<int64_t> &jpegQuality,
                                                    const std::optional<float> &showResRing,
                                                    const std::optional<std::string> &color,
+                                                   const std::optional<bool> &showResEst,
                                                    Pistache::Http::ResponseWriter &response)  {
     int64_t image_id = id.value_or(ImageBuffer::MaxImage);
     PreviewImageSettings settings{};
@@ -484,9 +488,15 @@ void JFJochBrokerHttp::image_buffer_image_jpeg_get(const std::optional<int64_t>
     settings.show_user_mask = showUserMask.value_or(true);
     settings.show_roi = showRoi.value_or(false);
     settings.show_spots = showSpots.value_or(true);
-    settings.saturation_value = saturation.value_or(10);
+    settings.saturation_value = saturation;
+    settings.background_value = 0.0;
     settings.jpeg_quality = jpegQuality.value_or(100);
-    settings.resolution_ring = showResRing;
+    if (showResEst.value_or(false))
+        settings.show_res_est = true;
+    else {
+        settings.show_res_est = false;
+        settings.resolution_ring = showResRing;
+    }
     settings.scale = ConvertColorScale(color);
     settings.show_beam_center = showBeamCenter.value_or(true);
     settings.format = PreviewImageFormat::JPEG;
@@ -497,35 +507,6 @@ void JFJochBrokerHttp::image_buffer_image_jpeg_get(const std::optional<int64_t>
         response.send(Pistache::Http::Code::Not_Found);
 }
 
-void JFJochBrokerHttp::image_buffer_image_png_get(const std::optional<int64_t> &id,
-                                                   const std::optional<bool> &showUserMask,
-                                                   const std::optional<bool> &showRoi,
-                                                   const std::optional<bool> &showSpots,
-                                                   const std::optional<bool> &showBeamCenter,
-                                                   const std::optional<float> &saturation,
-                                                   const std::optional<int64_t> &jpegQuality,
-                                                   const std::optional<float> &showResRing,
-                                                   const std::optional<std::string> &color,
-                                                   Pistache::Http::ResponseWriter &response)  {
-    int64_t image_id = id.value_or(ImageBuffer::MaxImage);
-    PreviewImageSettings settings{};
-
-    settings.show_user_mask = showUserMask.value_or(true);
-    settings.show_roi = showRoi.value_or(false);
-    settings.show_spots = showSpots.value_or(true);
-    settings.saturation_value = saturation.value_or(10);
-    settings.jpeg_quality = jpegQuality.value_or(100);
-    settings.resolution_ring = showResRing;
-    settings.scale = ConvertColorScale(color);
-    settings.show_beam_center = showBeamCenter.value_or(true);
-    settings.format = PreviewImageFormat::PNG;
-    std::string s = state_machine.GetPreviewJPEG(settings, image_id);
-    if (!s.empty())
-        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/jpeg"));
-    else
-        response.send(Pistache::Http::Code::Not_Found);
-}
-
 void
 JFJochBrokerHttp::image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) {
     int64_t image_id = ImageBuffer::MaxImage;
@@ -567,7 +548,8 @@ void JFJochBrokerHttp::config_file_writer_put(
 }
 
 void JFJochBrokerHttp::preview_plot_get(const std::optional<std::string> &type, const std::optional<int32_t> &binning,
-                                        const std::optional<bool> &compression, const std::optional<bool> &experimentalCoord,
+                                        const std::optional<bool> &compression, const std::optional<float> &fill,
+                                        const std::optional<bool> &experimentalCoord,
                                         const std::optional<std::string> &azintUnit, Pistache::Http::ResponseWriter &response) {
     PlotAzintUnit unit = PlotAzintUnit::Q_recipA;
     if (azintUnit.has_value()) {
@@ -581,9 +563,10 @@ void JFJochBrokerHttp::preview_plot_get(const std::optional<std::string> &type,
 
     PlotRequest req{
         .type = ConvertPlotType(type),
-        .binning = 0,
+        .binning = 1,
         .experimental_coord = experimentalCoord.value_or(false),
-        .azint_unit = unit
+        .azint_unit = unit,
+        .fill_value = fill
     };
 
     if (binning) {
@@ -596,6 +579,21 @@ void JFJochBrokerHttp::preview_plot_get(const std::optional<std::string> &type,
     ProcessOutput(Convert(plot), response, compression.value_or(false));
 }
 
+void JFJochBrokerHttp::preview_plot_bin_get(const std::optional<std::string> &type,
+                                            const std::optional<std::string> &roi,
+                                            Pistache::Http::ResponseWriter &response) {
+    std::vector<float> ret;
+    state_machine.GetPlotRaw(ret, ConvertPlotType(type), roi.value_or(""));
+
+    if (ret.empty())
+        response.send(Pistache::Http::Code::Ok);
+    else
+        response.send(Pistache::Http::Code::Ok,
+                      reinterpret_cast<const char *>(ret.data()),
+                      ret.size() * sizeof(float),
+                      Pistache::Http::Mime::MediaType::fromString("application/octet-stream"));
+}
+
 void JFJochBrokerHttp::config_indexing_get(Pistache::Http::ResponseWriter &response) {
     ProcessOutput(Convert(state_machine.GetIndexingSettings()), response);
 }
@@ -613,3 +611,12 @@ void JFJochBrokerHttp::result_scan_get(Pistache::Http::ResponseWriter &response)
     else
         response.send(Pistache::Http::Code::Not_Found);
 }
+
+void JFJochBrokerHttp::config_dark_mask_put(const org::openapitools::server::model::Dark_mask_settings &darkMaskSettings, Pistache::Http::ResponseWriter &response) {
+    state_machine.SetDarkMaskSettings(Convert(darkMaskSettings));
+    response.send(Pistache::Http::Code::Ok);
+}
+
+void JFJochBrokerHttp::config_dark_mask_get(Pistache::Http::ResponseWriter &response) {
+    ProcessOutput(Convert(state_machine.GetDarkMaskSettings()), response);
+}

broker/JFJochBrokerHttp.h

@@ -108,12 +108,12 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
         if(!output.validate(s)) {
             logger.Error(s.str());
             response.send(Pistache::Http::Code::Internal_Server_Error, s.str(), MIME(Text, Plain));
+        } else {
+            nlohmann::json j = output;
+            if (compression)
+                response.setCompression(Pistache::Http::Header::Encoding::Deflate);
+            response.send(Pistache::Http::Code::Ok, j.dump(), MIME(Application, Json));
         }
-
-        nlohmann::json j = output;
-        if (compression)
-            response.setCompression(Pistache::Http::Header::Encoding::Deflate);
-        response.send(Pistache::Http::Code::Ok, j.dump(), MIME(Application, Json));
     }
 
     void version_get(Pistache::Http::ResponseWriter &response) override;
@@ -147,6 +147,7 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
 
     void image_buffer_image_cbor_get(const std::optional<int64_t> &id,
                                      Pistache::Http::ResponseWriter &response) override;
+
     void image_buffer_image_jpeg_get(const std::optional<int64_t> &id,
                                      const std::optional<bool> &showUserMask,
                                      const std::optional<bool> &showRoi,
@@ -156,17 +157,8 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
                                      const std::optional<int64_t> &jpegQuality,
                                      const std::optional<float> &showResRing,
                                      const std::optional<std::string> &color,
+                                     const std::optional<bool> &showResEst,
                                      Pistache::Http::ResponseWriter &response) override;
-    void image_buffer_image_png_get(const std::optional<int64_t> &id,
-                                    const std::optional<bool> &showUserMask,
-                                    const std::optional<bool> &showRoi,
-                                    const std::optional<bool> &showSpots,
-                                    const std::optional<bool> &showBeamCenter,
-                                    const std::optional<float> &saturation,
-                                    const std::optional<int64_t> &jpegQuality,
-                                    const std::optional<float> &showResRing,
-                                    const std::optional<std::string> &color,
-                                    Pistache::Http::ResponseWriter &response) override;
 
     void image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) override;
 
@@ -174,8 +166,12 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
 
     void image_buffer_status_get(Pistache::Http::ResponseWriter &response) override;
     void preview_plot_get(const std::optional<std::string> &type, const std::optional<int32_t> &binning,
-                          const std::optional<bool> &compression, const std::optional<bool> &experimentalCoord,
-                          const std::optional<std::string> &azintUnit, Pistache::Http::ResponseWriter &response) override;
+                          const std::optional<bool> &compression, const std::optional<float> &fill,
+                          const std::optional<bool> &experimentalCoord, const std::optional<std::string> &azintUnit,
+                          Pistache::Http::ResponseWriter &response) override;
+
+    void preview_plot_bin_get(const std::optional<std::string> &type, const std::optional<std::string> &roi,
+                              Pistache::Http::ResponseWriter &response) override;
 
     void config_indexing_get(Pistache::Http::ResponseWriter &response) override;
 
@@ -183,8 +179,15 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
                              Pistache::Http::ResponseWriter &response) override;
 
     void result_scan_get(Pistache::Http::ResponseWriter &response) override;
+
+    void config_dark_mask_get(Pistache::Http::ResponseWriter &response) override;
+    void config_dark_mask_put(const org::openapitools::server::model::Dark_mask_settings &darkMaskSettings,
+        Pistache::Http::ResponseWriter &response) override;
 public:
-    JFJochBrokerHttp(const DiffractionExperiment& experiment, std::shared_ptr<Pistache::Rest::Router> &rtr);
+    JFJochBrokerHttp(const DiffractionExperiment& experiment,
+        const SpotFindingSettings &spot_finding_settings,
+        std::shared_ptr<Pistache::Rest::Router> &rtr);
+
     void AddDetectorSetup(const DetectorSetup &setup);
     JFJochServices& Services();
 

broker/JFJochBrokerParser.cpp

@@ -12,7 +12,7 @@
 
 DetectorGeometryModular ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j) {
     auto s = j.getStandardGeometry();
-    return DetectorGeometryModular(s.getNmodules(), s.getModulesInRow(), s.getGapX(), s.getGapY(), false);
+    return DetectorGeometryModular(s.getNmodules(), s.getModulesInRow(), s.getGapX(), s.getGapY(), j.isMirrorY());
 }
 
 DetectorModuleGeometry::Direction Convert(const org::openapitools::server::model::Detector_module_direction& d) {
@@ -50,7 +50,7 @@ DetectorGeometryModular ParseCustomDetectorGeometry(const org::openapitools::ser
         auto slow = Convert(iter.getSlowAxis());
         modules.emplace_back(iter.getX0(), iter.getY0(), fast, slow);
     }
-    return DetectorGeometryModular(modules, false);
+    return DetectorGeometryModular(modules, j.isMirrorY());
 }
 
 
@@ -86,8 +86,6 @@ DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detecto
     }
 
     DetectorGeometryModular geom = ParseDetectorGeometry(d);
-    if (d.isMirrorY())
-        geom.VerticalFlip();
 
     DetectorSetup setup(geom, detector_type, d.getDescription(), d.getHostname());
 
@@ -139,6 +137,12 @@ DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detecto
     if (d.minimumFrameTimeUsIsSet())
         setup.MinFrameTime(std::chrono::microseconds(d.getMinimumFrameTimeUs()));
 
+    if (d.defaultSettingsIsSet())
+        setup.DefaultSettings(Convert(d.getDefaultSettings()));
+
+    if (d.tempThresoldDegCIsSet())
+        setup.TempThreshold_degC(d.getTempThresoldDegC());
+
     return setup;
 }
 
@@ -160,6 +164,9 @@ void ParseFacilityConfiguration(const org::openapitools::server::model::Jfjoch_s
 
     if (j.indexingIsSet())
         experiment.ImportIndexingSettings(Convert(j.getIndexing()));
+
+    if (j.darkMaskIsSet())
+        experiment.ImportDarkMaskSettings(Convert(j.getDarkMask()));
 }
 
 std::unique_ptr<ImagePusher> ParseZMQImagePusher(const org::openapitools::server::model::Jfjoch_settings &j) {
@@ -228,3 +235,9 @@ void ParseReceiverSettings(const org::openapitools::server::model::Jfjoch_settin
         service.MetadataSocketSettings(Convert(input.getZeromqMetadata()));
     }
 }
+
+SpotFindingSettings ParseSpotFindingSettings(const org::openapitools::server::model::Jfjoch_settings &input) {
+    if (input.spotFindingIsSet())
+        return Convert(input.getSpotFinding());
+    return SpotFindingSettings();
+}

broker/JFJochBrokerParser.h

@@ -21,5 +21,6 @@ std::unique_ptr<ImagePusher> ParseImagePusher(const org::openapitools::server::m
 
 void ParseAcquisitionDeviceGroup(const org::openapitools::server::model::Jfjoch_settings &input, AcquisitionDeviceGroup &aq_devices);
 void ParseReceiverSettings(const org::openapitools::server::model::Jfjoch_settings &input, JFJochReceiverService &service);
+SpotFindingSettings ParseSpotFindingSettings(const org::openapitools::server::model::Jfjoch_settings &input);
 
 #endif //JUNGFRAUJOCH_JFJOCHBROKERPARSER_H

broker/JFJochServices.cpp

@@ -10,18 +10,14 @@ JFJochServices::JFJochServices(Logger &in_logger) : logger(in_logger) {}
 
 void JFJochServices::Start(const DiffractionExperiment& experiment,
                            const PixelMask &pixel_mask,
-                           const JFCalibration &calibration) {
+                           const JFCalibration *calibration) {
     logger.Info("Measurement start for: {}", experiment.GetFilePrefix());
 
     cannot_stop_detector = false;
 
     if (receiver != nullptr) {
         logger.Info("   ... receiver start");
-        if (experiment.IsJungfrauConvPhotonCnt())
-            receiver->Start(experiment, pixel_mask, &calibration);
-        else
-            receiver->Start(experiment, pixel_mask, nullptr);
-
+        receiver->Start(experiment, pixel_mask, calibration);
         if (detector && !experiment.IsUsingInternalPacketGen()) {
             logger.Info("   ... detector start");
             detector->Start(experiment);
@@ -32,8 +28,10 @@ void JFJochServices::Start(const DiffractionExperiment& experiment,
 }
 
 void JFJochServices::Off() {
-    if (detector)
+    if (detector) {
         detector->Deactivate();
+        detector.reset();
+    }
 }
 
 void JFJochServices::On(DiffractionExperiment &x) {
@@ -154,6 +152,11 @@ MultiLinePlot JFJochServices::GetPlots(const PlotRequest &request) {
     return receiver->GetDataProcessingPlot(request);
 }
 
+void JFJochServices::GetPlotRaw(std::vector<float> &v, PlotType type, const std::string &roi) {
+    if (receiver != nullptr)
+        receiver->GetPlotRaw(v, type, roi);
+}
+
 void JFJochServices::SetSpotFindingSettings(const SpotFindingSettings &settings) {
     if (receiver)
         receiver->SetSpotFindingSettings(settings);
@@ -262,3 +265,8 @@ void JFJochServices::LoadDetectorPixelMask(PixelMask &mask) {
     if (detector)
         detector->LoadPixelMask(mask);
 }
+
+void JFJochServices::SetupIndexing(const IndexingSettings &input) {
+    if (receiver)
+        receiver->Indexing(input);
+}

broker/JFJochServices.h

@@ -27,7 +27,7 @@ public:
     void ConfigureDetector(const DiffractionExperiment& experiment);
     void Start(const DiffractionExperiment& experiment,
                const PixelMask &pixel_mask,
-               const JFCalibration &calibration);
+               const JFCalibration *calibration = nullptr);
     JFJochServicesOutput Stop();
     void Cancel();
     void Trigger();
@@ -38,6 +38,7 @@ public:
     std::optional<JFJochReceiverStatus> GetReceiverStatus() const;
     std::optional<float> GetReceiverProgress() const;
     MultiLinePlot GetPlots(const PlotRequest &request);
+    void GetPlotRaw(std::vector<float> &v, PlotType type, const std::string &roi);
 
     void SetSpotFindingSettings(const SpotFindingSettings &settings);
     JFJochServices& Receiver(JFJochReceiverService *input);
@@ -64,6 +65,8 @@ public:
     void ClearImageBuffer() const;
 
     void LoadDetectorPixelMask(PixelMask &mask);
+
+    void SetupIndexing(const IndexingSettings& input);
 };
 
 

broker/JFJochStateMachine.cpp

@@ -5,29 +5,25 @@
 
 #include "JFJochStateMachine.h"
 #include "../preview/JFJochTIFF.h"
-#include "pistache/net.h"
 #include "../common/CUDAWrapper.h"
 
 JFJochStateMachine::JFJochStateMachine(const DiffractionExperiment& in_experiment,
                                        JFJochServices &in_services,
-                                       Logger &in_logger)
-    : experiment(in_experiment),
-      logger(in_logger),
-      services(in_services),
-      pixel_mask(experiment),
-      current_detector_setup(0),
-      data_processing_settings(DiffractionExperiment::DefaultDataProcessingSettings()),
-      pixel_mask_statistics({0, 0, 0}),
-      gpu_count(get_gpu_count()) {
+                                       Logger &in_logger,
+                                       const SpotFindingSettings &spot_finding_settings)
+        : logger(in_logger),
+          services(in_services),
+          experiment(in_experiment),
+          pixel_mask(experiment),
+          current_detector_setup(0),
+          data_processing_settings(spot_finding_settings),
+          pixel_mask_statistics({0, 0, 0}),
+          gpu_count(get_gpu_count()) {
 
     indexing_possible =  (get_gpu_count() >= 0);
     if (!indexing_possible)
         data_processing_settings.indexing = false;
 
-    resolution_estimate_possible = !experiment.GetInferenceServerAddress().empty();
-    if (!resolution_estimate_possible)
-        data_processing_settings.resolution_estimate = false;
-
     SupressTIFFErrors();
 }
 
@@ -63,58 +59,92 @@ bool JFJochStateMachine::ImportPedestalG1G2(const JFJochReceiverOutput &receiver
     return true;
 }
 
-void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock<std::mutex> &ul) {
-    if (experiment.GetDetectorSetup().GetDetectorType() != DetectorType::JUNGFRAU) {
-        try {
-            logger.Info("EIGER configuration");
-            services.ConfigureDetector(experiment);
-            logger.Info("   ... done ");
-            SetState(JFJochState::Idle,
-                     "Detector configured",
-                     BrokerStatus::MessageSeverity::Success);
-            return;
-        } catch (const std::exception &e) {
-            logger.Error("Configuration error {}", e.what());
-            SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
-            throw;
-        }
-    }
-
-    calibration = std::make_unique<JFCalibration>(experiment);
-
+void JFJochStateMachine::CalibrateJUNGFRAU(std::unique_lock<std::mutex> &ul) {
     if (!gain_calibration.empty()) {
         if (gain_calibration.size() != experiment.GetModulesNum())
-            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Mismatch in gain files number");
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "Mismatch in gain files number");
         for (int i = 0; i < gain_calibration.size(); i++)
             calibration->GainCalibration(i) = gain_calibration[i];
     }
 
+    TakePedestalInternalG0(ul);
+    if (!experiment.IsFixedGainG1()) {
+        for (int i = 0; i < experiment.GetStorageCellNumber(); i++) {
+            TakePedestalInternalG1(ul, i);
+            TakePedestalInternalG2(ul, i);
+        }
+    }
+    pixel_mask.LoadDetectorBadPixelMask(experiment, calibration.get());
+}
+
+void JFJochStateMachine::CalibrateDetector(std::unique_lock<std::mutex> &ul) {
     cancel_sequence = false;
 
-    logger.Info("Pedestal sequence started");
+    pixel_mask = PixelMask(experiment);
+    UpdatePixelMaskStatistics(pixel_mask.GetStatistics());
 
+    logger.Info("Calibration sequence started");
     try {
-        TakePedestalInternalG0(ul);
-        if (!experiment.IsFixedGainG1()) {
-            for (int i = 0; i < experiment.GetStorageCellNumber(); i++) {
-                TakePedestalInternalG1(ul, i);
-                TakePedestalInternalG2(ul, i);
-            }
+        if (experiment.GetDetectorType() == DetectorType::EIGER) {
+            // PSI EIGER - only reset calibration
+            calibration.reset();
+        } else if (experiment.GetDetectorType() == DetectorType::DECTRIS) {
+            // DECTRIS - take dark data for mask
+            calibration.reset();
+            TakeDarkMaskInternal(ul);
+        } else {
+            // PSI JUNGFRAU - take pedestal
+            calibration = std::make_unique<JFCalibration>(experiment);
+            CalibrateJUNGFRAU(ul);
         }
-        SetState(JFJochState::Idle,
-            "Pedestal sequence done",
-            BrokerStatus::MessageSeverity::Success);
-        services.ConfigureDetector(experiment);
-        pixel_mask.LoadDetectorBadPixelMask(experiment, calibration.get());
+        // Update pixel mask statistics
         UpdatePixelMaskStatistics(pixel_mask.GetStatistics());
+        // configure detector for standard operation
+        services.ConfigureDetector(experiment);
     } catch (const std::exception &e) {
-        logger.Error("Pedestal sequence error {}", e.what());
+        logger.Error("Calibration sequence error {}", e.what());
         SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
         throw;
     }
+    SetState(JFJochState::Idle, "Calibration sequence done", BrokerStatus::MessageSeverity::Success);
+
     logger.Info("Pedestal sequence done");
 }
 
+void JFJochStateMachine::TakeDarkMaskInternal(std::unique_lock<std::mutex> &ul) {
+    if (cancel_sequence) {
+        SetState(JFJochState::Inactive,
+                 "Mask sequence cancelled",
+                 BrokerStatus::MessageSeverity::Warning);
+        return;
+    }
+
+    services.LoadDetectorPixelMask(pixel_mask);
+
+    if (experiment.GetDarkMaskNumberOfFrames() == 0)
+        return;
+
+    DiffractionExperiment local_experiment(experiment);
+    local_experiment.Mode(DetectorMode::DarkMask);
+
+    SetState(JFJochState::Calibration, "Dark sequence for mask calculation", BrokerStatus::MessageSeverity::Info);
+    services.ConfigureDetector(local_experiment);
+    services.Start(local_experiment, pixel_mask, nullptr);
+
+    services.Trigger();
+
+    ul.unlock();
+    // Allow to cancel/abort during the mask data collection
+    auto mask_output = services.Stop();
+    ul.lock();
+
+    if (mask_output.receiver_output.dark_mask_result.size() == local_experiment.GetPixelsNum()) {
+        pixel_mask.LoadDarkBadPixelMask(mask_output.receiver_output.dark_mask_result);
+        SetState(JFJochState::Idle);
+    } else
+        SetState(JFJochState::Error, "Mask not collected properly", BrokerStatus::MessageSeverity::Error);
+}
 
 void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock<std::mutex> &ul) {
     DiffractionExperiment local_experiment(experiment);
@@ -142,9 +172,9 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock<std::mutex> &ul
     if (local_experiment.GetPedestalG0Frames() == 0)
         return;
 
-    SetState(JFJochState::Pedestal, message, BrokerStatus::MessageSeverity::Info);
+    SetState(JFJochState::Calibration, message, BrokerStatus::MessageSeverity::Info);
     services.ConfigureDetector(local_experiment);
-    services.Start(local_experiment, pixel_mask, *calibration);
+    services.Start(local_experiment, pixel_mask, calibration.get());
 
     services.Trigger();
 
@@ -183,11 +213,11 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock<std::mutex> &ul
         return;
 
 
-    SetState(JFJochState::Pedestal,
+    SetState(JFJochState::Calibration,
              "Pedestal G1   SC" + std::to_string(storage_cell),
              BrokerStatus::MessageSeverity::Info);
     services.ConfigureDetector(local_experiment);
-    services.Start(local_experiment, pixel_mask, *calibration);
+    services.Start(local_experiment, pixel_mask, calibration.get());
 
     services.Trigger();
 
@@ -223,11 +253,11 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock<std::mutex> &ul
         return;
 
 
-    SetState(JFJochState::Pedestal,
+    SetState(JFJochState::Calibration,
              "Pedestal G2   SC" + std::to_string(storage_cell),
              BrokerStatus::MessageSeverity::Info);
     services.ConfigureDetector(local_experiment);
-    services.Start(local_experiment, pixel_mask, *calibration);
+    services.Start(local_experiment, pixel_mask, calibration.get());
 
     services.Trigger();
 
@@ -255,7 +285,13 @@ void JFJochStateMachine::Initialize() {
     ResetError(); // Clear error, we don't care what was it
 
     logger.Info("Initialize");
-
+    SetState(JFJochState::Busy, "Configuring indexing threads", BrokerStatus::MessageSeverity::Info);
+    try {
+        services.SetupIndexing(experiment.GetIndexingSettings());
+    } catch (const JFJochException &e) {
+        SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
+        throw;
+    }
     SetState(JFJochState::Busy, "Configuring detector", BrokerStatus::MessageSeverity::Info);
 
     scan_result = {}; // Clear scan result
@@ -274,23 +310,30 @@ void JFJochStateMachine::Pedestal() {
 
 
 void JFJochStateMachine::PedestalThread(std::unique_lock<std::mutex> ul) {
-    TakePedestalInternalAll(ul);
+    CalibrateDetector(ul);
 }
 
 void JFJochStateMachine::InitializeThread(std::unique_lock<std::mutex> ul) {
     try {
-        // On might modify experiment (reads DECTRIS configuration), so need to have lock acquired at this point
-        services.On(experiment);
+        // services.On can potentially take a lot of time, so better to unlock main mutex
+        // Since On might modify the experiment (reads DECTRIS configuration), one has to have a local copy for unlocked part
+        DiffractionExperiment local_experiment(experiment);
+        if (state != JFJochState::Busy)
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "State must be busy for safe operation");
+        ul.unlock();
+        services.On(local_experiment);
+        ul.lock();
+
+        experiment = local_experiment;
         detector_setup[current_detector_setup] = experiment.GetDetectorSetup();
-        pixel_mask = PixelMask(experiment);
-        services.LoadDetectorPixelMask(pixel_mask);
-        UpdatePixelMaskStatistics(pixel_mask.GetStatistics());
+
     } catch (const std::exception &e) {
         logger.Error("Initialize error {}", e.what());
         SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
         throw;
     }
-    TakePedestalInternalAll(ul);
+    CalibrateDetector(ul);
 }
 
 void JFJochStateMachine::Trigger() {
@@ -319,7 +362,7 @@ void JFJochStateMachine::Start(const DatasetSettings &settings) {
     try {
         SetState(JFJochState::Busy, "Preparing measurement", BrokerStatus::MessageSeverity::Info);
         services.SetSpotFindingSettings(GetSpotFindingSettings());
-        services.Start(experiment, pixel_mask, *calibration);
+        services.Start(experiment, pixel_mask, calibration.get());
 
         SetState(JFJochState::Measuring, "Measuring ...", BrokerStatus::MessageSeverity::Info);
         measurement = std::async(std::launch::async, &JFJochStateMachine::MeasurementThread, this);
@@ -378,7 +421,7 @@ void JFJochStateMachine::MeasurementThread() {
 void JFJochStateMachine::Cancel() {
     // This is inconsistency in naming - need to solve later
     std::unique_lock ul(m);
-    if ((state == JFJochState::Pedestal) || (state == JFJochState::Measuring)) {
+    if ((state == JFJochState::Calibration) || (state == JFJochState::Measuring)) {
         services.Cancel();
         cancel_sequence = true;
     }
@@ -465,7 +508,7 @@ bool JFJochStateMachine::ImportDetectorSettings(const DetectorSettings &input) {
     // For JUNGFRAU detector, if detector settings changes key parameters
     // need to recalibrate the detector
     bool recalib = input.NeedsJUNGFRAURecalibration(experiment.GetDetectorSettings())
-            && experiment.GetDetectorType() == DetectorType::JUNGFRAU;
+                   && experiment.GetDetectorType() == DetectorType::JUNGFRAU;
     experiment.ImportDetectorSettings(input);
     return recalib;
 }
@@ -481,11 +524,20 @@ 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:
         case JFJochState::Busy:
-        case JFJochState::Pedestal:
+        case JFJochState::Calibration:
             throw WrongDAQStateException("Cannot change detector settings during data collection");
     }
 }
@@ -499,7 +551,6 @@ BrokerStatus JFJochStateMachine::GetStatus() const {
     BrokerStatus ret = broker_status;
     ret.progress = services.GetReceiverProgress();
     ret.gpu_count = gpu_count;
-    ret.ml_resolution_estimation = resolution_estimate_possible;
     return ret;
 }
 
@@ -509,9 +560,9 @@ void JFJochStateMachine::SetState(JFJochState curr_state,
     std::unique_lock ul(broker_status_mutex);
     state = curr_state;
     broker_status = BrokerStatus{
-        .state = curr_state,
-        .message = message,
-        .message_severity = message_severity
+            .state = curr_state,
+            .message = message,
+            .message_severity = message_severity
     };
 }
 
@@ -519,6 +570,10 @@ MultiLinePlot JFJochStateMachine::GetPlots(const PlotRequest &request) const {
     return services.GetPlots(request);
 }
 
+void JFJochStateMachine::GetPlotRaw(std::vector<float> &v, PlotType type, const std::string &roi) const {
+    services.GetPlotRaw(v, type, roi);
+}
+
 void JFJochStateMachine::SetSpotFindingSettings(const SpotFindingSettings &settings) {
     std::unique_lock ul(data_processing_settings_mutex);
     DiffractionExperiment::CheckDataProcessingSettings(settings);
@@ -529,9 +584,6 @@ void JFJochStateMachine::SetSpotFindingSettings(const SpotFindingSettings &setti
     if (!indexing_possible)
         data_processing_settings.indexing = false;
 
-    if (!resolution_estimate_possible)
-        data_processing_settings.resolution_estimate = false;
-
     services.SetSpotFindingSettings(data_processing_settings);
 }
 
@@ -589,6 +641,23 @@ void JFJochStateMachine::SelectDetector(int64_t id) {
     if (IsRunning())
         throw WrongDAQStateException("Cannot change detector during data collection");
 
+    // Do nothing if this is the same detector as currently used
+    if (id == current_detector_setup)
+        return;
+
+    // Try to deactivate current detector (if actually running)
+    if (state != JFJochState::Inactive) {
+        try {
+            SetState(JFJochState::Busy, "Deactivating existing detector");
+            ul.unlock();
+            services.Off();
+            ul.lock();
+        } catch (const std::exception &e) {
+            logger.ErrorException(e);
+            logger.Warning("Cannot turn off existing detector - proceeding anyway");
+        }
+    }
+
     try {
         experiment.Detector(detector_setup[id]);
         UpdateROIDefinition();
@@ -627,7 +696,7 @@ bool JFJochStateMachine::IsRunning() const {
             return false;
         case JFJochState::Measuring:
         case JFJochState::Busy:
-        case JFJochState::Pedestal:
+        case JFJochState::Calibration:
             return true;
         default:
             throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "State unknown");
@@ -930,6 +999,15 @@ void JFJochStateMachine::SetIndexingSettings(const IndexingSettings &input) {
     {
         std::unique_lock ul2(experiment_indexing_settings_mutex);
         experiment.ImportIndexingSettings(input);
+        try {
+            services.SetupIndexing(input);
+        } catch (const JFJochException &e) {
+            logger.ErrorException(e);
+            SetState(JFJochState::Error,
+                     e.what(),
+                     BrokerStatus::MessageSeverity::Error);
+            throw;
+        }
     }
 }
 
@@ -939,4 +1017,25 @@ std::optional<ScanResult> JFJochStateMachine::GetScanResult() const {
         throw WrongDAQStateException("Cannot check scan result, when running");
 
     return scan_result;
-}
+}
+
+DarkMaskSettings JFJochStateMachine::GetDarkMaskSettings() const {
+    std::unique_lock ul(experiment_dark_mask_settings_mutex);
+    return experiment.GetDarkMaskSettings();
+}
+
+void JFJochStateMachine::SetDarkMaskSettings(const DarkMaskSettings &settings) {
+    std::unique_lock ul(m);
+    if (IsRunning())
+        throw WrongDAQStateException("Cannot change dark mask calculation settings during data collection");
+    {
+        // Setting dark mask settings in experiment requires BOTH mutexes
+        std::unique_lock ul2(experiment_dark_mask_settings_mutex);
+        experiment.ImportDarkMaskSettings(settings);
+    }
+    if ((experiment.GetDetectorType() == DetectorType::DECTRIS) && (state == JFJochState::Idle)) {
+        // Need to redo the calibration
+        SetState(JFJochState::Busy, "Loading settings", BrokerStatus::MessageSeverity::Info);
+        measurement = std::async(std::launch::async, &JFJochStateMachine::PedestalThread, this, std::move(ul));
+    }
+}

broker/JFJochStateMachine.h

@@ -16,7 +16,7 @@
 #include "JFJochServices.h"
 #include "../common/ROIMap.h"
 
-enum class JFJochState {Inactive, Idle, Measuring, Error, Busy, Pedestal};
+enum class JFJochState {Inactive, Idle, Measuring, Error, Busy, Calibration};
 
 struct BrokerStatus {
     JFJochState state = JFJochState::Inactive;
@@ -24,7 +24,6 @@ struct BrokerStatus {
     std::optional<std::string> message;
     enum class MessageSeverity {Error, Info, Warning, Success} message_severity = MessageSeverity::Error;
     int64_t gpu_count;
-    bool ml_resolution_estimation;
 };
 
 struct DetectorListElement {
@@ -96,6 +95,7 @@ class JFJochStateMachine {
     mutable std::mutex experiment_image_format_settings_mutex;
     mutable std::mutex experiment_file_writer_settings_mutex;
     mutable std::mutex experiment_indexing_settings_mutex;
+    mutable std::mutex experiment_dark_mask_settings_mutex;
     DiffractionExperiment experiment;
 
     // mutex m is protecting:
@@ -141,16 +141,20 @@ class JFJochStateMachine {
     bool ImportPedestalG0(const JFJochReceiverOutput &receiver_output);
     bool IsRunning() const; // Is state Busy/Pedestal/Measure
     void ResetError() noexcept;
-    void TakePedestalInternalAll(std::unique_lock<std::mutex> &ul);
+    void TakeDarkMaskInternal(std::unique_lock<std::mutex> &ul);
+    void CalibrateDetector(std::unique_lock<std::mutex> &ul);
+    void CalibrateJUNGFRAU(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG0(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG1(std::unique_lock<std::mutex> &ul, int32_t storage_cell = 0);
     void TakePedestalInternalG2(std::unique_lock<std::mutex> &ul, int32_t storage_cell = 0);
     bool ImportDetectorSettings(const DetectorSettings& input);
+
     void UpdateROIDefinition();
 public:
     JFJochStateMachine(const DiffractionExperiment& experiment,
                        JFJochServices &in_services,
-                       Logger &logger);
+                       Logger &logger,
+                       const SpotFindingSettings &spot_finding_settings = SpotFindingSettings());
     ~JFJochStateMachine();
 
     void Initialize();
@@ -185,6 +189,7 @@ public:
 
     BrokerStatus GetStatus() const;
     MultiLinePlot GetPlots(const PlotRequest &request) const;
+    void GetPlotRaw(std::vector<float> &v,PlotType type, const std::string &roi) const;
 
     void SetSpotFindingSettings(const SpotFindingSettings& settings);
     SpotFindingSettings GetSpotFindingSettings() const;
@@ -243,6 +248,9 @@ public:
     void AddDetectorSetup(const DetectorSetup& setup); // Not thread safe, only during setup
 
     std::optional<ScanResult> GetScanResult() const;
+
+    void SetDarkMaskSettings(const DarkMaskSettings& settings);
+    DarkMaskSettings GetDarkMaskSettings() const;
 };
 
 

broker/OpenAPIConvert.cpp

@@ -19,10 +19,11 @@ SpotFindingSettings Convert(const org::openapitools::server::model::Spot_finding
     ret.low_resolution_limit = input.getLowResolutionLimit();
     ret.enable = input.isEnable();
     ret.indexing = input.isIndexing();
-    ret.resolution_estimate = input.isResolutionEstimate();
     ret.quick_integration = input.isQuickIntegration();
     ret.cutoff_spot_count_low_res = input.getHighResolutionLimitForSpotCountLowRes();
-
+    ret.ice_ring_width_Q_recipA = input.getIceRingWidthQRecipA();
+    if (input.highResGapQRecipAIsSet())
+        ret.high_res_gap_Q_recipA = input.getHighResGapQRecipA();
     return ret;
 }
 
@@ -37,8 +38,10 @@ org::openapitools::server::model::Spot_finding_settings Convert(const SpotFindin
     ret.setEnable(input.enable);
     ret.setIndexing(input.indexing);
     ret.setHighResolutionLimitForSpotCountLowRes(input.cutoff_spot_count_low_res);
-    ret.setResolutionEstimate(input.resolution_estimate);
     ret.setQuickIntegration(input.quick_integration);
+    ret.setIceRingWidthQRecipA(input.ice_ring_width_Q_recipA);
+    if (input.high_res_gap_Q_recipA.has_value())
+        ret.setHighResGapQRecipA(input.high_res_gap_Q_recipA.value());
     return ret;
 }
 
@@ -212,7 +215,7 @@ org::openapitools::server::model::Broker_status Convert(const BrokerStatus& inpu
         case JFJochState::Busy:
             ret.setState("Busy");
             break;
-        case JFJochState::Pedestal:
+        case JFJochState::Calibration:
             ret.setState("Pedestal");
             break;
     }
@@ -237,7 +240,6 @@ org::openapitools::server::model::Broker_status Convert(const BrokerStatus& inpu
     if (input.progress.has_value())
         ret.setProgress(input.progress.value());
 
-    ret.setMlResolutionEstimation(input.ml_resolution_estimation);
     ret.setGpuCount(input.gpu_count);
     return ret;
 }
@@ -660,6 +662,17 @@ DatasetSettings Convert(const org::openapitools::server::model::Dataset_settings
         ret.RingCurrent_mA(input.getRingCurrentMA());
     if (input.sampleTemperatureKIsSet())
         ret.SampleTemperature_K(input.getSampleTemperatureK());
+
+    ret.SpotFindingEnable(input.isSpotFinding());
+    ret.MaxSpotCount(input.getMaxSpotCount());
+
+    ret.DetectIceRings(input.isDetectIceRings());
+
+    if (input.xrayFluorescenceSpectrumIsSet()) {
+        auto fl = input.getXrayFluorescenceSpectrum();
+        ret.FluorescenceSpectrum({fl.getEnergyEV(), fl.getData()});
+    }
+
     return ret;
 }
 
@@ -728,8 +741,8 @@ org::openapitools::server::model::Zeromq_metadata_settings Convert(const ZMQMeta
 org::openapitools::server::model::Pixel_mask_statistics Convert(const PixelMaskStatistics& input) {
     org::openapitools::server::model::Pixel_mask_statistics ret;
     ret.setUserMask(input.user_mask);
-    ret.setWrongGain(input.wrong_gain);
-    ret.setTooHighPedestalRms(input.too_high_pedestal_rms);
+    ret.setWrongGain(input.error_pixel);
+    ret.setTooHighPedestalRms(input.noisy_pixel);
     return ret;
 }
 
@@ -740,6 +753,20 @@ org::openapitools::server::model::Image_buffer_status Convert(const ImageBufferS
     ret.setImageNumbers(input.images_in_the_buffer);
     ret.setMaxImageNumber(input.max_image_number);
     ret.setMinImageNumber(input.min_image_number);
+    if (input.current_counter.has_value())
+        ret.setCurrentCounter(input.current_counter.value());
+    return ret;
+}
+
+ImageBufferStatus Convert(const org::openapitools::server::model::Image_buffer_status& input) {
+    ImageBufferStatus ret;
+    ret.available_slots = input.getAvailableSlots();
+    ret.total_slots = input.getTotalSlots();
+    ret.images_in_the_buffer = input.getImageNumbers();
+    ret.max_image_number = input.getMaxImageNumber();
+    ret.min_image_number = input.getMinImageNumber();
+    if (input.currentCounterIsSet())
+        ret.current_counter = input.getCurrentCounter();
     return ret;
 }
 
@@ -775,6 +802,9 @@ org::openapitools::server::model::File_writer_format Convert(FileWriterFormat in
         case FileWriterFormat::TIFF:
             ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::TIFF);
             break;
+        case FileWriterFormat::NoFile:
+            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::NOFILEWRITTEN);
+            break;
         default:
             throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown file writer format enum value");
     }
@@ -793,6 +823,8 @@ FileWriterFormat Convert(const org::openapitools::server::model::File_writer_for
             return FileWriterFormat::CBF;
         case org::openapitools::server::model::File_writer_format::eFile_writer_format::TIFF:
             return FileWriterFormat::TIFF;
+        case org::openapitools::server::model::File_writer_format::eFile_writer_format::NOFILEWRITTEN:
+            return FileWriterFormat::NoFile;
         default:
             throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                                   "Unknown file writer format enum value");
@@ -812,7 +844,8 @@ PlotType ConvertPlotType(const std::optional<std::string>& input) {
     if (input == "spot_count_ice") return PlotType::SpotCountIceRing;
     if (input == "indexing_rate") return PlotType::IndexingRate;
     if (input == "indexing_unit_cell_length") return PlotType::IndexingUnitCellLength;
-    if (input == "mosaicity") return PlotType::IndexingMosaicity;
+    if (input == "profile_radius") return PlotType::ProfileRadius;
+    if (input == "mosaicity") return PlotType::Mosaicity;
     if (input == "b_factor") return PlotType::BFactor;
     if (input == "indexing_unit_cell_angle") return PlotType::IndexingUnitCellAngle;
     if (input == "error_pixels") return PlotType::ErrorPixels;
@@ -833,24 +866,33 @@ PlotType ConvertPlotType(const std::optional<std::string>& input) {
     if (input == "indexing_time") return PlotType::IndexingTime;
     if (input == "pixel_sum") return PlotType::PixelSum;
     if (input == "processing_time") return PlotType::ImageProcessingTime;
+    if (input == "beam_center_x") return PlotType::RefinementBeamX;
+    if (input == "beam_center_y") return PlotType::RefinementBeamY;
     throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                           "Plot type not recognized");
 }
 
-ColorScaleEnum ConvertColorScale(const std::optional<std::string>& input) {
-   std::string color = input.value_or("indigo");
+ColorScaleEnum ConvertColorScale(const std::optional<std::string> &input) {
+    std::string color = input.value_or("indigo");
 
     if (color == "viridis")
         return ColorScaleEnum::Viridis;
-    else if (color == "bw")
+    if (color == "bw")
         return ColorScaleEnum::BW;
-    else if (color == "heat")
-       return ColorScaleEnum::Heat;
-    else if (color == "indigo")
+    if (color == "wb")
+        return ColorScaleEnum::WB;
+    if (color == "green")
+        return ColorScaleEnum::Green;
+    if (color == "heat")
+        return ColorScaleEnum::Heat;
+    if (color == "indigo")
         return ColorScaleEnum::Indigo;
-    else
-        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
-                              "Color scale unknown");
+    if (color == "magma")
+        return ColorScaleEnum::Magma;
+    if (color == "inferno")
+        return ColorScaleEnum::Inferno;
+    throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                          "Color scale unknown");
 }
 
 IndexingSettings Convert(const org::openapitools::server::model::Indexing_settings &input) {
@@ -859,6 +901,9 @@ IndexingSettings Convert(const org::openapitools::server::model::Indexing_settin
         case org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::FFT:
             ret.Algorithm(IndexingAlgorithmEnum::FFT);
             break;
+        case org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::FFTW:
+            ret.Algorithm(IndexingAlgorithmEnum::FFTW);
+            break;
         case org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::NONE:
             ret.Algorithm(IndexingAlgorithmEnum::None);
             break;
@@ -872,11 +917,29 @@ IndexingSettings Convert(const org::openapitools::server::model::Indexing_settin
             throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown indexing algorithm");
     }
 
+    switch (input.getGeomRefinementAlgorithm().getValue()) {
+        case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED:
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown refinement algorithm");
+            break;
+        case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER:
+            ret.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::BeamCenter);
+            break;
+        case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE:
+            ret.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::None);
+            break;
+    }
+
     ret.FFT_HighResolution_A(input.getFftHighResolutionA());
     ret.FFT_MaxUnitCell_A(input.getFftMaxUnitCellA());
     ret.FFT_MinUnitCell_A(input.getFftMinUnitCellA());
     ret.FFT_NumVectors(input.getFftNumVectors());
     ret.Tolerance(input.getTolerance());
+    ret.IndexingThreads(input.getThreadCount());
+    ret.UnitCellDistTolerance(input.getUnitCellDistTolerance());
+    ret.IndexIceRings(input.isIndexIceRings());
+    ret.RotationIndexing(input.isRotationIndexing());
+    ret.RotationIndexingAngularStride_deg(input.getRotationIndexingAngularStrideDeg());
+    ret.RotationIndexingMinAngularRange_deg(input.getRotationIndexingMinAngularRangeDeg());
     return ret;
 }
 
@@ -888,6 +951,24 @@ org::openapitools::server::model::Indexing_settings Convert(const IndexingSettin
     ret.setFftMaxUnitCellA(input.GetFFT_MaxUnitCell_A());
     ret.setFftNumVectors(input.GetFFT_NumVectors());
     ret.setTolerance(input.GetTolerance());
+    ret.setThreadCount(input.GetIndexingThreads());
+    ret.setUnitCellDistTolerance(input.GetUnitCellDistTolerance());
+    ret.setRotationIndexing(input.GetRotationIndexing());
+    ret.setRotationIndexingAngularStrideDeg(input.GetRotationIndexingAngularStride_deg());
+    ret.setRotationIndexingMinAngularRangeDeg(input.GetRotationIndexingMinAngularRange_deg());
+
+    org::openapitools::server::model::Geom_refinement_algorithm refinement;
+    switch (input.GetGeomRefinementAlgorithm()) {
+
+        case GeomRefinementAlgorithmEnum::None:
+            refinement.setValue(org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE);
+            break;
+        case GeomRefinementAlgorithmEnum::BeamCenter:
+            refinement.setValue(org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER);
+            break;
+    }
+
+    ret.setGeomRefinementAlgorithm(refinement);
 
     org::openapitools::server::model::Indexing_algorithm tmp;
     switch (input.GetAlgorithm()) {
@@ -900,11 +981,15 @@ org::openapitools::server::model::Indexing_settings Convert(const IndexingSettin
         case IndexingAlgorithmEnum::FFT:
             tmp.setValue(org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::FFT);
             break;
+        case IndexingAlgorithmEnum::FFTW:
+            tmp.setValue(org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::FFTW);
+            break;
         case IndexingAlgorithmEnum::None:
             tmp.setValue(org::openapitools::server::model::Indexing_algorithm::eIndexing_algorithm::NONE);
             break;
     }
     ret.setAlgorithm(tmp);
+    ret.setIndexIceRings(input.GetIndexIceRings());
     return ret;
 }
 
@@ -924,7 +1009,8 @@ org::openapitools::server::model::Scan_result Convert(const ScanResult& input) {
         if (i.bkg.has_value())
             tmp.setBkg(i.bkg.value());
 
-        std::optional<uint64_t> pixel_sum;
+        if (i.angle_deg.has_value())
+            tmp.setAngle(i.angle_deg.value());
         if (i.pixel_sum.has_value())
             tmp.setPixelSum(i.pixel_sum.value());
         if (i.max_viable_pixel.has_value())
@@ -941,8 +1027,8 @@ org::openapitools::server::model::Scan_result Convert(const ScanResult& input) {
             tmp.setSpotsIndexed(i.spot_count_indexed.value());
         if (i.indexing_solution.has_value())
             tmp.setIndex(i.indexing_solution.value());
-        if (i.mosaicity.has_value())
-            tmp.setMos(i.mosaicity.value());
+        if (i.profile_radius.has_value())
+            tmp.setPr(i.profile_radius.value());
         if (i.b_factor.has_value())
             tmp.setB(i.b_factor.value());
         if (i.uc.has_value()) {
@@ -962,5 +1048,38 @@ org::openapitools::server::model::Scan_result Convert(const ScanResult& input) {
         v.emplace_back(std::move(tmp));
     }
     ret.setImages(v);
+    if (input.rotation_lattice) {
+        ret.setRotationCrystalLattice(input.rotation_lattice->GetVector());
+        org::openapitools::server::model::Unit_cell uc;
+        auto i_uc = input.rotation_lattice->GetUnitCell();
+
+        uc.setA(i_uc.a);
+        uc.setB(i_uc.b);
+        uc.setC(i_uc.c);
+        uc.setAlpha(i_uc.alpha);
+        uc.setBeta(i_uc.beta);
+        uc.setGamma(i_uc.gamma);
+        ret.setRotationUnitCell(uc);
+    }
     return ret;
-}
+}
+
+org::openapitools::server::model::Dark_mask_settings Convert(const DarkMaskSettings &input) {
+    org::openapitools::server::model::Dark_mask_settings ret{};
+    ret.setDetectorThresholdKeV(input.GetThreshold_keV());
+    ret.setFrameTimeUs(input.GetFrameTime().count());
+    ret.setMaxFramesWithSignal(input.GetMaxFramesWithCounts());
+    ret.setMaxAllowedPixelCount(input.GetMaxCounts());
+    ret.setNumberOfFrames(input.GetNumberOfFrames());
+    return ret;
+}
+
+DarkMaskSettings Convert(const org::openapitools::server::model::Dark_mask_settings &input) {
+    DarkMaskSettings ret{};
+    ret.FrameTime(std::chrono::microseconds(input.getFrameTimeUs()))
+            .NumberOfFrames(input.getNumberOfFrames())
+            .MaxCounts(input.getMaxAllowedPixelCount())
+            .MaxFramesWithCounts(input.getMaxFramesWithSignal())
+            .Threshold_keV(input.getDetectorThresholdKeV());
+    return ret;
+}

broker/OpenAPIConvert.h

@@ -4,6 +4,7 @@
 #ifndef JFJOCH_OPENAPICONVERT_H
 #define JFJOCH_OPENAPICONVERT_H
 
+#include "Dark_mask_settings.h"
 #include "gen/model/Spot_finding_settings.h"
 #include "gen/model/Measurement_statistics.h"
 #include "gen/model/Detector_settings.h"
@@ -32,7 +33,7 @@
 #include "../common/JFJochMessages.h"
 #include "../common/DatasetSettings.h"
 #include "../common/ImageFormatSettings.h"
-#include "../image_analysis/SpotFindingSettings.h"
+#include "../image_analysis/spot_finding/SpotFindingSettings.h"
 #include "JFJochStateMachine.h"
 #include "../common/DetectorSettings.h"
 #include "../jungfrau/JFCalibration.h"
@@ -74,6 +75,7 @@ DatasetSettings Convert(const org::openapitools::server::model::Dataset_settings
 std::vector<org::openapitools::server::model::Fpga_status_inner> Convert(const std::vector<DeviceStatus> &input);
 org::openapitools::server::model::Pixel_mask_statistics Convert(const PixelMaskStatistics& input);
 org::openapitools::server::model::Image_buffer_status Convert(const ImageBufferStatus& input);
+ImageBufferStatus Convert(const org::openapitools::server::model::Image_buffer_status& input);
 
 org::openapitools::server::model::Zeromq_preview_settings Convert(const ZMQPreviewSettings& settings);
 ZMQPreviewSettings Convert(const org::openapitools::server::model::Zeromq_preview_settings& input);
@@ -88,4 +90,6 @@ ColorScaleEnum ConvertColorScale(const std::optional<std::string>& input);
 
 org::openapitools::server::model::Scan_result Convert(const ScanResult& input);
 
+org::openapitools::server::model::Dark_mask_settings Convert(const DarkMaskSettings& input);
+DarkMaskSettings Convert(const org::openapitools::server::model::Dark_mask_settings& input);
 #endif //JFJOCH_OPENAPICONVERT_H

broker/gen/api/ApiBase.cpp

@@ -0,0 +1,22 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+#include "ApiBase.h"
+
+namespace org::openapitools::server::api
+{
+
+ApiBase::ApiBase(const std::shared_ptr<Pistache::Rest::Router>& rtr) : router(rtr)
+{
+}
+
+
+} // Namespace org::openapitools::server::api

broker/gen/api/ApiBase.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,14 +24,26 @@
 namespace org::openapitools::server::api
 {
 
+
+    
+
+
 class ApiBase {
 public:
-    explicit ApiBase(const std::shared_ptr<Pistache::Rest::Router>& rtr) : router(rtr) {};
+    explicit ApiBase(const std::shared_ptr<Pistache::Rest::Router>& rtr);
     virtual ~ApiBase() = default;
     virtual void init() = 0;
 
+    
+    
+
+
 protected:
     const std::shared_ptr<Pistache::Rest::Router> router;
+    
+    
+
+
 };
 
 } // namespace org::openapitools::server::api

broker/gen/api/DefaultApi.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -31,6 +31,7 @@
 #include "Azim_int_settings.h"
 #include "Broker_status.h"
 #include "Calibration_statistics_inner.h"
+#include "Dark_mask_settings.h"
 #include "Dataset_settings.h"
 #include "Detector_list.h"
 #include "Detector_selection.h"
@@ -71,6 +72,8 @@ private:
     void cancel_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_azim_int_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_azim_int_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void config_dark_mask_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void config_dark_mask_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_detector_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_detector_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_file_writer_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -107,13 +110,13 @@ private:
     void image_buffer_clear_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void image_buffer_image_cbor_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void image_buffer_image_jpeg_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
-    void image_buffer_image_png_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void image_buffer_image_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void image_buffer_start_cbor_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void image_buffer_status_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void initialize_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void pedestal_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void preview_pedestal_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void preview_plot_bin_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void preview_plot_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void result_scan_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void start_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -162,29 +165,44 @@ private:
     /// <remarks>
     /// Command will inform FPGA network card to stop pedestal or data collection at the current stage. Any frame that is currently being processed by CPU will be finished and sent to writer. Given the command is making sure to gracefully stop data acquisition and detector, it might take some time to switch back after command finished to &#x60;Idle&#x60; state.  If data collection is not running, the command has no effect. 
     /// </remarks>
-    virtual void cancel_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void cancel_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
-    /// Get radial integration configuration
+    /// Get azimuthal integration configuration
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_azim_int_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_azim_int_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
-    /// Configure radial integration
+    /// Configure azimuthal integration
     /// </summary>
     /// <remarks>
     /// Can be done when detector is Inactive or Idle
     /// </remarks>
     /// <param name="azimIntSettings"> (optional)</param>
-    virtual void config_azim_int_put(const org::openapitools::server::model::Azim_int_settings &azimIntSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_azim_int_put( const org::openapitools::server::model::Azim_int_settings &azimIntSettings, Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Get settings for dark data collection to calculate mask
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    virtual void config_dark_mask_get( Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Set configuration for dark data collection to calculate mask
+    /// </summary>
+    /// <remarks>
+    /// This is only possible when operating DECTRIS detectors at the moment; it will be also available for PSI EIGER at some point. This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
+    /// </remarks>
+    /// <param name="darkMaskSettings"> (optional)</param>
+    virtual void config_dark_mask_put( const org::openapitools::server::model::Dark_mask_settings &darkMaskSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get detector configuration
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_detector_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_detector_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Change detector configuration
     /// </summary>
@@ -192,14 +210,14 @@ private:
     /// Detector settings are ones that have effect on calibration, i.e., pedestal has to be collected again after changing these settings. This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. If detector is in &#x60;Idle&#x60; state , pedestal procedure will be executed automatically - there must be no X-rays on the detector during the operation. If detector is in &#x60;Inactive&#x60; or &#x60;Error&#x60; states, new settings will be saved, but no calibration will be executed. 
     /// </remarks>
     /// <param name="detectorSettings"> (optional)</param>
-    virtual void config_detector_put(const org::openapitools::server::model::Detector_settings &detectorSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_detector_put( const org::openapitools::server::model::Detector_settings &detectorSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get file writer settings
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_file_writer_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_file_writer_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Change file writer settings
     /// </summary>
@@ -207,21 +225,21 @@ private:
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
     /// <param name="fileWriterSettings"> (optional)</param>
-    virtual void config_file_writer_put(const org::openapitools::server::model::File_writer_settings &fileWriterSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_file_writer_put( const org::openapitools::server::model::File_writer_settings &fileWriterSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Configure format for data collection with full conversion
     /// </summary>
     /// <remarks>
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
-    virtual void config_image_format_conversion_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_image_format_conversion_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get image output format
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_image_format_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_image_format_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Change image output format
     /// </summary>
@@ -229,21 +247,21 @@ private:
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
     /// <param name="imageFormatSettings"> (optional)</param>
-    virtual void config_image_format_put(const org::openapitools::server::model::Image_format_settings &imageFormatSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_image_format_put( const org::openapitools::server::model::Image_format_settings &imageFormatSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Configure format for raw data collection
     /// </summary>
     /// <remarks>
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
-    virtual void config_image_format_raw_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_image_format_raw_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get indexing configuration
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_indexing_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_indexing_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Change indexing algorithm settings
     /// </summary>
@@ -251,14 +269,14 @@ private:
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
     /// <param name="indexingSettings"> (optional)</param>
-    virtual void config_indexing_put(const org::openapitools::server::model::Indexing_settings &indexingSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_indexing_put( const org::openapitools::server::model::Indexing_settings &indexingSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get instrument metadata
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_instrument_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_instrument_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Change instrument metadata
     /// </summary>
@@ -266,7 +284,7 @@ private:
     /// This can only be done when detector is &#x60;Idle&#x60;, &#x60;Error&#x60; or &#x60;Inactive&#x60; states. 
     /// </remarks>
     /// <param name="instrumentMetadata"> (optional)</param>
-    virtual void config_instrument_put(const org::openapitools::server::model::Instrument_metadata &instrumentMetadata, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_instrument_put( const org::openapitools::server::model::Instrument_metadata &instrumentMetadata, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Load binary image for internal FPGA generator
     /// </summary>
@@ -287,21 +305,21 @@ private:
     /// <remarks>
     /// Detector must be Initialized. Get full pixel mask of the detector. See NXmx standard for meaning of pixel values. 
     /// </remarks>
-    virtual void config_mask_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_mask_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get mask of the detector (TIFF)
     /// </summary>
     /// <remarks>
     /// Should be in &#x60;Idle&#x60; state. Get full pixel mask of the detector See NXmx standard for meaning of pixel values 
     /// </remarks>
-    virtual void config_mask_tiff_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_mask_tiff_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get ROI definitions
     /// </summary>
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void config_roi_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_roi_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Upload ROI definitions
     /// </summary>
@@ -309,14 +327,14 @@ private:
     /// 
     /// </remarks>
     /// <param name="roiDefinitions"> (optional)</param>
-    virtual void config_roi_put(const org::openapitools::server::model::Roi_definitions &roiDefinitions, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_roi_put( const org::openapitools::server::model::Roi_definitions &roiDefinitions, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// List available detectors
     /// </summary>
     /// <remarks>
     /// Configured detectors that can be selected by used
     /// </remarks>
-    virtual void config_select_detector_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_select_detector_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Select detector
     /// </summary>
@@ -324,14 +342,14 @@ private:
     /// Jungfraujoch allows to control multiple detectors and/or region-of-interests. The command allows to choose one detector from the list (ID has to be consistent with one provided by GET response). Changing detector will set detector to &#x60;Inactive&#x60; state and will require reinitialization. 
     /// </remarks>
     /// <param name="detectorSelection"> (optional)</param>
-    virtual void config_select_detector_put(const org::openapitools::server::model::Detector_selection &detectorSelection, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_select_detector_put( const org::openapitools::server::model::Detector_selection &detectorSelection, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get data processing configuration
     /// </summary>
     /// <remarks>
     /// Can be done anytime
     /// </remarks>
-    virtual void config_spot_finding_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_spot_finding_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Configure spot finding
     /// </summary>
@@ -339,14 +357,14 @@ private:
     /// Can be done anytime, also while data collection is running
     /// </remarks>
     /// <param name="spotFindingSettings"> (optional)</param>
-    virtual void config_spot_finding_put(const org::openapitools::server::model::Spot_finding_settings &spotFindingSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_spot_finding_put( const org::openapitools::server::model::Spot_finding_settings &spotFindingSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Detector must be Initialized. Get user mask of the detector (binary) 
     /// </summary>
     /// <remarks>
     /// Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked
     /// </remarks>
-    virtual void config_user_mask_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_user_mask_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Upload user mask of the detector (binary)
     /// </summary>
@@ -360,7 +378,7 @@ private:
     /// <remarks>
     /// Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked
     /// </remarks>
-    virtual void config_user_mask_tiff_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_user_mask_tiff_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Upload user mask of the detector
     /// </summary>
@@ -374,7 +392,7 @@ private:
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void config_zeromq_metadata_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_zeromq_metadata_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Set ZeroMQ metadata settings
     /// </summary>
@@ -382,14 +400,14 @@ private:
     /// Jungfraujoch can generate metadata message stream on ZeroMQ PUB socket. This stream covers all images. Here settings of the socket can be adjusted. While the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request. 
     /// </remarks>
     /// <param name="zeromqMetadataSettings"> (optional)</param>
-    virtual void config_zeromq_metadata_put(const org::openapitools::server::model::Zeromq_metadata_settings &zeromqMetadataSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_zeromq_metadata_put( const org::openapitools::server::model::Zeromq_metadata_settings &zeromqMetadataSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get ZeroMQ preview settings
     /// </summary>
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void config_zeromq_preview_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_zeromq_preview_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Set ZeroMQ preview settings
     /// </summary>
@@ -397,35 +415,35 @@ private:
     /// Jungfraujoch can generate preview message stream on ZeroMQ SUB socket. Here settings of the socket can be adjusted. While the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request. Options set with this PUT request have no effect on HTTP based preview. 
     /// </remarks>
     /// <param name="zeromqPreviewSettings"> (optional)</param>
-    virtual void config_zeromq_preview_put(const org::openapitools::server::model::Zeromq_preview_settings &zeromqPreviewSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void config_zeromq_preview_put( const org::openapitools::server::model::Zeromq_preview_settings &zeromqPreviewSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Prepare detector to turn off
     /// </summary>
     /// <remarks>
     /// Should be in &#x60;Idle&#x60; or &#x60;Error&#x60; state. Command deactivates data acquisition and turns off detector high voltage and ASIC. Should be used always before turning off power from the detector. 
     /// </remarks>
-    virtual void deactivate_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void deactivate_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get detector status
     /// </summary>
     /// <remarks>
     /// Status of the JUNGFRAU detector
     /// </remarks>
-    virtual void detector_status_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void detector_status_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get status of FPGA devices
     /// </summary>
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void fpga_status_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void fpga_status_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Clear image buffer
     /// </summary>
     /// <remarks>
     /// Turns off image buffer for the last data collection. Can be only run when Jungfraujoch is not collecting data.
     /// </remarks>
-    virtual void image_buffer_clear_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void image_buffer_clear_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get image message in CBOR format
     /// </summary>
@@ -433,7 +451,7 @@ private:
     /// Contains full image data and metadata. The image must come from the latest data collection.
     /// </remarks>
     /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
-    virtual void image_buffer_image_cbor_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void image_buffer_image_cbor_get( const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get preview image in JPEG format using custom settings
     /// </summary>
@@ -445,27 +463,12 @@ private:
     /// <param name="showRoi">Show ROI areas on the image (optional, default to false)</param>
     /// <param name="showSpots">Show spot finding results on the image (optional, default to true)</param>
     /// <param name="showBeamCenter">Show beam center on the image (optional, default to true)</param>
-    /// <param name="saturation">Saturation value to set contrast in the preview image (optional, default to 10.0f)</param>
+    /// <param name="saturation">Saturation value to set contrast in the preview image; if not provided, then autocontrast procedure is used (optional, default to 0.0f)</param>
     /// <param name="jpegQuality">Quality of JPEG image (100 - highest; 0 - lowest) (optional, default to 100L)</param>
     /// <param name="showResRing">Show resolution ring, provided in Angstrom (optional, default to 0.1f)</param>
-    /// <param name="color">Color scale for preview image: 0 - indigo, 1 - viridis, 2 - B/W, 3 - heat (optional, default to &quot;indigo&quot;)</param>
-    virtual void image_buffer_image_jpeg_get(const std::optional<int64_t> &id, const std::optional<bool> &showUserMask, const std::optional<bool> &showRoi, const std::optional<bool> &showSpots, const std::optional<bool> &showBeamCenter, const std::optional<float> &saturation, const std::optional<int64_t> &jpegQuality, const std::optional<float> &showResRing, const std::optional<std::string> &color, Pistache::Http::ResponseWriter &response) = 0;
-    /// <summary>
-    /// Get preview image in PNG format using custom settings
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// </remarks>
-    /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
-    /// <param name="showUserMask">Show user mask (optional, default to false)</param>
-    /// <param name="showRoi">Show ROI areas on the image (optional, default to false)</param>
-    /// <param name="showSpots">Show spot finding results on the image (optional, default to true)</param>
-    /// <param name="showBeamCenter">Show beam center on the image (optional, default to true)</param>
-    /// <param name="saturation">Saturation value to set contrast in the preview image (optional, default to 10.0f)</param>
-    /// <param name="jpegQuality">Quality of JPEG image (100 - highest; 0 - lowest) (optional, default to 100L)</param>
-    /// <param name="showResRing">Show resolution ring, provided in Angstrom (optional, default to 0.1f)</param>
-    /// <param name="color">Color scale for preview image: 0 - indigo, 1 - viridis, 2 - B/W, 3 - heat (optional, default to &quot;indigo&quot;)</param>
-    virtual void image_buffer_image_png_get(const std::optional<int64_t> &id, const std::optional<bool> &showUserMask, const std::optional<bool> &showRoi, const std::optional<bool> &showSpots, const std::optional<bool> &showBeamCenter, const std::optional<float> &saturation, const std::optional<int64_t> &jpegQuality, const std::optional<float> &showResRing, const std::optional<std::string> &color, Pistache::Http::ResponseWriter &response) = 0;
+    /// <param name="color">Color scale for preview image (optional, default to &quot;indigo&quot;)</param>
+    /// <param name="showResEst">Show resolution estimation as a ring (optional, default to false)</param>
+    virtual void image_buffer_image_jpeg_get( const std::optional<int64_t> &id, const std::optional<bool> &showUserMask, const std::optional<bool> &showRoi, const std::optional<bool> &showSpots, const std::optional<bool> &showBeamCenter, const std::optional<float> &saturation, const std::optional<int64_t> &jpegQuality, const std::optional<float> &showResRing, const std::optional<std::string> &color, const std::optional<bool> &showResEst, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get preview image in TIFF format
     /// </summary>
@@ -473,35 +476,35 @@ private:
     /// 
     /// </remarks>
     /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
-    virtual void image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void image_buffer_image_tiff_get( const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get Start message in CBOR format
     /// </summary>
     /// <remarks>
     /// Contains metadata for a dataset (e.g., experimental geometry)
     /// </remarks>
-    virtual void image_buffer_start_cbor_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void image_buffer_start_cbor_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get status of the image buffers
     /// </summary>
     /// <remarks>
     /// Can be run at any stage of Jungfraujoch operation, including during data collection. The status of the image buffer is volatile during data collection - if data collection goes for more images than available buffer slots, then image might be replaced in the buffer between calling /images and /image.cbor. 
     /// </remarks>
-    virtual void image_buffer_status_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void image_buffer_status_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Initialize detector and data acquisition
     /// </summary>
     /// <remarks>
     /// Should be used in two cases:   - Detector is in &#x60;Inactive&#x60; state   - Detector is in &#x60;Error&#x60; state X-ray shutter must be closed.  This operation will reconfigure network interface of the detector.  During operation of the detector it is recommended to use the &#x60;POST /pedestal&#x60; operation instead. If storage cells are used, the execution time might be few minutes.  This is async function - one needs to use &#x60;POST /wait_till_done&#x60; to ensure operation is done. 
     /// </remarks>
-    virtual void initialize_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void initialize_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Collect dark current for the detector
     /// </summary>
     /// <remarks>
     /// Updates calibration of the JUNGFRAU detector. Must be in &#x60;Idle&#x60; state.  X-ray shutter must be closed. Recommended to run once per hour for long integration times (&gt; 100 us).  This is async function - one needs to use &#x60;POST /wait_till_done&#x60; to ensure operation is done. 
     /// </remarks>
-    virtual void pedestal_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void pedestal_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get pedestal in TIFF format
     /// </summary>
@@ -510,7 +513,16 @@ private:
     /// </remarks>
     /// <param name="gainLevel">Gain level (0, 1, 2)</param>
     /// <param name="sc">Storage cell number (optional, default to 0)</param>
-    virtual void preview_pedestal_tiff_get(const std::optional<int32_t> &gainLevel, const std::optional<int32_t> &sc, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void preview_pedestal_tiff_get( const std::optional<int32_t> &gainLevel, const std::optional<int32_t> &sc, Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Generate 1D plot from Jungfraujoch and send in raw binary format. Data are provided as (32-bit) float binary array. This format doesn&#39;t transmit information about X-axis, only values, so it is of limited use for azimuthal integration. 
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    /// <param name="type">Type of requested plot</param>
+    /// <param name="roi">Name of ROI for which plot is requested (optional, default to &quot;&quot;)</param>
+    virtual void preview_plot_bin_get( const std::optional<std::string> &type, const std::optional<std::string> &roi, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Generate 1D plot from Jungfraujoch
     /// </summary>
@@ -518,18 +530,19 @@ private:
     /// 
     /// </remarks>
     /// <param name="type">Type of requested plot</param>
-    /// <param name="binning">Binning of frames for the plot (0 &#x3D; default binning) (optional, default to 0)</param>
+    /// <param name="binning">Binning of frames for the plot (0 &#x3D; default binning) (optional, default to 1)</param>
     /// <param name="compression">Enable DEFLATE compression of output data. (optional, default to false)</param>
+    /// <param name="fill">Fill value for elements that were missed during data collection  (optional, default to 0.0f)</param>
     /// <param name="experimentalCoord">If measurement has goniometer axis defined, plot X-axis will represent rotation angle If measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value For still measurement the number is ignored  (optional, default to false)</param>
     /// <param name="azintUnit">Unit used for azim int.  (optional, default to &quot;Q_recipA&quot;)</param>
-    virtual void preview_plot_get(const std::optional<std::string> &type, const std::optional<int32_t> &binning, const std::optional<bool> &compression, const std::optional<bool> &experimentalCoord, const std::optional<std::string> &azintUnit, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void preview_plot_get( const std::optional<std::string> &type, const std::optional<int32_t> &binning, const std::optional<bool> &compression, const std::optional<float> &fill, const std::optional<bool> &experimentalCoord, const std::optional<std::string> &azintUnit, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get full scan result
     /// </summary>
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void result_scan_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void result_scan_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Start detector
     /// </summary>
@@ -537,21 +550,21 @@ private:
     /// Start data acquisition. Detector must be in &#x60;Idle&#x60; state. Doesn&#39;t run calibration procedure. When the function returns, detector is ready to accept soft/TTL triggers. 
     /// </remarks>
     /// <param name="datasetSettings"> (optional)</param>
-    virtual void start_post(const org::openapitools::server::model::Dataset_settings &datasetSettings, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void start_post( const org::openapitools::server::model::Dataset_settings &datasetSettings, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get calibration statistics
     /// </summary>
     /// <remarks>
     /// Statistics are provided for each module/storage cell separately
     /// </remarks>
-    virtual void statistics_calibration_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void statistics_calibration_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get data collection statistics
     /// </summary>
     /// <remarks>
     /// Results of the last data collection
     /// </remarks>
-    virtual void statistics_data_collection_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void statistics_data_collection_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get general statistics
     /// </summary>
@@ -559,28 +572,28 @@ private:
     /// 
     /// </remarks>
     /// <param name="compression">Enable DEFLATE compression of output data. (optional, default to false)</param>
-    virtual void statistics_get(const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void statistics_get( const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get Jungfraujoch status
     /// </summary>
     /// <remarks>
     /// Status of the data acquisition
     /// </remarks>
-    virtual void status_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void status_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Send soft trigger to the detector
     /// </summary>
     /// <remarks>
     /// Generate soft trigger
     /// </remarks>
-    virtual void trigger_post(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void trigger_post( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Get Jungfraujoch version of jfjoch_broker
     /// </summary>
     /// <remarks>
     /// 
     /// </remarks>
-    virtual void version_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void version_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Wait for acquisition done
     /// </summary>
@@ -588,21 +601,21 @@ private:
     /// Block execution of external script till initialization, data collection or pedestal is finished. Running this command does not affect (cancel) running data collection, it is only to ensure synchronous execution of other software.  To not block web server for a indefinite period of time, the procedure is provided with a timeout. Extending timeout is possible, but requires to ensure safety that client will not close the connection and retry the connection. 
     /// </remarks>
     /// <param name="timeout">Timeout in seconds (0 &#x3D;&#x3D; immediate response) (optional, default to 60)</param>
-    virtual void wait_till_done_post(const std::optional<int32_t> &timeout, Pistache::Http::ResponseWriter &response) = 0;
+    virtual void wait_till_done_post( const std::optional<int32_t> &timeout, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Return XFEL event codes for the current data acquisition
     /// </summary>
     /// <remarks>
     /// Return array of XFEL event codes
     /// </remarks>
-    virtual void xfel_event_code_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void xfel_event_code_get( Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
     /// Return XFEL pulse IDs for the current data acquisition
     /// </summary>
     /// <remarks>
     /// Return array of XFEL pulse IDs - (-1) if image not recorded
     /// </remarks>
-    virtual void xfel_pulse_id_get(Pistache::Http::ResponseWriter &response) = 0;
+    virtual void xfel_pulse_id_get( Pistache::Http::ResponseWriter &response) = 0;
 
 };
 

broker/gen/model/Azim_int_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Azim_int_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -58,12 +58,12 @@ public:
     /// Azim_int_settings members
 
     /// <summary>
-    /// Apply polarization correction for radial integration (polarization factor must be configured in dataset settings)
+    /// Apply polarization correction for azimuthal integration (polarization factor must be configured in dataset settings)
     /// </summary>
     bool isPolarizationCorr() const;
     void setPolarizationCorr(bool const value);
     /// <summary>
-    /// Apply solid angle correction for radial integration
+    /// Apply solid angle correction for azimuthal integration
     /// </summary>
     bool isSolidAngleCorr() const;
     void setSolidAngleCorr(bool const value);
@@ -83,7 +83,7 @@ public:
     float getQSpacing() const;
     void setQSpacing(float const value);
     /// <summary>
-    /// Numer of azimuthal (phi) bins; 1 &#x3D; standard 1D radial integration
+    /// Numer of azimuthal (phi) bins; 1 &#x3D; standard 1D azimuthal integration
     /// </summary>
     int64_t getAzimuthalBins() const;
     void setAzimuthalBins(int64_t const value);

broker/gen/model/Broker_status.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -30,8 +30,6 @@ Broker_status::Broker_status()
     m_Message_severityIsSet = false;
     m_Gpu_count = 0;
     m_Gpu_countIsSet = false;
-    m_Ml_resolution_estimation = false;
-    m_Ml_resolution_estimationIsSet = false;
     
 }
 
@@ -73,7 +71,7 @@ bool Broker_status::validate(std::stringstream& msg, const std::string& pathPref
         }
 
     }
-                    
+                
     return success;
 }
 
@@ -95,10 +93,7 @@ bool Broker_status::operator==(const Broker_status& rhs) const
     ((!messageSeverityIsSet() && !rhs.messageSeverityIsSet()) || (messageSeverityIsSet() && rhs.messageSeverityIsSet() && getMessageSeverity() == rhs.getMessageSeverity())) &&
     
     
-    ((!gpuCountIsSet() && !rhs.gpuCountIsSet()) || (gpuCountIsSet() && rhs.gpuCountIsSet() && getGpuCount() == rhs.getGpuCount())) &&
-    
-    
-    ((!mlResolutionEstimationIsSet() && !rhs.mlResolutionEstimationIsSet()) || (mlResolutionEstimationIsSet() && rhs.mlResolutionEstimationIsSet() && isMlResolutionEstimation() == rhs.isMlResolutionEstimation()))
+    ((!gpuCountIsSet() && !rhs.gpuCountIsSet()) || (gpuCountIsSet() && rhs.gpuCountIsSet() && getGpuCount() == rhs.getGpuCount()))
     
     ;
 }
@@ -120,8 +115,6 @@ void to_json(nlohmann::json& j, const Broker_status& o)
         j["message_severity"] = o.m_Message_severity;
     if(o.gpuCountIsSet())
         j["gpu_count"] = o.m_Gpu_count;
-    if(o.mlResolutionEstimationIsSet())
-        j["ml_resolution_estimation"] = o.m_Ml_resolution_estimation;
     
 }
 
@@ -148,11 +141,6 @@ void from_json(const nlohmann::json& j, Broker_status& o)
         j.at("gpu_count").get_to(o.m_Gpu_count);
         o.m_Gpu_countIsSet = true;
     } 
-    if(j.find("ml_resolution_estimation") != j.end())
-    {
-        j.at("ml_resolution_estimation").get_to(o.m_Ml_resolution_estimation);
-        o.m_Ml_resolution_estimationIsSet = true;
-    } 
     
 }
 
@@ -232,23 +220,6 @@ void Broker_status::unsetGpu_count()
 {
     m_Gpu_countIsSet = false;
 }
-bool Broker_status::isMlResolutionEstimation() const
-{
-    return m_Ml_resolution_estimation;
-}
-void Broker_status::setMlResolutionEstimation(bool const value)
-{
-    m_Ml_resolution_estimation = value;
-    m_Ml_resolution_estimationIsSet = true;
-}
-bool Broker_status::mlResolutionEstimationIsSet() const
-{
-    return m_Ml_resolution_estimationIsSet;
-}
-void Broker_status::unsetMl_resolution_estimation()
-{
-    m_Ml_resolution_estimationIsSet = false;
-}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Broker_status.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -91,13 +91,6 @@ public:
     void setGpuCount(int32_t const value);
     bool gpuCountIsSet() const;
     void unsetGpu_count();
-    /// <summary>
-    /// ML resolution estimation available
-    /// </summary>
-    bool isMlResolutionEstimation() const;
-    void setMlResolutionEstimation(bool const value);
-    bool mlResolutionEstimationIsSet() const;
-    void unsetMl_resolution_estimation();
 
     friend  void to_json(nlohmann::json& j, const Broker_status& o);
     friend  void from_json(const nlohmann::json& j, Broker_status& o);
@@ -112,8 +105,6 @@ protected:
     bool m_Message_severityIsSet;
     int32_t m_Gpu_count;
     bool m_Gpu_countIsSet;
-    bool m_Ml_resolution_estimation;
-    bool m_Ml_resolution_estimationIsSet;
     
 };
 

broker/gen/model/Calibration_statistics_inner.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Calibration_statistics_inner.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dark_mask_settings.cpp

@@ -0,0 +1,227 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+#include "Dark_mask_settings.h"
+#include "Helpers.h"
+
+#include <sstream>
+
+namespace org::openapitools::server::model
+{
+
+Dark_mask_settings::Dark_mask_settings()
+{
+    m_Detector_threshold_keV = 3.5f;
+    m_Frame_time_us = 10000L;
+    m_Number_of_frames = 1000L;
+    m_Max_allowed_pixel_count = 1L;
+    m_Max_frames_with_signal = 10L;
+    
+}
+
+void Dark_mask_settings::validate() const
+{
+    std::stringstream msg;
+    if (!validate(msg))
+    {
+        throw org::openapitools::server::helpers::ValidationException(msg.str());
+    }
+}
+
+bool Dark_mask_settings::validate(std::stringstream& msg) const
+{
+    return validate(msg, "");
+}
+
+bool Dark_mask_settings::validate(std::stringstream& msg, const std::string& pathPrefix) const
+{
+    bool success = true;
+    const std::string _pathPrefix = pathPrefix.empty() ? "Dark_mask_settings" : pathPrefix;
+
+         
+    
+    /* Detector_threshold_keV */ {
+        const float& value = m_Detector_threshold_keV;
+        const std::string currentValuePath = _pathPrefix + ".detectorThresholdKeV";
+                
+        
+        if (value < static_cast<float>(2.5))
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 2.5;";
+        }
+        if (value > static_cast<float>(100.0))
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 100.0;";
+        }
+
+    }
+         
+    
+    /* Frame_time_us */ {
+        const int64_t& value = m_Frame_time_us;
+        const std::string currentValuePath = _pathPrefix + ".frameTimeUs";
+                
+        
+        if (value < 500ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 500;";
+        }
+        if (value > 100000ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 100000;";
+        }
+
+    }
+         
+    
+    /* Number_of_frames */ {
+        const int64_t& value = m_Number_of_frames;
+        const std::string currentValuePath = _pathPrefix + ".numberOfFrames";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
+    
+    /* Max_allowed_pixel_count */ {
+        const int64_t& value = m_Max_allowed_pixel_count;
+        const std::string currentValuePath = _pathPrefix + ".maxAllowedPixelCount";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
+    
+    /* Max_frames_with_signal */ {
+        const int64_t& value = m_Max_frames_with_signal;
+        const std::string currentValuePath = _pathPrefix + ".maxFramesWithSignal";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+    
+    return success;
+}
+
+bool Dark_mask_settings::operator==(const Dark_mask_settings& rhs) const
+{
+    return
+    
+    
+    (getDetectorThresholdKeV() == rhs.getDetectorThresholdKeV())
+     &&
+    
+    (getFrameTimeUs() == rhs.getFrameTimeUs())
+     &&
+    
+    (getNumberOfFrames() == rhs.getNumberOfFrames())
+     &&
+    
+    (getMaxAllowedPixelCount() == rhs.getMaxAllowedPixelCount())
+     &&
+    
+    (getMaxFramesWithSignal() == rhs.getMaxFramesWithSignal())
+    
+    
+    ;
+}
+
+bool Dark_mask_settings::operator!=(const Dark_mask_settings& rhs) const
+{
+    return !(*this == rhs);
+}
+
+void to_json(nlohmann::json& j, const Dark_mask_settings& o)
+{
+    j = nlohmann::json::object();
+    j["detector_threshold_keV"] = o.m_Detector_threshold_keV;
+    j["frame_time_us"] = o.m_Frame_time_us;
+    j["number_of_frames"] = o.m_Number_of_frames;
+    j["max_allowed_pixel_count"] = o.m_Max_allowed_pixel_count;
+    j["max_frames_with_signal"] = o.m_Max_frames_with_signal;
+    
+}
+
+void from_json(const nlohmann::json& j, Dark_mask_settings& o)
+{
+    j.at("detector_threshold_keV").get_to(o.m_Detector_threshold_keV);
+    j.at("frame_time_us").get_to(o.m_Frame_time_us);
+    j.at("number_of_frames").get_to(o.m_Number_of_frames);
+    j.at("max_allowed_pixel_count").get_to(o.m_Max_allowed_pixel_count);
+    j.at("max_frames_with_signal").get_to(o.m_Max_frames_with_signal);
+    
+}
+
+float Dark_mask_settings::getDetectorThresholdKeV() const
+{
+    return m_Detector_threshold_keV;
+}
+void Dark_mask_settings::setDetectorThresholdKeV(float const value)
+{
+    m_Detector_threshold_keV = value;
+}
+int64_t Dark_mask_settings::getFrameTimeUs() const
+{
+    return m_Frame_time_us;
+}
+void Dark_mask_settings::setFrameTimeUs(int64_t const value)
+{
+    m_Frame_time_us = value;
+}
+int64_t Dark_mask_settings::getNumberOfFrames() const
+{
+    return m_Number_of_frames;
+}
+void Dark_mask_settings::setNumberOfFrames(int64_t const value)
+{
+    m_Number_of_frames = value;
+}
+int64_t Dark_mask_settings::getMaxAllowedPixelCount() const
+{
+    return m_Max_allowed_pixel_count;
+}
+void Dark_mask_settings::setMaxAllowedPixelCount(int64_t const value)
+{
+    m_Max_allowed_pixel_count = value;
+}
+int64_t Dark_mask_settings::getMaxFramesWithSignal() const
+{
+    return m_Max_frames_with_signal;
+}
+void Dark_mask_settings::setMaxFramesWithSignal(int64_t const value)
+{
+    m_Max_frames_with_signal = value;
+}
+
+
+} // namespace org::openapitools::server::model
+

broker/gen/model/Dark_mask_settings.h

@@ -0,0 +1,104 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+/*
+ * Dark_mask_settings.h
+ *
+ * Settings for collection of dark images to be used for mask calculation
+ */
+
+#ifndef Dark_mask_settings_H_
+#define Dark_mask_settings_H_
+
+
+#include <nlohmann/json.hpp>
+
+namespace org::openapitools::server::model
+{
+
+/// <summary>
+/// Settings for collection of dark images to be used for mask calculation
+/// </summary>
+class  Dark_mask_settings
+{
+public:
+    Dark_mask_settings();
+    virtual ~Dark_mask_settings() = default;
+
+
+    /// <summary>
+    /// Validate the current data in the model. Throws a ValidationException on failure.
+    /// </summary>
+    void validate() const;
+
+    /// <summary>
+    /// Validate the current data in the model. Returns false on error and writes an error
+    /// message into the given stringstream.
+    /// </summary>
+    bool validate(std::stringstream& msg) const;
+
+    /// <summary>
+    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
+    /// Not meant to be called outside that case.
+    /// </summary>
+    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
+
+    bool operator==(const Dark_mask_settings& rhs) const;
+    bool operator!=(const Dark_mask_settings& rhs) const;
+
+    /////////////////////////////////////////////
+    /// Dark_mask_settings members
+
+    /// <summary>
+    /// Energy threshold for dark image collection
+    /// </summary>
+    float getDetectorThresholdKeV() const;
+    void setDetectorThresholdKeV(float const value);
+    /// <summary>
+    /// Time between frames for dark image collection
+    /// </summary>
+    int64_t getFrameTimeUs() const;
+    void setFrameTimeUs(int64_t const value);
+    /// <summary>
+    /// Number of frames for dark image collection; zero means no dark collection
+    /// </summary>
+    int64_t getNumberOfFrames() const;
+    void setNumberOfFrames(int64_t const value);
+    /// <summary>
+    /// Maximum count in a pixel considered normal (not-masked)
+    /// </summary>
+    int64_t getMaxAllowedPixelCount() const;
+    void setMaxAllowedPixelCount(int64_t const value);
+    /// <summary>
+    /// Maximum number of frames with signal in a pixel considered normal (not-masked)
+    /// </summary>
+    int64_t getMaxFramesWithSignal() const;
+    void setMaxFramesWithSignal(int64_t const value);
+
+    friend  void to_json(nlohmann::json& j, const Dark_mask_settings& o);
+    friend  void from_json(const nlohmann::json& j, Dark_mask_settings& o);
+protected:
+    float m_Detector_threshold_keV;
+
+    int64_t m_Frame_time_us;
+
+    int64_t m_Number_of_frames;
+
+    int64_t m_Max_allowed_pixel_count;
+
+    int64_t m_Max_frames_with_signal;
+
+    
+};
+
+} // namespace org::openapitools::server::model
+
+#endif /* Dark_mask_settings_H_ */

broker/gen/model/Dataset_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -78,6 +78,13 @@ Dataset_settings::Dataset_settings()
     m_Poni_rot3_rad = 0.0f;
     m_Poni_rot3_radIsSet = false;
     m_Unit_cellIsSet = false;
+    m_Spot_finding = true;
+    m_Spot_findingIsSet = false;
+    m_Max_spot_count = 250;
+    m_Max_spot_countIsSet = false;
+    m_Detect_ice_rings = false;
+    m_Detect_ice_ringsIsSet = false;
+    m_Xray_fluorescence_spectrumIsSet = false;
     
 }
 
@@ -196,10 +203,10 @@ bool Dataset_settings::validate(std::stringstream& msg, const std::string& pathP
         const std::string currentValuePath = _pathPrefix + ".spaceGroupNumber";
                 
         
-        if (value < 0ll)
+        if (value < 1ll)
         {
             success = false;
-            msg << currentValuePath << ": must be greater than or equal to 0;";
+            msg << currentValuePath << ": must be greater than or equal to 1;";
         }
         if (value > 194ll)
         {
@@ -397,7 +404,26 @@ bool Dataset_settings::validate(std::stringstream& msg, const std::string& pathP
         }
 
     }
+                 
+    if (maxSpotCountIsSet())
+    {
+        const int32_t& value = m_Max_spot_count;
+        const std::string currentValuePath = _pathPrefix + ".maxSpotCount";
+                
         
+        if (value < 10)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 10;";
+        }
+        if (value > 2000)
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 2000;";
+        }
+
+    }
+            
     return success;
 }
 
@@ -503,7 +529,19 @@ bool Dataset_settings::operator==(const Dataset_settings& rhs) const
     ((!poniRot3RadIsSet() && !rhs.poniRot3RadIsSet()) || (poniRot3RadIsSet() && rhs.poniRot3RadIsSet() && getPoniRot3Rad() == rhs.getPoniRot3Rad())) &&
     
     
-    ((!unitCellIsSet() && !rhs.unitCellIsSet()) || (unitCellIsSet() && rhs.unitCellIsSet() && getUnitCell() == rhs.getUnitCell()))
+    ((!unitCellIsSet() && !rhs.unitCellIsSet()) || (unitCellIsSet() && rhs.unitCellIsSet() && getUnitCell() == rhs.getUnitCell())) &&
+    
+    
+    ((!spotFindingIsSet() && !rhs.spotFindingIsSet()) || (spotFindingIsSet() && rhs.spotFindingIsSet() && isSpotFinding() == rhs.isSpotFinding())) &&
+    
+    
+    ((!maxSpotCountIsSet() && !rhs.maxSpotCountIsSet()) || (maxSpotCountIsSet() && rhs.maxSpotCountIsSet() && getMaxSpotCount() == rhs.getMaxSpotCount())) &&
+    
+    
+    ((!detectIceRingsIsSet() && !rhs.detectIceRingsIsSet()) || (detectIceRingsIsSet() && rhs.detectIceRingsIsSet() && isDetectIceRings() == rhs.isDetectIceRings())) &&
+    
+    
+    ((!xrayFluorescenceSpectrumIsSet() && !rhs.xrayFluorescenceSpectrumIsSet()) || (xrayFluorescenceSpectrumIsSet() && rhs.xrayFluorescenceSpectrumIsSet() && getXrayFluorescenceSpectrum() == rhs.getXrayFluorescenceSpectrum()))
     
     ;
 }
@@ -578,6 +616,14 @@ void to_json(nlohmann::json& j, const Dataset_settings& o)
         j["poni_rot3_rad"] = o.m_Poni_rot3_rad;
     if(o.unitCellIsSet())
         j["unit_cell"] = o.m_Unit_cell;
+    if(o.spotFindingIsSet())
+        j["spot_finding"] = o.m_Spot_finding;
+    if(o.maxSpotCountIsSet())
+        j["max_spot_count"] = o.m_Max_spot_count;
+    if(o.detectIceRingsIsSet())
+        j["detect_ice_rings"] = o.m_Detect_ice_rings;
+    if(o.xrayFluorescenceSpectrumIsSet())
+        j["xray_fluorescence_spectrum"] = o.m_Xray_fluorescence_spectrum;
     
 }
 
@@ -732,6 +778,26 @@ void from_json(const nlohmann::json& j, Dataset_settings& o)
         j.at("unit_cell").get_to(o.m_Unit_cell);
         o.m_Unit_cellIsSet = true;
     } 
+    if(j.find("spot_finding") != j.end())
+    {
+        j.at("spot_finding").get_to(o.m_Spot_finding);
+        o.m_Spot_findingIsSet = true;
+    } 
+    if(j.find("max_spot_count") != j.end())
+    {
+        j.at("max_spot_count").get_to(o.m_Max_spot_count);
+        o.m_Max_spot_countIsSet = true;
+    } 
+    if(j.find("detect_ice_rings") != j.end())
+    {
+        j.at("detect_ice_rings").get_to(o.m_Detect_ice_rings);
+        o.m_Detect_ice_ringsIsSet = true;
+    } 
+    if(j.find("xray_fluorescence_spectrum") != j.end())
+    {
+        j.at("xray_fluorescence_spectrum").get_to(o.m_Xray_fluorescence_spectrum);
+        o.m_Xray_fluorescence_spectrumIsSet = true;
+    } 
     
 }
 
@@ -1260,6 +1326,74 @@ void Dataset_settings::unsetUnit_cell()
 {
     m_Unit_cellIsSet = false;
 }
+bool Dataset_settings::isSpotFinding() const
+{
+    return m_Spot_finding;
+}
+void Dataset_settings::setSpotFinding(bool const value)
+{
+    m_Spot_finding = value;
+    m_Spot_findingIsSet = true;
+}
+bool Dataset_settings::spotFindingIsSet() const
+{
+    return m_Spot_findingIsSet;
+}
+void Dataset_settings::unsetSpot_finding()
+{
+    m_Spot_findingIsSet = false;
+}
+int32_t Dataset_settings::getMaxSpotCount() const
+{
+    return m_Max_spot_count;
+}
+void Dataset_settings::setMaxSpotCount(int32_t const value)
+{
+    m_Max_spot_count = value;
+    m_Max_spot_countIsSet = true;
+}
+bool Dataset_settings::maxSpotCountIsSet() const
+{
+    return m_Max_spot_countIsSet;
+}
+void Dataset_settings::unsetMax_spot_count()
+{
+    m_Max_spot_countIsSet = false;
+}
+bool Dataset_settings::isDetectIceRings() const
+{
+    return m_Detect_ice_rings;
+}
+void Dataset_settings::setDetectIceRings(bool const value)
+{
+    m_Detect_ice_rings = value;
+    m_Detect_ice_ringsIsSet = true;
+}
+bool Dataset_settings::detectIceRingsIsSet() const
+{
+    return m_Detect_ice_ringsIsSet;
+}
+void Dataset_settings::unsetDetect_ice_rings()
+{
+    m_Detect_ice_ringsIsSet = false;
+}
+org::openapitools::server::model::Dataset_settings_xray_fluorescence_spectrum Dataset_settings::getXrayFluorescenceSpectrum() const
+{
+    return m_Xray_fluorescence_spectrum;
+}
+void Dataset_settings::setXrayFluorescenceSpectrum(org::openapitools::server::model::Dataset_settings_xray_fluorescence_spectrum const& value)
+{
+    m_Xray_fluorescence_spectrum = value;
+    m_Xray_fluorescence_spectrumIsSet = true;
+}
+bool Dataset_settings::xrayFluorescenceSpectrumIsSet() const
+{
+    return m_Xray_fluorescence_spectrumIsSet;
+}
+void Dataset_settings::unsetXray_fluorescence_spectrum()
+{
+    m_Xray_fluorescence_spectrumIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Dataset_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,6 +24,7 @@
 #include "Rotation_axis.h"
 #include "Unit_cell.h"
 #include <string>
+#include "Dataset_settings_xray_fluorescence_spectrum.h"
 #include <nlohmann/json.hpp>
 
 namespace org::openapitools::server::model
@@ -77,7 +78,7 @@ public:
     bool ntriggerIsSet() const;
     void unsetNtrigger();
     /// <summary>
-    /// Image time.  If not provided (or zero value) the frame time is assumed as default. Image time must be multiple of frame time; max value is 256 * frame_time.             In XFEL mode: summation happens for frames collected with multiple triggers. Ignored for storage cells and if raw data are saved. 
+    /// Image time.  If not provided (or zero value) the frame time is assumed as default. For JUNGFRAU image time must be multiple of frame time and max value is 256 * frame_time.             In XFEL mode: summation happens for frames collected with multiple triggers. Ignored for storage cells and if raw data are saved. 
     /// </summary>
     int64_t getImageTimeUs() const;
     void setImageTimeUs(int64_t const value);
@@ -285,6 +286,34 @@ public:
     void setUnitCell(org::openapitools::server::model::Unit_cell const& value);
     bool unitCellIsSet() const;
     void unsetUnit_cell();
+    /// <summary>
+    /// Enable spot finding and save spots
+    /// </summary>
+    bool isSpotFinding() const;
+    void setSpotFinding(bool const value);
+    bool spotFindingIsSet() const;
+    void unsetSpot_finding();
+    /// <summary>
+    /// Maximum number of spots that are saved/used for indexing; spots with highest intensity are selected
+    /// </summary>
+    int32_t getMaxSpotCount() const;
+    void setMaxSpotCount(int32_t const value);
+    bool maxSpotCountIsSet() const;
+    void unsetMax_spot_count();
+    /// <summary>
+    /// Flag spots as ice rings and reduce their effect on indexing
+    /// </summary>
+    bool isDetectIceRings() const;
+    void setDetectIceRings(bool const value);
+    bool detectIceRingsIsSet() const;
+    void unsetDetect_ice_rings();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Dataset_settings_xray_fluorescence_spectrum getXrayFluorescenceSpectrum() const;
+    void setXrayFluorescenceSpectrum(org::openapitools::server::model::Dataset_settings_xray_fluorescence_spectrum const& value);
+    bool xrayFluorescenceSpectrumIsSet() const;
+    void unsetXray_fluorescence_spectrum();
 
     friend  void to_json(nlohmann::json& j, const Dataset_settings& o);
     friend  void from_json(const nlohmann::json& j, Dataset_settings& o);
@@ -355,6 +384,14 @@ protected:
     bool m_Poni_rot3_radIsSet;
     org::openapitools::server::model::Unit_cell m_Unit_cell;
     bool m_Unit_cellIsSet;
+    bool m_Spot_finding;
+    bool m_Spot_findingIsSet;
+    int32_t m_Max_spot_count;
+    bool m_Max_spot_countIsSet;
+    bool m_Detect_ice_rings;
+    bool m_Detect_ice_ringsIsSet;
+    org::openapitools::server::model::Dataset_settings_xray_fluorescence_spectrum m_Xray_fluorescence_spectrum;
+    bool m_Xray_fluorescence_spectrumIsSet;
     
 };
 

broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.cpp

@@ -0,0 +1,145 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+#include "Dataset_settings_xray_fluorescence_spectrum.h"
+#include "Helpers.h"
+
+#include <sstream>
+
+namespace org::openapitools::server::model
+{
+
+Dataset_settings_xray_fluorescence_spectrum::Dataset_settings_xray_fluorescence_spectrum()
+{
+    
+}
+
+void Dataset_settings_xray_fluorescence_spectrum::validate() const
+{
+    std::stringstream msg;
+    if (!validate(msg))
+    {
+        throw org::openapitools::server::helpers::ValidationException(msg.str());
+    }
+}
+
+bool Dataset_settings_xray_fluorescence_spectrum::validate(std::stringstream& msg) const
+{
+    return validate(msg, "");
+}
+
+bool Dataset_settings_xray_fluorescence_spectrum::validate(std::stringstream& msg, const std::string& pathPrefix) const
+{
+    bool success = true;
+    const std::string _pathPrefix = pathPrefix.empty() ? "Dataset_settings_xray_fluorescence_spectrum" : pathPrefix;
+
+         
+    
+    /* Energy_eV */ {
+        const std::vector<float>& value = m_Energy_eV;
+        const std::string currentValuePath = _pathPrefix + ".energyEV";
+                
+        
+        { // Recursive validation of array elements
+            const std::string oldValuePath = currentValuePath;
+            int i = 0;
+            for (const float& value : value)
+            { 
+                const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]";
+                        
+        
+ 
+                i++;
+            }
+        }
+
+    }
+         
+    
+    /* Data */ {
+        const std::vector<float>& value = m_Data;
+        const std::string currentValuePath = _pathPrefix + ".data";
+                
+        
+        { // Recursive validation of array elements
+            const std::string oldValuePath = currentValuePath;
+            int i = 0;
+            for (const float& value : value)
+            { 
+                const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]";
+                        
+        
+ 
+                i++;
+            }
+        }
+
+    }
+    
+    return success;
+}
+
+bool Dataset_settings_xray_fluorescence_spectrum::operator==(const Dataset_settings_xray_fluorescence_spectrum& rhs) const
+{
+    return
+    
+    
+    (getEnergyEV() == rhs.getEnergyEV())
+     &&
+    
+    (getData() == rhs.getData())
+    
+    
+    ;
+}
+
+bool Dataset_settings_xray_fluorescence_spectrum::operator!=(const Dataset_settings_xray_fluorescence_spectrum& rhs) const
+{
+    return !(*this == rhs);
+}
+
+void to_json(nlohmann::json& j, const Dataset_settings_xray_fluorescence_spectrum& o)
+{
+    j = nlohmann::json::object();
+    j["energy_eV"] = o.m_Energy_eV;
+    j["data"] = o.m_Data;
+    
+}
+
+void from_json(const nlohmann::json& j, Dataset_settings_xray_fluorescence_spectrum& o)
+{
+    j.at("energy_eV").get_to(o.m_Energy_eV);
+    j.at("data").get_to(o.m_Data);
+    
+}
+
+std::vector<float> Dataset_settings_xray_fluorescence_spectrum::getEnergyEV() const
+{
+    return m_Energy_eV;
+}
+void Dataset_settings_xray_fluorescence_spectrum::setEnergyEV(std::vector<float> const value)
+{
+    m_Energy_eV = value;
+}
+std::vector<float> Dataset_settings_xray_fluorescence_spectrum::getData() const
+{
+    return m_Data;
+}
+void Dataset_settings_xray_fluorescence_spectrum::setData(std::vector<float> const value)
+{
+    m_Data = value;
+}
+
+
+} // namespace org::openapitools::server::model
+

broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.h

@@ -0,0 +1,84 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+/*
+ * Dataset_settings_xray_fluorescence_spectrum.h
+ *
+ * 
+ */
+
+#ifndef Dataset_settings_xray_fluorescence_spectrum_H_
+#define Dataset_settings_xray_fluorescence_spectrum_H_
+
+
+#include <vector>
+#include <nlohmann/json.hpp>
+
+namespace org::openapitools::server::model
+{
+
+/// <summary>
+/// 
+/// </summary>
+class  Dataset_settings_xray_fluorescence_spectrum
+{
+public:
+    Dataset_settings_xray_fluorescence_spectrum();
+    virtual ~Dataset_settings_xray_fluorescence_spectrum() = default;
+
+
+    /// <summary>
+    /// Validate the current data in the model. Throws a ValidationException on failure.
+    /// </summary>
+    void validate() const;
+
+    /// <summary>
+    /// Validate the current data in the model. Returns false on error and writes an error
+    /// message into the given stringstream.
+    /// </summary>
+    bool validate(std::stringstream& msg) const;
+
+    /// <summary>
+    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
+    /// Not meant to be called outside that case.
+    /// </summary>
+    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
+
+    bool operator==(const Dataset_settings_xray_fluorescence_spectrum& rhs) const;
+    bool operator!=(const Dataset_settings_xray_fluorescence_spectrum& rhs) const;
+
+    /////////////////////////////////////////////
+    /// Dataset_settings_xray_fluorescence_spectrum members
+
+    /// <summary>
+    /// X-ray fluorescence scan energy for each measurement point
+    /// </summary>
+    std::vector<float> getEnergyEV() const;
+    void setEnergyEV(std::vector<float> const value);
+    /// <summary>
+    /// X-ray fluorescence scan result in arbitrary units; must be exactly the same length, as energy_eV
+    /// </summary>
+    std::vector<float> getData() const;
+    void setData(std::vector<float> const value);
+
+    friend  void to_json(nlohmann::json& j, const Dataset_settings_xray_fluorescence_spectrum& o);
+    friend  void from_json(const nlohmann::json& j, Dataset_settings_xray_fluorescence_spectrum& o);
+protected:
+    std::vector<float> m_Energy_eV;
+
+    std::vector<float> m_Data;
+
+    
+};
+
+} // namespace org::openapitools::server::model
+
+#endif /* Dataset_settings_xray_fluorescence_spectrum_H_ */

broker/gen/model/Detector.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -52,6 +52,9 @@ Detector::Detector()
     m_Roi_modeIsSet = false;
     m_Mirror_y = true;
     m_Mirror_yIsSet = false;
+    m_Temp_thresold_degC = 55L;
+    m_Temp_thresold_degCIsSet = false;
+    m_Default_settingsIsSet = false;
     
 }
 
@@ -280,7 +283,26 @@ bool Detector::validate(std::stringstream& msg, const std::string& pathPrefix) c
         }
 
     }
-            
+                 
+    if (tempThresoldDegCIsSet())
+    {
+        const int64_t& value = m_Temp_thresold_degC;
+        const std::string currentValuePath = _pathPrefix + ".tempThresoldDegC";
+                
+        
+        if (value < 40ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 40;";
+        }
+        if (value > 70ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 70;";
+        }
+
+    }
+        
     return success;
 }
 
@@ -344,7 +366,13 @@ bool Detector::operator==(const Detector& rhs) const
     ((!roiModeIsSet() && !rhs.roiModeIsSet()) || (roiModeIsSet() && rhs.roiModeIsSet() && getRoiMode() == rhs.getRoiMode())) &&
     
     
-    ((!mirrorYIsSet() && !rhs.mirrorYIsSet()) || (mirrorYIsSet() && rhs.mirrorYIsSet() && isMirrorY() == rhs.isMirrorY()))
+    ((!mirrorYIsSet() && !rhs.mirrorYIsSet()) || (mirrorYIsSet() && rhs.mirrorYIsSet() && isMirrorY() == rhs.isMirrorY())) &&
+    
+    
+    ((!tempThresoldDegCIsSet() && !rhs.tempThresoldDegCIsSet()) || (tempThresoldDegCIsSet() && rhs.tempThresoldDegCIsSet() && getTempThresoldDegC() == rhs.getTempThresoldDegC())) &&
+    
+    
+    ((!defaultSettingsIsSet() && !rhs.defaultSettingsIsSet()) || (defaultSettingsIsSet() && rhs.defaultSettingsIsSet() && getDefaultSettings() == rhs.getDefaultSettings()))
     
     ;
 }
@@ -394,6 +422,10 @@ void to_json(nlohmann::json& j, const Detector& o)
         j["roi_mode"] = o.m_Roi_mode;
     if(o.mirrorYIsSet())
         j["mirror_y"] = o.m_Mirror_y;
+    if(o.tempThresoldDegCIsSet())
+        j["temp_thresold_degC"] = o.m_Temp_thresold_degC;
+    if(o.defaultSettingsIsSet())
+        j["default_settings"] = o.m_Default_settings;
     
 }
 
@@ -490,6 +522,16 @@ void from_json(const nlohmann::json& j, Detector& o)
         j.at("mirror_y").get_to(o.m_Mirror_y);
         o.m_Mirror_yIsSet = true;
     } 
+    if(j.find("temp_thresold_degC") != j.end())
+    {
+        j.at("temp_thresold_degC").get_to(o.m_Temp_thresold_degC);
+        o.m_Temp_thresold_degCIsSet = true;
+    } 
+    if(j.find("default_settings") != j.end())
+    {
+        j.at("default_settings").get_to(o.m_Default_settings);
+        o.m_Default_settingsIsSet = true;
+    } 
     
 }
 
@@ -807,6 +849,40 @@ void Detector::unsetMirror_y()
 {
     m_Mirror_yIsSet = false;
 }
+int64_t Detector::getTempThresoldDegC() const
+{
+    return m_Temp_thresold_degC;
+}
+void Detector::setTempThresoldDegC(int64_t const value)
+{
+    m_Temp_thresold_degC = value;
+    m_Temp_thresold_degCIsSet = true;
+}
+bool Detector::tempThresoldDegCIsSet() const
+{
+    return m_Temp_thresold_degCIsSet;
+}
+void Detector::unsetTemp_thresold_degC()
+{
+    m_Temp_thresold_degCIsSet = false;
+}
+org::openapitools::server::model::Detector_settings Detector::getDefaultSettings() const
+{
+    return m_Default_settings;
+}
+void Detector::setDefaultSettings(org::openapitools::server::model::Detector_settings const& value)
+{
+    m_Default_settings = value;
+    m_Default_settingsIsSet = true;
+}
+bool Detector::defaultSettingsIsSet() const
+{
+    return m_Default_settingsIsSet;
+}
+void Detector::unsetDefault_settings()
+{
+    m_Default_settingsIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Detector.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -21,6 +21,7 @@
 
 #include "Detector_type.h"
 #include <string>
+#include "Detector_settings.h"
 #include <vector>
 #include "Standard_detector_geometry.h"
 #include "Detector_module.h"
@@ -193,6 +194,20 @@ public:
     void setMirrorY(bool const value);
     bool mirrorYIsSet() const;
     void unsetMirror_y();
+    /// <summary>
+    /// Temperature threshold for JUNGFRAU detector modules
+    /// </summary>
+    int64_t getTempThresoldDegC() const;
+    void setTempThresoldDegC(int64_t const value);
+    bool tempThresoldDegCIsSet() const;
+    void unsetTemp_thresold_degC();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Detector_settings getDefaultSettings() const;
+    void setDefaultSettings(org::openapitools::server::model::Detector_settings const& value);
+    bool defaultSettingsIsSet() const;
+    void unsetDefault_settings();
 
     friend  void to_json(nlohmann::json& j, const Detector& o);
     friend  void from_json(const nlohmann::json& j, Detector& o);
@@ -235,6 +250,10 @@ protected:
     bool m_Roi_modeIsSet;
     bool m_Mirror_y;
     bool m_Mirror_yIsSet;
+    int64_t m_Temp_thresold_degC;
+    bool m_Temp_thresold_degCIsSet;
+    org::openapitools::server::model::Detector_settings m_Default_settings;
+    bool m_Default_settingsIsSet;
     
 };
 

broker/gen/model/Detector_list.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list_element.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list_element.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module_direction.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module_direction.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_power_state.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_power_state.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -99,14 +99,14 @@ public:
     bool timingIsSet() const;
     void unsetTiming();
     /// <summary>
-    /// Threshold for the EIGER detector. If value is provided, it will be used for all subsequent acquisitions, irrespective of beam energy. If value is not provided, threshold will be determined on start of acquisition as half of incident energy.  This might lead to increased start time. 
+    /// Threshold for the PSI EIGER detector and all DECTRIS detectors. If value is provided, it will be used for all subsequent acquisitions, irrespective of beam energy. If value is not provided, threshold will be determined on start of acquisition as half of incident energy.  This might lead to increased start time. 
     /// </summary>
     float getEigerThresholdKeV() const;
     void setEigerThresholdKeV(float const value);
     bool eigerThresholdKeVIsSet() const;
     void unsetEiger_threshold_keV();
     /// <summary>
-    /// Bit depth of EIGER read-out.  If value is not provided bit depth is adjusted automatically based on the image time. 
+    /// Bit depth of PSI EIGER read-out. This is   If value is not provided, depth will be determined based on the image time: * Exposure time &lt; 500 microseconds depth of 8 bit will be used, * 500 &lt;&#x3D; exposure time &lt; 2622 microseconds depth of 16 bit will be used * Exposure time &gt;&#x3D; 2622 microseconds depth of 32 bit will be used. 
     /// </summary>
     int64_t getEigerBitDepth() const;
     void setEigerBitDepth(int64_t const value);

broker/gen/model/Detector_state.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_state.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/File_writer_format.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -90,6 +90,9 @@ void to_json(nlohmann::json& j, const File_writer_format& o)
         case File_writer_format::eFile_writer_format::TIFF:
             j = "TIFF";
             break;
+        case File_writer_format::eFile_writer_format::NOFILEWRITTEN:
+            j = "NoFileWritten";
+            break;
     }
 }
 
@@ -111,6 +114,9 @@ void from_json(const nlohmann::json& j, File_writer_format& o)
     } 
     else if (s == "TIFF") {
      o.setValue(File_writer_format::eFile_writer_format::TIFF);
+    } 
+    else if (s == "NoFileWritten") {
+     o.setValue(File_writer_format::eFile_writer_format::NOFILEWRITTEN);
     }  else {
      std::stringstream ss;
      ss << "Unexpected value " << s << " in json"

broker/gen/model/File_writer_format.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -42,7 +42,8 @@ public:
     NXMXLEGACY, 
     NXMXVDS, 
     CBF, 
-    TIFF
+    TIFF, 
+    NOFILEWRITTEN
     };
 
     /// <summary>

broker/gen/model/File_writer_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/File_writer_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Fpga_status_inner.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Fpga_status_inner.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Geom_refinement_algorithm.cpp

@@ -0,0 +1,116 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+#include "Geom_refinement_algorithm.h"
+#include "Helpers.h"
+#include <stdexcept>
+#include <sstream>
+
+namespace org::openapitools::server::model
+{
+
+Geom_refinement_algorithm::Geom_refinement_algorithm()
+{
+    
+}
+
+void Geom_refinement_algorithm::validate() const
+{
+    std::stringstream msg;
+    if (!validate(msg))
+    {
+        throw org::openapitools::server::helpers::ValidationException(msg.str());
+    }
+}
+
+bool Geom_refinement_algorithm::validate(std::stringstream& msg) const
+{
+    return validate(msg, "");
+}
+
+bool Geom_refinement_algorithm::validate(std::stringstream& msg, const std::string& pathPrefix) const
+{
+    bool success = true;
+    const std::string _pathPrefix = pathPrefix.empty() ? "Geom_refinement_algorithm" : pathPrefix;
+
+    
+    if (m_value == Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED)
+    {
+        success = false;
+        msg << _pathPrefix << ": has no value;";
+    }
+
+    return success;
+}
+
+bool Geom_refinement_algorithm::operator==(const Geom_refinement_algorithm& rhs) const
+{
+    return
+    getValue() == rhs.getValue()
+    
+    ;
+}
+
+bool Geom_refinement_algorithm::operator!=(const Geom_refinement_algorithm& rhs) const
+{
+    return !(*this == rhs);
+}
+
+void to_json(nlohmann::json& j, const Geom_refinement_algorithm& o)
+{
+    j = nlohmann::json::object();
+    
+    switch (o.getValue())
+    {
+        case Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED:
+            j = "INVALID_VALUE_OPENAPI_GENERATED";
+            break;
+        case Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER:
+            j = "BeamCenter";
+            break;
+        case Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE:
+            j = "None";
+            break;
+    }
+}
+
+void from_json(const nlohmann::json& j, Geom_refinement_algorithm& o)
+{
+    
+    auto s = j.get<std::string>();
+    if (s == "BeamCenter") {
+     o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER);
+    } 
+    else if (s == "None") {
+     o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE);
+    }  else {
+     std::stringstream ss;
+     ss << "Unexpected value " << s << " in json"
+        << " cannot be converted to enum of type"
+        << " Geom_refinement_algorithm::eGeom_refinement_algorithm";
+     throw std::invalid_argument(ss.str());
+    } 
+
+}
+
+Geom_refinement_algorithm::eGeom_refinement_algorithm Geom_refinement_algorithm::getValue() const
+{
+    return m_value;
+}
+void Geom_refinement_algorithm::setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm value)
+{
+    m_value = value;
+}
+
+} // namespace org::openapitools::server::model
+

broker/gen/model/Geom_refinement_algorithm.h

@@ -0,0 +1,79 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+/*
+ * Geom_refinement_algorithm.h
+ *
+ * Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch. This option is using non-linear least squares optimization to find unit cell and beam center. 
+ */
+
+#ifndef Geom_refinement_algorithm_H_
+#define Geom_refinement_algorithm_H_
+
+
+#include <nlohmann/json.hpp>
+
+namespace org::openapitools::server::model
+{
+
+/// <summary>
+/// Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch. This option is using non-linear least squares optimization to find unit cell and beam center. 
+/// </summary>
+class  Geom_refinement_algorithm
+{
+public:
+    Geom_refinement_algorithm();
+    virtual ~Geom_refinement_algorithm() = default;
+
+    enum class eGeom_refinement_algorithm {
+    // To have a valid default value.
+    // Avoiding name clashes with user defined
+    // enum values
+    INVALID_VALUE_OPENAPI_GENERATED = 0,
+    BEAMCENTER, 
+    NONE
+    };
+
+    /// <summary>
+    /// Validate the current data in the model. Throws a ValidationException on failure.
+    /// </summary>
+    void validate() const;
+
+    /// <summary>
+    /// Validate the current data in the model. Returns false on error and writes an error
+    /// message into the given stringstream.
+    /// </summary>
+    bool validate(std::stringstream& msg) const;
+
+    /// <summary>
+    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
+    /// Not meant to be called outside that case.
+    /// </summary>
+    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
+
+    bool operator==(const Geom_refinement_algorithm& rhs) const;
+    bool operator!=(const Geom_refinement_algorithm& rhs) const;
+
+    /////////////////////////////////////////////
+    /// Geom_refinement_algorithm members
+
+    Geom_refinement_algorithm::eGeom_refinement_algorithm getValue() const;
+    void setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm value);
+    
+    friend  void to_json(nlohmann::json& j, const Geom_refinement_algorithm& o);
+    friend  void from_json(const nlohmann::json& j, Geom_refinement_algorithm& o);
+protected:
+    Geom_refinement_algorithm::eGeom_refinement_algorithm m_value = Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED;
+};
+
+} // namespace org::openapitools::server::model
+
+#endif /* Geom_refinement_algorithm_H_ */

broker/gen/model/Grid_scan.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Grid_scan.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -18,12 +18,13 @@
 #ifndef Helpers_H_
 #define Helpers_H_
 
+#include <cstdint>
 #include <ctime>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace org::openapitools::server::helpers
 {

broker/gen/model/Image_buffer_status.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -25,6 +25,8 @@ Image_buffer_status::Image_buffer_status()
     m_Max_image_number = 0L;
     m_Total_slots = 0L;
     m_Available_slots = 0L;
+    m_Current_counter = 0L;
+    m_Current_counterIsSet = false;
     
 }
 
@@ -96,7 +98,7 @@ bool Image_buffer_status::validate(std::stringstream& msg, const std::string& pa
         }
 
     }
-            
+                
     return success;
 }
 
@@ -118,8 +120,11 @@ bool Image_buffer_status::operator==(const Image_buffer_status& rhs) const
      &&
     
     (getAvailableSlots() == rhs.getAvailableSlots())
+     &&
     
     
+    ((!currentCounterIsSet() && !rhs.currentCounterIsSet()) || (currentCounterIsSet() && rhs.currentCounterIsSet() && getCurrentCounter() == rhs.getCurrentCounter()))
+    
     ;
 }
 
@@ -136,6 +141,8 @@ void to_json(nlohmann::json& j, const Image_buffer_status& o)
     j["image_numbers"] = o.m_Image_numbers;
     j["total_slots"] = o.m_Total_slots;
     j["available_slots"] = o.m_Available_slots;
+    if(o.currentCounterIsSet())
+        j["current_counter"] = o.m_Current_counter;
     
 }
 
@@ -146,6 +153,11 @@ void from_json(const nlohmann::json& j, Image_buffer_status& o)
     j.at("image_numbers").get_to(o.m_Image_numbers);
     j.at("total_slots").get_to(o.m_Total_slots);
     j.at("available_slots").get_to(o.m_Available_slots);
+    if(j.find("current_counter") != j.end())
+    {
+        j.at("current_counter").get_to(o.m_Current_counter);
+        o.m_Current_counterIsSet = true;
+    } 
     
 }
 
@@ -189,6 +201,23 @@ void Image_buffer_status::setAvailableSlots(int64_t const value)
 {
     m_Available_slots = value;
 }
+int64_t Image_buffer_status::getCurrentCounter() const
+{
+    return m_Current_counter;
+}
+void Image_buffer_status::setCurrentCounter(int64_t const value)
+{
+    m_Current_counter = value;
+    m_Current_counterIsSet = true;
+}
+bool Image_buffer_status::currentCounterIsSet() const
+{
+    return m_Current_counterIsSet;
+}
+void Image_buffer_status::unsetCurrent_counter()
+{
+    m_Current_counterIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Image_buffer_status.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -83,6 +83,13 @@ public:
     /// </summary>
     int64_t getAvailableSlots() const;
     void setAvailableSlots(int64_t const value);
+    /// <summary>
+    /// Counter of changes in the image buffer - either new start message or new image added. For optimization one can only load new images/datasets from the HTTP if this value changes. Counter is optional as it was not implemented in older versions to avoid breaking change 
+    /// </summary>
+    int64_t getCurrentCounter() const;
+    void setCurrentCounter(int64_t const value);
+    bool currentCounterIsSet() const;
+    void unsetCurrent_counter();
 
     friend  void to_json(nlohmann::json& j, const Image_buffer_status& o);
     friend  void from_json(const nlohmann::json& j, Image_buffer_status& o);
@@ -97,6 +104,8 @@ protected:
 
     int64_t m_Available_slots;
 
+    int64_t m_Current_counter;
+    bool m_Current_counterIsSet;
     
 };
 

broker/gen/model/Image_format_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_format_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_pusher_type.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_pusher_type.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Indexing_algorithm.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -81,6 +81,9 @@ void to_json(nlohmann::json& j, const Indexing_algorithm& o)
         case Indexing_algorithm::eIndexing_algorithm::FFT:
             j = "FFT";
             break;
+        case Indexing_algorithm::eIndexing_algorithm::FFTW:
+            j = "FFTW";
+            break;
         case Indexing_algorithm::eIndexing_algorithm::AUTO:
             j = "Auto";
             break;
@@ -100,6 +103,9 @@ void from_json(const nlohmann::json& j, Indexing_algorithm& o)
     else if (s == "FFT") {
      o.setValue(Indexing_algorithm::eIndexing_algorithm::FFT);
     } 
+    else if (s == "FFTW") {
+     o.setValue(Indexing_algorithm::eIndexing_algorithm::FFTW);
+    } 
     else if (s == "Auto") {
      o.setValue(Indexing_algorithm::eIndexing_algorithm::AUTO);
     } 

broker/gen/model/Indexing_algorithm.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -40,6 +40,7 @@ public:
     INVALID_VALUE_OPENAPI_GENERATED = 0,
     FFBIDX, 
     FFT, 
+    FFTW, 
     AUTO, 
     NONE
     };

broker/gen/model/Indexing_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -26,6 +26,13 @@ Indexing_settings::Indexing_settings()
     m_Fft_high_resolution_A = 2.0f;
     m_Fft_num_vectors = 16384L;
     m_Tolerance = 0.0f;
+    m_Thread_count = 0L;
+    m_Unit_cell_dist_tolerance = 0.05f;
+    m_Viable_cell_min_spots = 10L;
+    m_Index_ice_rings = false;
+    m_Rotation_indexing = false;
+    m_Rotation_indexing_min_angular_range_deg = 20.0f;
+    m_Rotation_indexing_angular_stride_deg = 0.5f;
     
 }
 
@@ -138,6 +145,86 @@ bool Indexing_settings::validate(std::stringstream& msg, const std::string& path
         }
 
     }
+         
+    
+    /* Thread_count */ {
+        const int64_t& value = m_Thread_count;
+        const std::string currentValuePath = _pathPrefix + ".threadCount";
+                
+        
+        if (value < 1ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 1;";
+        }
+        if (value > 64ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 64;";
+        }
+
+    }
+             
+    
+    /* Unit_cell_dist_tolerance */ {
+        const float& value = m_Unit_cell_dist_tolerance;
+        const std::string currentValuePath = _pathPrefix + ".unitCellDistTolerance";
+                
+        
+        if (value < static_cast<float>(0.00010))
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0.00010;";
+        }
+        if (value > static_cast<float>(0.2001))
+        {
+            success = false;
+            msg << currentValuePath << ": must be less than or equal to 0.2001;";
+        }
+
+    }
+         
+    
+    /* Viable_cell_min_spots */ {
+        const int64_t& value = m_Viable_cell_min_spots;
+        const std::string currentValuePath = _pathPrefix + ".viableCellMinSpots";
+                
+        
+        if (value < 5ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 5;";
+        }
+
+    }
+                 
+    
+    /* Rotation_indexing_min_angular_range_deg */ {
+        const float& value = m_Rotation_indexing_min_angular_range_deg;
+        const std::string currentValuePath = _pathPrefix + ".rotationIndexingMinAngularRangeDeg";
+                
+        
+        if (value < static_cast<float>(1.0))
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 1.0;";
+        }
+
+    }
+         
+    
+    /* Rotation_indexing_angular_stride_deg */ {
+        const float& value = m_Rotation_indexing_angular_stride_deg;
+        const std::string currentValuePath = _pathPrefix + ".rotationIndexingAngularStrideDeg";
+                
+        
+        if (value < static_cast<float>(0))
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
     
     return success;
 }
@@ -163,6 +250,30 @@ bool Indexing_settings::operator==(const Indexing_settings& rhs) const
      &&
     
     (getTolerance() == rhs.getTolerance())
+     &&
+    
+    (getThreadCount() == rhs.getThreadCount())
+     &&
+    
+    (getGeomRefinementAlgorithm() == rhs.getGeomRefinementAlgorithm())
+     &&
+    
+    (getUnitCellDistTolerance() == rhs.getUnitCellDistTolerance())
+     &&
+    
+    (getViableCellMinSpots() == rhs.getViableCellMinSpots())
+     &&
+    
+    (isIndexIceRings() == rhs.isIndexIceRings())
+     &&
+    
+    (isRotationIndexing() == rhs.isRotationIndexing())
+     &&
+    
+    (getRotationIndexingMinAngularRangeDeg() == rhs.getRotationIndexingMinAngularRangeDeg())
+     &&
+    
+    (getRotationIndexingAngularStrideDeg() == rhs.getRotationIndexingAngularStrideDeg())
     
     
     ;
@@ -182,6 +293,14 @@ void to_json(nlohmann::json& j, const Indexing_settings& o)
     j["fft_high_resolution_A"] = o.m_Fft_high_resolution_A;
     j["fft_num_vectors"] = o.m_Fft_num_vectors;
     j["tolerance"] = o.m_Tolerance;
+    j["thread_count"] = o.m_Thread_count;
+    j["geom_refinement_algorithm"] = o.m_Geom_refinement_algorithm;
+    j["unit_cell_dist_tolerance"] = o.m_Unit_cell_dist_tolerance;
+    j["viable_cell_min_spots"] = o.m_Viable_cell_min_spots;
+    j["index_ice_rings"] = o.m_Index_ice_rings;
+    j["rotation_indexing"] = o.m_Rotation_indexing;
+    j["rotation_indexing_min_angular_range_deg"] = o.m_Rotation_indexing_min_angular_range_deg;
+    j["rotation_indexing_angular_stride_deg"] = o.m_Rotation_indexing_angular_stride_deg;
     
 }
 
@@ -193,6 +312,14 @@ void from_json(const nlohmann::json& j, Indexing_settings& o)
     j.at("fft_high_resolution_A").get_to(o.m_Fft_high_resolution_A);
     j.at("fft_num_vectors").get_to(o.m_Fft_num_vectors);
     j.at("tolerance").get_to(o.m_Tolerance);
+    j.at("thread_count").get_to(o.m_Thread_count);
+    j.at("geom_refinement_algorithm").get_to(o.m_Geom_refinement_algorithm);
+    j.at("unit_cell_dist_tolerance").get_to(o.m_Unit_cell_dist_tolerance);
+    j.at("viable_cell_min_spots").get_to(o.m_Viable_cell_min_spots);
+    j.at("index_ice_rings").get_to(o.m_Index_ice_rings);
+    j.at("rotation_indexing").get_to(o.m_Rotation_indexing);
+    j.at("rotation_indexing_min_angular_range_deg").get_to(o.m_Rotation_indexing_min_angular_range_deg);
+    j.at("rotation_indexing_angular_stride_deg").get_to(o.m_Rotation_indexing_angular_stride_deg);
     
 }
 
@@ -244,6 +371,70 @@ void Indexing_settings::setTolerance(float const value)
 {
     m_Tolerance = value;
 }
+int64_t Indexing_settings::getThreadCount() const
+{
+    return m_Thread_count;
+}
+void Indexing_settings::setThreadCount(int64_t const value)
+{
+    m_Thread_count = value;
+}
+org::openapitools::server::model::Geom_refinement_algorithm Indexing_settings::getGeomRefinementAlgorithm() const
+{
+    return m_Geom_refinement_algorithm;
+}
+void Indexing_settings::setGeomRefinementAlgorithm(org::openapitools::server::model::Geom_refinement_algorithm const& value)
+{
+    m_Geom_refinement_algorithm = value;
+}
+float Indexing_settings::getUnitCellDistTolerance() const
+{
+    return m_Unit_cell_dist_tolerance;
+}
+void Indexing_settings::setUnitCellDistTolerance(float const value)
+{
+    m_Unit_cell_dist_tolerance = value;
+}
+int64_t Indexing_settings::getViableCellMinSpots() const
+{
+    return m_Viable_cell_min_spots;
+}
+void Indexing_settings::setViableCellMinSpots(int64_t const value)
+{
+    m_Viable_cell_min_spots = value;
+}
+bool Indexing_settings::isIndexIceRings() const
+{
+    return m_Index_ice_rings;
+}
+void Indexing_settings::setIndexIceRings(bool const value)
+{
+    m_Index_ice_rings = value;
+}
+bool Indexing_settings::isRotationIndexing() const
+{
+    return m_Rotation_indexing;
+}
+void Indexing_settings::setRotationIndexing(bool const value)
+{
+    m_Rotation_indexing = value;
+}
+float Indexing_settings::getRotationIndexingMinAngularRangeDeg() const
+{
+    return m_Rotation_indexing_min_angular_range_deg;
+}
+void Indexing_settings::setRotationIndexingMinAngularRangeDeg(float const value)
+{
+    m_Rotation_indexing_min_angular_range_deg = value;
+}
+float Indexing_settings::getRotationIndexingAngularStrideDeg() const
+{
+    return m_Rotation_indexing_angular_stride_deg;
+}
+void Indexing_settings::setRotationIndexingAngularStrideDeg(float const value)
+{
+    m_Rotation_indexing_angular_stride_deg = value;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Indexing_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -20,6 +20,7 @@
 
 
 #include "Indexing_algorithm.h"
+#include "Geom_refinement_algorithm.h"
 #include <nlohmann/json.hpp>
 
 namespace org::openapitools::server::model
@@ -88,6 +89,46 @@ public:
     /// </summary>
     float getTolerance() const;
     void setTolerance(float const value);
+    /// <summary>
+    /// Thread count for indexing algorithm
+    /// </summary>
+    int64_t getThreadCount() const;
+    void setThreadCount(int64_t const value);
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Geom_refinement_algorithm getGeomRefinementAlgorithm() const;
+    void setGeomRefinementAlgorithm(org::openapitools::server::model::Geom_refinement_algorithm const& value);
+    /// <summary>
+    /// Relative distance tolerance for unit cell vs. reference; Lattices outside given tolerance will be ignored
+    /// </summary>
+    float getUnitCellDistTolerance() const;
+    void setUnitCellDistTolerance(float const value);
+    /// <summary>
+    /// Minimum number of indexed spots required for a cell to be considered viable
+    /// </summary>
+    int64_t getViableCellMinSpots() const;
+    void setViableCellMinSpots(int64_t const value);
+    /// <summary>
+    /// Include spots marked as ice rings in the indexing run.  If &#x60;dataset_settings&#x60; doesn&#39;t have &#x60;detect_ice_rings&#x60; on, this option will have no effect on processing. 
+    /// </summary>
+    bool isIndexIceRings() const;
+    void setIndexIceRings(bool const value);
+    /// <summary>
+    /// 
+    /// </summary>
+    bool isRotationIndexing() const;
+    void setRotationIndexing(bool const value);
+    /// <summary>
+    /// 
+    /// </summary>
+    float getRotationIndexingMinAngularRangeDeg() const;
+    void setRotationIndexingMinAngularRangeDeg(float const value);
+    /// <summary>
+    /// 
+    /// </summary>
+    float getRotationIndexingAngularStrideDeg() const;
+    void setRotationIndexingAngularStrideDeg(float const value);
 
     friend  void to_json(nlohmann::json& j, const Indexing_settings& o);
     friend  void from_json(const nlohmann::json& j, Indexing_settings& o);
@@ -104,6 +145,22 @@ protected:
 
     float m_Tolerance;
 
+    int64_t m_Thread_count;
+
+    org::openapitools::server::model::Geom_refinement_algorithm m_Geom_refinement_algorithm;
+
+    float m_Unit_cell_dist_tolerance;
+
+    int64_t m_Viable_cell_min_spots;
+
+    bool m_Index_ice_rings;
+
+    bool m_Rotation_indexing;
+
+    float m_Rotation_indexing_min_angular_range_deg;
+
+    float m_Rotation_indexing_angular_stride_deg;
+
     
 };
 

broker/gen/model/Instrument_metadata.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Instrument_metadata.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Jfjoch_settings.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -38,9 +38,11 @@ Jfjoch_settings::Jfjoch_settings()
     m_Numa_policy = "";
     m_Numa_policyIsSet = false;
     m_Frontend_directory = "";
-    m_Inference_server_addrIsSet = false;
+    m_SslIsSet = false;
+    m_Spot_findingIsSet = false;
     m_Zeromq_previewIsSet = false;
     m_Zeromq_metadataIsSet = false;
+    m_Dark_maskIsSet = false;
     
 }
 
@@ -138,28 +140,7 @@ bool Jfjoch_settings::validate(std::stringstream& msg, const std::string& pathPr
         }
 
     }
-                 
-    if (inferenceServerAddrIsSet())
-    {
-        const std::vector<std::string>& value = m_Inference_server_addr;
-        const std::string currentValuePath = _pathPrefix + ".inferenceServerAddr";
-                
-        
-        { // Recursive validation of array elements
-            const std::string oldValuePath = currentValuePath;
-            int i = 0;
-            for (const std::string& value : value)
-            { 
-                const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]";
-                        
-        
- 
-                i++;
-            }
-        }
-
-    }
-                
+                                    
     return success;
 }
 
@@ -211,7 +192,10 @@ bool Jfjoch_settings::operator==(const Jfjoch_settings& rhs) const
      &&
     
     
-    ((!inferenceServerAddrIsSet() && !rhs.inferenceServerAddrIsSet()) || (inferenceServerAddrIsSet() && rhs.inferenceServerAddrIsSet() && getInferenceServerAddr() == rhs.getInferenceServerAddr())) &&
+    ((!sslIsSet() && !rhs.sslIsSet()) || (sslIsSet() && rhs.sslIsSet() && getSsl() == rhs.getSsl())) &&
+    
+    
+    ((!spotFindingIsSet() && !rhs.spotFindingIsSet()) || (spotFindingIsSet() && rhs.spotFindingIsSet() && getSpotFinding() == rhs.getSpotFinding())) &&
     
     (getImagePusher() == rhs.getImagePusher())
      &&
@@ -220,7 +204,10 @@ bool Jfjoch_settings::operator==(const Jfjoch_settings& rhs) const
     ((!zeromqPreviewIsSet() && !rhs.zeromqPreviewIsSet()) || (zeromqPreviewIsSet() && rhs.zeromqPreviewIsSet() && getZeromqPreview() == rhs.getZeromqPreview())) &&
     
     
-    ((!zeromqMetadataIsSet() && !rhs.zeromqMetadataIsSet()) || (zeromqMetadataIsSet() && rhs.zeromqMetadataIsSet() && getZeromqMetadata() == rhs.getZeromqMetadata()))
+    ((!zeromqMetadataIsSet() && !rhs.zeromqMetadataIsSet()) || (zeromqMetadataIsSet() && rhs.zeromqMetadataIsSet() && getZeromqMetadata() == rhs.getZeromqMetadata())) &&
+    
+    
+    ((!darkMaskIsSet() && !rhs.darkMaskIsSet()) || (darkMaskIsSet() && rhs.darkMaskIsSet() && getDarkMask() == rhs.getDarkMask()))
     
     ;
 }
@@ -259,13 +246,17 @@ void to_json(nlohmann::json& j, const Jfjoch_settings& o)
     if(o.numaPolicyIsSet())
         j["numa_policy"] = o.m_Numa_policy;
     j["frontend_directory"] = o.m_Frontend_directory;
-    if(o.inferenceServerAddrIsSet() || !o.m_Inference_server_addr.empty())
-        j["inference_server_addr"] = o.m_Inference_server_addr;
+    if(o.sslIsSet())
+        j["ssl"] = o.m_Ssl;
+    if(o.spotFindingIsSet())
+        j["spot_finding"] = o.m_Spot_finding;
     j["image_pusher"] = o.m_Image_pusher;
     if(o.zeromqPreviewIsSet())
         j["zeromq_preview"] = o.m_Zeromq_preview;
     if(o.zeromqMetadataIsSet())
         j["zeromq_metadata"] = o.m_Zeromq_metadata;
+    if(o.darkMaskIsSet())
+        j["dark_mask"] = o.m_Dark_mask;
     
 }
 
@@ -333,10 +324,15 @@ void from_json(const nlohmann::json& j, Jfjoch_settings& o)
         o.m_Numa_policyIsSet = true;
     } 
     j.at("frontend_directory").get_to(o.m_Frontend_directory);
-    if(j.find("inference_server_addr") != j.end())
+    if(j.find("ssl") != j.end())
     {
-        j.at("inference_server_addr").get_to(o.m_Inference_server_addr);
-        o.m_Inference_server_addrIsSet = true;
+        j.at("ssl").get_to(o.m_Ssl);
+        o.m_SslIsSet = true;
+    } 
+    if(j.find("spot_finding") != j.end())
+    {
+        j.at("spot_finding").get_to(o.m_Spot_finding);
+        o.m_Spot_findingIsSet = true;
     } 
     j.at("image_pusher").get_to(o.m_Image_pusher);
     if(j.find("zeromq_preview") != j.end())
@@ -349,6 +345,11 @@ void from_json(const nlohmann::json& j, Jfjoch_settings& o)
         j.at("zeromq_metadata").get_to(o.m_Zeromq_metadata);
         o.m_Zeromq_metadataIsSet = true;
     } 
+    if(j.find("dark_mask") != j.end())
+    {
+        j.at("dark_mask").get_to(o.m_Dark_mask);
+        o.m_Dark_maskIsSet = true;
+    } 
     
 }
 
@@ -572,22 +573,39 @@ void Jfjoch_settings::setFrontendDirectory(std::string const& value)
 {
     m_Frontend_directory = value;
 }
-std::vector<std::string> Jfjoch_settings::getInferenceServerAddr() const
+org::openapitools::server::model::Jfjoch_settings_ssl Jfjoch_settings::getSsl() const
 {
-    return m_Inference_server_addr;
+    return m_Ssl;
 }
-void Jfjoch_settings::setInferenceServerAddr(std::vector<std::string> const& value)
+void Jfjoch_settings::setSsl(org::openapitools::server::model::Jfjoch_settings_ssl const& value)
 {
-    m_Inference_server_addr = value;
-    m_Inference_server_addrIsSet = true;
+    m_Ssl = value;
+    m_SslIsSet = true;
 }
-bool Jfjoch_settings::inferenceServerAddrIsSet() const
+bool Jfjoch_settings::sslIsSet() const
 {
-    return m_Inference_server_addrIsSet;
+    return m_SslIsSet;
 }
-void Jfjoch_settings::unsetInference_server_addr()
+void Jfjoch_settings::unsetSsl()
 {
-    m_Inference_server_addrIsSet = false;
+    m_SslIsSet = false;
+}
+org::openapitools::server::model::Spot_finding_settings Jfjoch_settings::getSpotFinding() const
+{
+    return m_Spot_finding;
+}
+void Jfjoch_settings::setSpotFinding(org::openapitools::server::model::Spot_finding_settings const& value)
+{
+    m_Spot_finding = value;
+    m_Spot_findingIsSet = true;
+}
+bool Jfjoch_settings::spotFindingIsSet() const
+{
+    return m_Spot_findingIsSet;
+}
+void Jfjoch_settings::unsetSpot_finding()
+{
+    m_Spot_findingIsSet = false;
 }
 org::openapitools::server::model::Image_pusher_type Jfjoch_settings::getImagePusher() const
 {
@@ -631,6 +649,23 @@ void Jfjoch_settings::unsetZeromq_metadata()
 {
     m_Zeromq_metadataIsSet = false;
 }
+org::openapitools::server::model::Dark_mask_settings Jfjoch_settings::getDarkMask() const
+{
+    return m_Dark_mask;
+}
+void Jfjoch_settings::setDarkMask(org::openapitools::server::model::Dark_mask_settings const& value)
+{
+    m_Dark_mask = value;
+    m_Dark_maskIsSet = true;
+}
+bool Jfjoch_settings::darkMaskIsSet() const
+{
+    return m_Dark_maskIsSet;
+}
+void Jfjoch_settings::unsetDark_mask()
+{
+    m_Dark_maskIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Jfjoch_settings.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -19,7 +19,9 @@
 #define Jfjoch_settings_H_
 
 
+#include "Spot_finding_settings.h"
 #include "Zeromq_preview_settings.h"
+#include "Dark_mask_settings.h"
 #include "Pcie_devices_inner.h"
 #include <string>
 #include "File_writer_settings.h"
@@ -33,6 +35,7 @@
 #include "Image_pusher_type.h"
 #include "Zeromq_settings.h"
 #include "Instrument_metadata.h"
+#include "Jfjoch_settings_ssl.h"
 #include <nlohmann/json.hpp>
 
 namespace org::openapitools::server::model
@@ -166,12 +169,19 @@ public:
     std::string getFrontendDirectory() const;
     void setFrontendDirectory(std::string const& value);
     /// <summary>
-    /// Address to ML-based inference servers
+    /// 
     /// </summary>
-    std::vector<std::string> getInferenceServerAddr() const;
-    void setInferenceServerAddr(std::vector<std::string> const& value);
-    bool inferenceServerAddrIsSet() const;
-    void unsetInference_server_addr();
+    org::openapitools::server::model::Jfjoch_settings_ssl getSsl() const;
+    void setSsl(org::openapitools::server::model::Jfjoch_settings_ssl const& value);
+    bool sslIsSet() const;
+    void unsetSsl();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Spot_finding_settings getSpotFinding() const;
+    void setSpotFinding(org::openapitools::server::model::Spot_finding_settings const& value);
+    bool spotFindingIsSet() const;
+    void unsetSpot_finding();
     /// <summary>
     /// 
     /// </summary>
@@ -191,6 +201,13 @@ public:
     void setZeromqMetadata(org::openapitools::server::model::Zeromq_metadata_settings const& value);
     bool zeromqMetadataIsSet() const;
     void unsetZeromq_metadata();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Dark_mask_settings getDarkMask() const;
+    void setDarkMask(org::openapitools::server::model::Dark_mask_settings const& value);
+    bool darkMaskIsSet() const;
+    void unsetDark_mask();
 
     friend  void to_json(nlohmann::json& j, const Jfjoch_settings& o);
     friend  void from_json(const nlohmann::json& j, Jfjoch_settings& o);
@@ -223,14 +240,18 @@ protected:
     bool m_Numa_policyIsSet;
     std::string m_Frontend_directory;
 
-    std::vector<std::string> m_Inference_server_addr;
-    bool m_Inference_server_addrIsSet;
+    org::openapitools::server::model::Jfjoch_settings_ssl m_Ssl;
+    bool m_SslIsSet;
+    org::openapitools::server::model::Spot_finding_settings m_Spot_finding;
+    bool m_Spot_findingIsSet;
     org::openapitools::server::model::Image_pusher_type m_Image_pusher;
 
     org::openapitools::server::model::Zeromq_preview_settings m_Zeromq_preview;
     bool m_Zeromq_previewIsSet;
     org::openapitools::server::model::Zeromq_metadata_settings m_Zeromq_metadata;
     bool m_Zeromq_metadataIsSet;
+    org::openapitools::server::model::Dark_mask_settings m_Dark_mask;
+    bool m_Dark_maskIsSet;
     
 };
 

broker/gen/model/Jfjoch_settings_ssl.cpp

@@ -0,0 +1,133 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+#include "Jfjoch_settings_ssl.h"
+#include "Helpers.h"
+
+#include <sstream>
+
+namespace org::openapitools::server::model
+{
+
+Jfjoch_settings_ssl::Jfjoch_settings_ssl()
+{
+    m_Certificate = "";
+    m_Key = "";
+    
+}
+
+void Jfjoch_settings_ssl::validate() const
+{
+    std::stringstream msg;
+    if (!validate(msg))
+    {
+        throw org::openapitools::server::helpers::ValidationException(msg.str());
+    }
+}
+
+bool Jfjoch_settings_ssl::validate(std::stringstream& msg) const
+{
+    return validate(msg, "");
+}
+
+bool Jfjoch_settings_ssl::validate(std::stringstream& msg, const std::string& pathPrefix) const
+{
+    bool success = true;
+    const std::string _pathPrefix = pathPrefix.empty() ? "Jfjoch_settings_ssl" : pathPrefix;
+
+         
+    
+    /* Certificate */ {
+        const std::string& value = m_Certificate;
+        const std::string currentValuePath = _pathPrefix + ".certificate";
+                
+        
+        if (value.length() < 1)
+        {
+            success = false;
+            msg << currentValuePath << ": must be at least 1 characters long;";
+        }
+
+    }
+         
+    
+    /* Key */ {
+        const std::string& value = m_Key;
+        const std::string currentValuePath = _pathPrefix + ".key";
+                
+        
+        if (value.length() < 1)
+        {
+            success = false;
+            msg << currentValuePath << ": must be at least 1 characters long;";
+        }
+
+    }
+    
+    return success;
+}
+
+bool Jfjoch_settings_ssl::operator==(const Jfjoch_settings_ssl& rhs) const
+{
+    return
+    
+    
+    (getCertificate() == rhs.getCertificate())
+     &&
+    
+    (getKey() == rhs.getKey())
+    
+    
+    ;
+}
+
+bool Jfjoch_settings_ssl::operator!=(const Jfjoch_settings_ssl& rhs) const
+{
+    return !(*this == rhs);
+}
+
+void to_json(nlohmann::json& j, const Jfjoch_settings_ssl& o)
+{
+    j = nlohmann::json::object();
+    j["certificate"] = o.m_Certificate;
+    j["key"] = o.m_Key;
+    
+}
+
+void from_json(const nlohmann::json& j, Jfjoch_settings_ssl& o)
+{
+    j.at("certificate").get_to(o.m_Certificate);
+    j.at("key").get_to(o.m_Key);
+    
+}
+
+std::string Jfjoch_settings_ssl::getCertificate() const
+{
+    return m_Certificate;
+}
+void Jfjoch_settings_ssl::setCertificate(std::string const& value)
+{
+    m_Certificate = value;
+}
+std::string Jfjoch_settings_ssl::getKey() const
+{
+    return m_Key;
+}
+void Jfjoch_settings_ssl::setKey(std::string const& value)
+{
+    m_Key = value;
+}
+
+
+} // namespace org::openapitools::server::model
+

broker/gen/model/Jfjoch_settings_ssl.h

@@ -0,0 +1,84 @@
+/**
+* Jungfraujoch
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
+*
+* The version of the OpenAPI document: 1.0.0-rc.126
+* Contact: filip.leonarski@psi.ch
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+/*
+ * Jfjoch_settings_ssl.h
+ *
+ * 
+ */
+
+#ifndef Jfjoch_settings_ssl_H_
+#define Jfjoch_settings_ssl_H_
+
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+namespace org::openapitools::server::model
+{
+
+/// <summary>
+/// 
+/// </summary>
+class  Jfjoch_settings_ssl
+{
+public:
+    Jfjoch_settings_ssl();
+    virtual ~Jfjoch_settings_ssl() = default;
+
+
+    /// <summary>
+    /// Validate the current data in the model. Throws a ValidationException on failure.
+    /// </summary>
+    void validate() const;
+
+    /// <summary>
+    /// Validate the current data in the model. Returns false on error and writes an error
+    /// message into the given stringstream.
+    /// </summary>
+    bool validate(std::stringstream& msg) const;
+
+    /// <summary>
+    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
+    /// Not meant to be called outside that case.
+    /// </summary>
+    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
+
+    bool operator==(const Jfjoch_settings_ssl& rhs) const;
+    bool operator!=(const Jfjoch_settings_ssl& rhs) const;
+
+    /////////////////////////////////////////////
+    /// Jfjoch_settings_ssl members
+
+    /// <summary>
+    /// 
+    /// </summary>
+    std::string getCertificate() const;
+    void setCertificate(std::string const& value);
+    /// <summary>
+    /// 
+    /// </summary>
+    std::string getKey() const;
+    void setKey(std::string const& value);
+
+    friend  void to_json(nlohmann::json& j, const Jfjoch_settings_ssl& o);
+    friend  void from_json(const nlohmann::json& j, Jfjoch_settings_ssl& o);
+protected:
+    std::string m_Certificate;
+
+    std::string m_Key;
+
+    
+};
+
+} // namespace org::openapitools::server::model
+
+#endif /* Jfjoch_settings_ssl_H_ */

broker/gen/model/Jfjoch_statistics.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -34,6 +34,7 @@ Jfjoch_statistics::Jfjoch_statistics()
     m_CalibrationIsSet = false;
     m_Zeromq_previewIsSet = false;
     m_Zeromq_metadataIsSet = false;
+    m_Dark_maskIsSet = false;
     m_Pixel_maskIsSet = false;
     m_RoiIsSet = false;
     m_Az_intIsSet = false;
@@ -103,7 +104,7 @@ bool Jfjoch_statistics::validate(std::stringstream& msg, const std::string& path
         }
 
     }
-                                
+                                    
     return success;
 }
 
@@ -152,6 +153,9 @@ bool Jfjoch_statistics::operator==(const Jfjoch_statistics& rhs) const
     ((!zeromqMetadataIsSet() && !rhs.zeromqMetadataIsSet()) || (zeromqMetadataIsSet() && rhs.zeromqMetadataIsSet() && getZeromqMetadata() == rhs.getZeromqMetadata())) &&
     
     
+    ((!darkMaskIsSet() && !rhs.darkMaskIsSet()) || (darkMaskIsSet() && rhs.darkMaskIsSet() && getDarkMask() == rhs.getDarkMask())) &&
+    
+    
     ((!pixelMaskIsSet() && !rhs.pixelMaskIsSet()) || (pixelMaskIsSet() && rhs.pixelMaskIsSet() && getPixelMask() == rhs.getPixelMask())) &&
     
     
@@ -203,6 +207,8 @@ void to_json(nlohmann::json& j, const Jfjoch_statistics& o)
         j["zeromq_preview"] = o.m_Zeromq_preview;
     if(o.zeromqMetadataIsSet())
         j["zeromq_metadata"] = o.m_Zeromq_metadata;
+    if(o.darkMaskIsSet())
+        j["dark_mask"] = o.m_Dark_mask;
     if(o.pixelMaskIsSet())
         j["pixel_mask"] = o.m_Pixel_mask;
     if(o.roiIsSet())
@@ -283,6 +289,11 @@ void from_json(const nlohmann::json& j, Jfjoch_statistics& o)
         j.at("zeromq_metadata").get_to(o.m_Zeromq_metadata);
         o.m_Zeromq_metadataIsSet = true;
     } 
+    if(j.find("dark_mask") != j.end())
+    {
+        j.at("dark_mask").get_to(o.m_Dark_mask);
+        o.m_Dark_maskIsSet = true;
+    } 
     if(j.find("pixel_mask") != j.end())
     {
         j.at("pixel_mask").get_to(o.m_Pixel_mask);
@@ -532,6 +543,23 @@ void Jfjoch_statistics::unsetZeromq_metadata()
 {
     m_Zeromq_metadataIsSet = false;
 }
+org::openapitools::server::model::Dark_mask_settings Jfjoch_statistics::getDarkMask() const
+{
+    return m_Dark_mask;
+}
+void Jfjoch_statistics::setDarkMask(org::openapitools::server::model::Dark_mask_settings const& value)
+{
+    m_Dark_mask = value;
+    m_Dark_maskIsSet = true;
+}
+bool Jfjoch_statistics::darkMaskIsSet() const
+{
+    return m_Dark_maskIsSet;
+}
+void Jfjoch_statistics::unsetDark_mask()
+{
+    m_Dark_maskIsSet = false;
+}
 org::openapitools::server::model::Pixel_mask_statistics Jfjoch_statistics::getPixelMask() const
 {
     return m_Pixel_mask;

broker/gen/model/Jfjoch_statistics.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -26,6 +26,7 @@
 #include "Spot_finding_settings.h"
 #include "Zeromq_preview_settings.h"
 #include "Detector_list.h"
+#include "Dark_mask_settings.h"
 #include "File_writer_settings.h"
 #include "Azim_int_settings.h"
 #include "Image_format_settings.h"
@@ -170,6 +171,13 @@ public:
     /// <summary>
     /// 
     /// </summary>
+    org::openapitools::server::model::Dark_mask_settings getDarkMask() const;
+    void setDarkMask(org::openapitools::server::model::Dark_mask_settings const& value);
+    bool darkMaskIsSet() const;
+    void unsetDark_mask();
+    /// <summary>
+    /// 
+    /// </summary>
     org::openapitools::server::model::Pixel_mask_statistics getPixelMask() const;
     void setPixelMask(org::openapitools::server::model::Pixel_mask_statistics const& value);
     bool pixelMaskIsSet() const;
@@ -232,6 +240,8 @@ protected:
     bool m_Zeromq_previewIsSet;
     org::openapitools::server::model::Zeromq_metadata_settings m_Zeromq_metadata;
     bool m_Zeromq_metadataIsSet;
+    org::openapitools::server::model::Dark_mask_settings m_Dark_mask;
+    bool m_Dark_maskIsSet;
     org::openapitools::server::model::Pixel_mask_statistics m_Pixel_mask;
     bool m_Pixel_maskIsSet;
     org::openapitools::server::model::Roi_definitions m_Roi;

broker/gen/model/Measurement_statistics.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Measurement_statistics.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pcie_devices_inner.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pcie_devices_inner.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pixel_mask_statistics.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pixel_mask_statistics.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot.h

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot_unit_x.cpp

@@ -1,8 +1,8 @@
 /**
 * Jungfraujoch
-* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
+* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.64
+* The version of the OpenAPI document: 1.0.0-rc.126
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).