Merge branch '2410-count-time-error' into 'main'

Version 1.0.0-rc.23

See merge request jungfraujoch/nextgendcu!94

.gitlab-ci.yml

@@ -15,7 +15,7 @@ build:x86:gcc:
   script:
     - mkdir build
     - cd build
-    - source /opt/rh/gcc-toolset-12/enable 
+    - source /opt/rh/gcc-toolset-12/enable
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - make -j48
 
@@ -89,7 +89,7 @@ build:x86:rpm:
     - mkdir build
     - cd build
     - source /opt/rh/gcc-toolset-12/enable
-    - cmake -DCMAKE_BUILD_TYPE=Release ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_INSTALL_DRIVER_SOURCE=ON ..
     - make frontend
     - make -j48 package
     - mv *.rpm ..
@@ -111,7 +111,7 @@ test:x86:gcc:
     - gcc
     - x86
   script:
-    - source /opt/rh/gcc-toolset-12/enable 
+    - source /opt/rh/gcc-toolset-12/enable
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -139,7 +139,7 @@ test:x86:crystfel:
     - x86
     - crystfel
   script:
-    - source /opt/rh/gcc-toolset-12/enable 
+    - source /opt/rh/gcc-toolset-12/enable
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -162,7 +162,7 @@ test:x86:xds_durin:
     - x86
     - xds
   script:
-    - source /opt/rh/gcc-toolset-12/enable 
+    - source /opt/rh/gcc-toolset-12/enable
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -208,7 +208,7 @@ test:x86:xia2.ssx:
     - x86
     - xds
   script:
-    - source /opt/rh/gcc-toolset-12/enable 
+    - source /opt/rh/gcc-toolset-12/enable
     - mkdir -p build
     - mkdir -p dials_test
     - cd build
@@ -226,9 +226,14 @@ release:
       when: manual
   tags:
     - x86
+    - python
   dependencies:
-    - build:x86:python_client
     - build:x86:frontend
     - build:x86:rpm
   script:
+    - cd python-client
+    - python3 setup.py sdist bdist_wheel
+    - twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing
+    - mv dist/* ..
+    - cd ..
     - bash gitlab_upload_release.sh

CMakeLists.txt

@@ -8,8 +8,8 @@ SET(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
 
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -mtune=native -Wno-deprecated-enum-enum-conversion")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -march=native -mtune=native")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-deprecated-enum-enum-conversion")
+SET(CMAKE_C_FLAGS_RELEASE "-O3")
 
 SET(BUILD_SHARED_LIBS OFF)
 SET(BUILD_TESTING OFF)
@@ -36,6 +36,8 @@ SET(HDF5_EXTERNALLY_CONFIGURED 1)
 SET(jbig OFF)
 SET(zstd OFF)
 SET(lzma OFF)
+SET(jpeg OFF)
+SET(old-jpeg OFF)
 
 INCLUDE(CheckLanguage)
 CHECK_LANGUAGE(CUDA)
@@ -51,7 +53,8 @@ IF (CMAKE_CUDA_COMPILER)
     FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
 ENDIF()
 
-SET(JFJOCH_WRITER_ONLY    OFF CACHE BOOL "Compile HDF5 writer only")
+SET(JFJOCH_WRITER_ONLY           OFF CACHE BOOL "Compile HDF5 writer only")
+SET(JFJOCH_INSTALL_DRIVER_SOURCE OFF CACHE BOOL "Install kernel driver source (ignored if building writer only; necessary for RPM building)")
 
 INCLUDE_DIRECTORIES(include)
 INCLUDE(CheckIncludeFile)
@@ -93,8 +96,8 @@ FetchContent_Declare(
 
 FetchContent_Declare(
         sls_detector_package
-        GIT_REPOSITORY https://github.com/fleon-psi/slsDetectorPackage
-        GIT_TAG bae261433241ff2f458350e26ab026f00f01c427
+        GIT_REPOSITORY https://github.com/slsdetectorgroup/slsDetectorPackage
+        GIT_TAG 8.0.2
 )
 
 FetchContent_Declare(
@@ -139,16 +142,17 @@ IF (NOT JFJOCH_WRITER_ONLY)
             COMMAND bash update_version.sh
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/
-            DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION}
-            COMPONENT driver-dkms
-            FILES_MATCHING PATTERN "dkms.conf")
-
-    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/
-            DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION}/src
-            COMPONENT driver-dkms
-            FILES_MATCHING PATTERN "*.c" PATTERN "*.h" PATTERN "Makefile")
+    IF (JFJOCH_INSTALL_DRIVER_SOURCE)
+        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/
+                DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION}
+                COMPONENT driver-dkms
+                FILES_MATCHING PATTERN "dkms.conf")
 
+        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/
+                DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION}/src
+                COMPONENT driver-dkms
+                FILES_MATCHING PATTERN "*.c" PATTERN "*.h" PATTERN "Makefile")
+    ENDIF()
     FILE(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/frontend/dist/)
     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/frontend/dist/ DESTINATION share/jfjoch/frontend COMPONENT jfjoch )
 ENDIF()
@@ -159,8 +163,17 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 # Set Package Name
 set(CPACK_PACKAGE_NAME "jfjoch")
+IF (JFJOCH_INSTALL_DRIVER_SOURCE)
+    SET(CPACK_COMPONENTS_ALL jfjoch writer 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)
+    SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/src)
+ELSE()
+    SET(CPACK_COMPONENTS_ALL jfjoch writer)
+ENDIF()
 
-SET(CPACK_COMPONENTS_ALL jfjoch writer driver-dkms)
 SET(CPACK_GENERATOR RPM)
 SET(CPACK_RPM_COMPONENT_INSTALL ON)
 SET(CPACK_RPM_MAIN_COMPONENT jfjoch)
@@ -170,11 +183,6 @@ 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_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)
-SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/src)
 
 # Set The Vendor Name
 SET(CPACK_PACKAGE_VENDOR "Paul Scherrer Institut")

DEPLOYMENT.md

@@ -2,8 +2,8 @@
 
 To deploy Jungfraujoch, one needs to follow four steps:
 
-1. Flash the U55C FPGA card with a proper image and install Linux kernel driver
-2. Install main Jungfraujoch code and frontend web interface
+1. Install main Jungfraujoch code and frontend web interface
+2. Flash the U55C FPGA card with a proper image and install Linux kernel driver
 3. Install Jungfraujoch writer
 4. Install Python OpenAPI client
 
@@ -11,21 +11,39 @@ Installation procedure depend a lot on the operating system. For RedHat Enterpri
 installation can be done with prebuilt RPMs and is relatively straightforward. For other systems one needs to build 
 software from source. Both ways will be presented.
 
+## Install main Jungfraujoch code and frontend web interface
+
+On RHEL 8 systems there is a `jfjoch-<version>-1.el8.x86_64.rpm` that needs to be installed and contains all the necessary software and web interface.
+
+On other OSes one needs to compile Jungfraujoch from source (from the repo directory):
+```
+$ mkdir build
+$ cd build
+$ cmake .. -DCMAKE_INSTALL_PREFIX=<directory to install>
+$ make
+$ sudo make install  
+```
+For manual installation, we recommend to use non-standard directory (like `/opt/jfjoch`), to facilitate upgrades and removal.
+For DKMS to manage kernel module sources it is necessary to copy driver sources to `/usr/src/jfjoch-<VERSION>` directory. This requires extra flag in cmake `-DJFJOCH_INSTALL_DRIVER_SOURCE=ON`.
+
+Frontend web user interface has to be built separately with:
+```
+$ cd build
+$ make frontend
+```
+Frontend files (.html and .js) will be placed in `frontend/dist` (outside of `build/` directory!) and has to be copied to a general location, e.g. `/usr/local/jfjoch/frontend` or `/opt/jfjoch/frotend`.
+
 ## Flash the U55C FPGA card with a proper image and install Linux kernel driver.
 
-
 ### Firmware flashing
-1. Install the `xbflash2` tool from Xilinx, which allows to flash the firmware through PCIe connector.
-
-It can be downloaded as RPM/DEB file from [Alveo product page](https://www.xilinx.com/products/boards-and-kits/alveo/u55c.html#xbflash2). For RHEL9 this needs to built from source - [Xilinx/XRT github repository](https://github.com/Xilinx/XRT).
-
-2. Check that the card is detected by OS with "lspci |grep Xilinx" and check the PCIe slot number (`11:00.0` in this case):
+1. Check that the card is detected by OS with "lspci |grep Xilinx" and check the PCIe bus/device/function (BDF) number, `11:00.0` in this case:
 ```
 $ lspci |grep Xilinx
-23:00.0 Processing accelerators: Xilinx Corporation Device 3450 (rev 58)
+23:00.0 Processing accelerators: Xilinx Corporation Device 3450 (rev 2)
 ```
-Note the device number `3450` that identifies Jungfraujoch device (Jungfraujoch pass is 3450 m above sea level) and `rev 58` identifying release of the firmware.
-3. Check the speed of the card, that it is detected as PCIe Gen4x8 device (needs to be done as root, otherwise configuration details are not given):
+Note the device number `3450` that identifies Jungfraujoch device (Jungfraujoch pass is 3450 m above sea level) and `rev 2` identifying release of the firmware.
+
+2. Check the speed of the card, that it is detected as PCIe Gen4x8 device (needs to be done as root, otherwise configuration details are not given):
 ```
 $ sudo lspci -vv -s <PCIe slot number>
 23:00.0 Processing accelerators: Xilinx Corporation Device 3450
@@ -34,20 +52,20 @@ LnkSta:     Speed 16GT/s (ok), Width x8 (ok)
 (...)
 ```
 
-4. Download the MCS image from release files or build it using Vivado (WARNING! building time can be about 8 hours and doesn't allways reach correct timing).
-5. Flash the card with xbflash2. For fresh card use:
+3. Download the MCS image from release files or build it using Vivado (WARNING! building time can be about 8 hours and doesn't allways reach correct timing).
+4. Flash the card with `xbflash.qspi` tool (part of Jungfraujoch). For fresh card use:
 ```
-sudo xbflash2 program --spi --image <path to MCS file> --bar-offset 0x1f06000 -d <PCIe slot from above>
+sudo xbflash.qspi --primary <path to MCS file> --card <PCIe slot from above> --bar-offset 0x1f06000 
 ```
 For card that was already flashed with Jungfraujoch images:
 
 ```
-sudo xbflash2 program --spi --image <path to MCS file> -d <PCIe slot from above>
+sudo xbflash.qspi --primary <path to MCS file> --card <PCIe slot from above>
 ```
-It is necessary to confirm the operation by pressing `Y` key.
+It is necessary to confirm the operation by pressing `Y` key or one can add `--force` option to avoid confirmation.
 It is safe to run multiple flashing processes in parallel for different cards, for example in separate screen sessions.
 
-6. Cold reboot:
+5. Cold reboot:
 ```
 sudo ipmitool chassis power cycle
 ```
@@ -82,27 +100,6 @@ $ sudo dracut -f
 Configure switch according to [FPGA network guide](fpga/NETWORK.md) - specifically set manual speed and turn off auto-negotiation
 for the port used to connect U55C card and connect card to switch.
 
-## Install main Jungfraujoch code and frontend web interface
-
-On RHEL 8 systems there is a `jfjoch-<version>-1.el8.x86_64.rpm` that needs to be installed and contains all the necessary software and web interface. 
-
-On other OSes one needs to compile Jungfraujoch from source (from the repo directory):
-```
-$ mkdir build
-$ cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=<directory to install>
-$ make
-$ sudo make install  
-```
-For manual installation, we recommend to use non-standard directory (like `/opt/jfjoch`), to facilitate upgrades and removal.
-
-Frontend web user interface has to be built separately with:
-```
-$ cd build
-$ make frontend
-```
-Frontend files (.html and .js) will be placed in `frontend/dist` (outside of `build/` directory!) and has to be copied to a general location, e.g. `/usr/local/jfjoch/frontend` or `/opt/jfjoch/frotend`.
-
 ### Running Jungfraujoch software
 Main Jungfraujoch service is called `jfjoch_broker`. It is responsible for handling data from FPGAs, doing processing, analysis, compression and sending images on ZeroMQ output.
 It is recommended to run the service as `systemd` service.

README.md

@@ -46,7 +46,7 @@ Other linux platforms should work, but no tests were done so far.
 Required:
 * C++20 compiler and C++20 standard library; recommended GCC 11+ or clang 14+ (Intel OneAPI, AMD AOCC)
 * CMake version 3.21 or newer + GNU make tool
-* JPEG library (turbo-jpeg is OK)
+* zlib compression library
 
 Optional:
 * CUDA compiler version 11 or newer - required for MX fast feedback indexer

VERSION

@@ -1 +1 @@
-1.0.0-rc.17
+1.0.0-rc.23

acquisition_device/AcquisitionDevice.cpp

@@ -8,7 +8,6 @@
 #include <thread>
 #include <fstream>
 #include <cmath>
-#include <sstream>
 
 #include "../common/JFJochException.h"
 #include "AcquisitionDevice.h"
@@ -263,14 +262,6 @@ AcquisitionDeviceNetConfig AcquisitionDevice::GetNetConfig() const {
     };
 }
 
-void AcquisitionDevice::SetDefaultDataSource(AcquisitionDeviceSource id) {
-
-}
-
-AcquisitionDeviceSource AcquisitionDevice::GetDataSource() {
-    return AcquisitionDeviceSource::NONE;
-}
-
 void AcquisitionDevice::RunInternalGenerator(const DiffractionExperiment &experiment) {
     FrameGeneratorConfig config{};
     config.frames = experiment.GetFrameNum() + DELAY_FRAMES_STOP_AND_QUIT + 1;

acquisition_device/AcquisitionDevice.h

@@ -31,8 +31,6 @@ struct AcquisitionDeviceStatistics {
     std::vector<uint64_t> packets_received_per_module;
 };
 
-enum class AcquisitionDeviceSource {NETWORK, FRAME_GENERATOR, NONE};
-
 class AcquisitionDevice {
     std::chrono::time_point<std::chrono::system_clock> start_time;
     std::chrono::time_point<std::chrono::system_clock> end_time;
@@ -107,8 +105,6 @@ public:
     virtual uint16_t GetUDPPort() const;
     virtual int32_t GetNUMANode() const;
     virtual void SetInternalGeneratorFrame(const uint16_t *input, size_t module_number) {}
-    virtual void SetDefaultDataSource(AcquisitionDeviceSource id);
-    virtual AcquisitionDeviceSource GetDataSource();
 
     AcquisitionDeviceNetConfig GetNetConfig() const;
 

acquisition_device/AcquisitionDeviceGroup.cpp

@@ -38,11 +38,6 @@ std::vector<AcquisitionDeviceNetConfig> AcquisitionDeviceGroup::GetNetworkConfig
     return ret;
 }
 
-void AcquisitionDeviceGroup::SetDefaultDataSource(AcquisitionDeviceSource id) {
-    for (auto &i: aq_devices)
-        i->SetDefaultDataSource(id);
-}
-
 void AcquisitionDeviceGroup::EnableLogging(Logger *logger) {
     for (auto &i: aq_devices)
         i->EnableLogging(logger);

acquisition_device/AcquisitionDeviceGroup.h

@@ -17,7 +17,6 @@ public:
     void AddHLSDevice(int64_t buffer_size_modules);
     std::vector<AcquisitionDeviceNetConfig> GetNetworkConfig();
     std::vector<DeviceStatus> GetDeviceStatus() const;
-    void SetDefaultDataSource(AcquisitionDeviceSource id);
     void EnableLogging(Logger *logger);
 };
 

acquisition_device/FPGAAcquisitionDevice.cpp

@@ -19,8 +19,6 @@ void FPGAAcquisitionDevice::Finalize() {
 
     while (!HW_IsIdle())
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
-
-    SetDataSource(default_data_source);
 }
 
 void FPGAAcquisitionDevice::ReadWorkCompletionThread() {
@@ -249,11 +247,6 @@ void FPGAAcquisitionDevice::Start(const DiffractionExperiment &experiment, uint3
         throw(JFJochException(JFJochExceptionCategory::AcquisitionDeviceError,
                               "Hardware action running prior to start of data acquisition"));
 
-    if (experiment.IsUsingInternalPacketGen())
-        SetDataSource(AcquisitionDeviceSource::FRAME_GENERATOR);
-    else
-        SetDataSource(default_data_source);
-
     DataCollectionConfig cfg_in{}, cfg_out{};
 
     FillActionRegister(experiment, cfg_in);
@@ -282,36 +275,6 @@ FPGAAcquisitionDevice::FPGAAcquisitionDevice(uint16_t data_stream)
           internal_pkt_gen_frame(RAW_MODULE_SIZE * MAX_MODULES_FPGA)  {
 }
 
-AcquisitionDeviceSource FPGAAcquisitionDevice::GetDataSource() {
-    switch (HW_GetDataSource()) {
-        case STREAM_MERGE_SRC_NETWORK:
-            return AcquisitionDeviceSource::NETWORK;
-        case STREAM_MERGE_SRC_FRAME_GEN:
-            return AcquisitionDeviceSource::FRAME_GENERATOR;
-        default:
-            return AcquisitionDeviceSource::NONE;
-    }
-}
-
-void FPGAAcquisitionDevice::SetDefaultDataSource(AcquisitionDeviceSource id) {
-    default_data_source = id;
-    SetDataSource(id);
-}
-
-void FPGAAcquisitionDevice::SetDataSource(AcquisitionDeviceSource id) {
-    switch (id) {
-        case AcquisitionDeviceSource::NETWORK:
-            HW_SetDataSource(STREAM_MERGE_SRC_NETWORK);
-            break;
-        case AcquisitionDeviceSource::FRAME_GENERATOR:
-            HW_SetDataSource(STREAM_MERGE_SRC_FRAME_GEN);
-            break;
-        case AcquisitionDeviceSource::NONE:
-            HW_SetDataSource(STREAM_MERGE_SRC_NONE);
-            break;
-    }
-}
-
 uint32_t FPGAAcquisitionDevice::GetExpectedDescriptorsPerModule() const {
     return expected_descriptors_per_module;
 }

acquisition_device/FPGAAcquisitionDevice.h

@@ -10,7 +10,6 @@ class FPGAAcquisitionDevice : public AcquisitionDevice {
     uint16_t data_collection_id = 0;
 
     uint32_t expected_descriptors_per_module = 1;
-    AcquisitionDeviceSource default_data_source = AcquisitionDeviceSource::NETWORK;
 
     virtual void FPGA_StartAction(const DiffractionExperiment &experiment) = 0;
     virtual void FPGA_EndAction() = 0;
@@ -33,11 +32,8 @@ class FPGAAcquisitionDevice : public AcquisitionDevice {
     void LoadCalibration(uint32_t handle);
     virtual bool HW_ReadMailbox(uint32_t *values) = 0;
     virtual bool HW_SendWorkRequest(uint32_t handle) = 0;
-    virtual void HW_SetDataSource(uint32_t val) = 0;
-    virtual uint32_t HW_GetDataSource() = 0;
     void StartSendingWorkRequests() override;
     void Start(const DiffractionExperiment &experiment, uint32_t flag) override;
-    void SetDataSource(AcquisitionDeviceSource id); // doesn't change default data
 protected:
     std::vector<uint16_t> internal_pkt_gen_frame;
     explicit FPGAAcquisitionDevice(uint16_t data_stream);
@@ -49,9 +45,6 @@ public:
     void InitializeSpotFinderResolutionMap(const float *data, size_t module_number) override;
     void InitializeROIMap(const uint16_t *map, size_t module_number) override;
     void SetInternalGeneratorFrame(const uint16_t *input, size_t module_number) override;
-
-    AcquisitionDeviceSource GetDataSource() override;
-    void SetDefaultDataSource(AcquisitionDeviceSource id) override;
     uint32_t GetExpectedDescriptorsPerModule() const override;
 };
 

acquisition_device/HLSSimulatedDevice.cpp

@@ -91,14 +91,6 @@ void HLSSimulatedDevice::HW_SetSpotFinderParameters(const SpotFinderParameters &
     device->HW_SetSpotFinderParameters(params);
 }
 
-void HLSSimulatedDevice::HW_SetDataSource(uint32_t val) {
-    device->HW_SetDataSource(val);
-}
-
-uint32_t HLSSimulatedDevice::HW_GetDataSource() {
-    return device->HW_GetDataSource();
-}
-
 void HLSSimulatedDevice::CreateXfelBunchIDPacket(double pulse_id, uint32_t event_code) {
     device->CreateXfelBunchIDPacket(pulse_id, event_code);
 }

acquisition_device/HLSSimulatedDevice.h

@@ -23,8 +23,6 @@ class HLSSimulatedDevice : public FPGAAcquisitionDevice {
     bool HW_SendWorkRequest(uint32_t handle) override;
     void HW_LoadCalibration(const LoadCalibrationConfig &config) override;
     void HW_SetSpotFinderParameters(const SpotFinderParameters &params) override;
-    uint32_t HW_GetDataSource() override;
-    void HW_SetDataSource(uint32_t val) override;
     void HW_RunInternalGenerator(const FrameGeneratorConfig &config) override;
 public:
     HLSSimulatedDevice(uint16_t data_stream, size_t in_frame_buffer_size_modules, int16_t numa_node = -1);

acquisition_device/PCIExpressDevice.cpp

@@ -102,14 +102,6 @@ DataCollectionStatus PCIExpressDevice::GetDataCollectionStatus() const {
     return dev.GetDataCollectionStatus();
 }
 
-uint32_t PCIExpressDevice::HW_GetDataSource() {
-    return dev.GetDataSource();
-}
-
-void PCIExpressDevice::HW_SetDataSource(uint32_t val) {
-    return dev.SetDataSource(val);
-}
-
 void PCIExpressDevice::HW_LoadCalibration(const LoadCalibrationConfig &config) {
     dev.LoadCalibration(config);
 }

acquisition_device/PCIExpressDevice.h

@@ -17,8 +17,6 @@ class PCIExpressDevice : public FPGAAcquisitionDevice {
     void HW_WriteActionRegister(const DataCollectionConfig *job) override;
     void HW_ReadActionRegister(DataCollectionConfig *job) override;
     void HW_SetSpotFinderParameters(const SpotFinderParameters &params) override;
-    uint32_t HW_GetDataSource() override;
-    void HW_SetDataSource(uint32_t val) override;
     void FPGA_EndAction() override;
     uint32_t GetNumKernelBuffers() const;
     void HW_RunInternalGenerator(const FrameGeneratorConfig &config) override;

broker/JFJochBrokerHttp.cpp

@@ -493,9 +493,30 @@ void JFJochBrokerHttp::statistics_get(const std::optional<bool> &compression, Pi
     if (det_status.has_value())
         statistics.setDetector(Convert(det_status.value()));
 
+    statistics.setDetectorSettings(Convert(state_machine.GetDetectorSettings()));
+    statistics.setDetectorList(Convert(state_machine.GetDetectorsList()));
+    statistics.setDataProcessingSettings(Convert(state_machine.GetSpotFindingSettings()));
+    statistics.setInstrumentMetadata(Convert(state_machine.GetInstrumentMetadata()));
+    statistics.setImageFormatSettings(Convert(state_machine.GetImageFormatSettings()));
+
+    auto zeromq_prev = state_machine.GetPreviewSocketSettings();
+    if (!zeromq_prev.address.empty())
+        statistics.setZeromqPreview(Convert(zeromq_prev));
+
     nlohmann::json j = statistics;
     if (!compression.has_value() || compression.value())
         response.setCompression(Pistache::Http::Header::Encoding::Deflate);
 
     response.send(Pistache::Http::Code::Ok, j.dump(), MIME(Application, Json));
 }
+
+void JFJochBrokerHttp::config_zeromq_preview_get(Pistache::Http::ResponseWriter &response) {
+    ProcessOutput(Convert(state_machine.GetPreviewSocketSettings()), response);
+}
+
+void JFJochBrokerHttp::config_zeromq_preview_put(
+        const org::openapitools::server::model::Zeromq_preview_settings &zeromqPreviewSettings,
+        Pistache::Http::ResponseWriter &response) {
+    state_machine.SetPreviewSocketSettings(Convert(zeromqPreviewSettings));
+    response.send(Pistache::Http::Code::Ok);
+}

broker/JFJochBrokerHttp.h

@@ -163,6 +163,12 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
 
     void statistics_get(const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) override;
 
+    void config_zeromq_preview_get(Pistache::Http::ResponseWriter &response) override;
+
+    void
+    config_zeromq_preview_put(const org::openapitools::server::model::Zeromq_preview_settings &zeromqPreviewSettings,
+                              Pistache::Http::ResponseWriter &response) override;
+
 public:
     JFJochBrokerHttp(const DiffractionExperiment& experiment, std::shared_ptr<Pistache::Rest::Router> &rtr);
     void AddDetectorSetup(const DetectorSetup &setup);

broker/JFJochBrokerParser.cpp

@@ -89,7 +89,9 @@ DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detecto
             .SensorThickness_um(d.getSensorThicknessUm())
                     // .PixelSize_um(GET_FLOAT(j, "pixel_size_um", 75.0f))
             .SensorMaterial(d.getSensorMaterial())
-            .SerialNumber(d.getSerialNumber());
+            .SerialNumber(d.getSerialNumber())
+            .ModuleSync(d.isModuleSync());
+
     if (d.baseDataIpv4AddressIsSet())
         setup.BaseIPv4Addr(d.getBaseDataIpv4Address());
     if (d.txDelayIsSet())
@@ -128,9 +130,6 @@ std::unique_ptr<ImagePusher> ParseZMQImagePusher(const org::openapitools::server
                                                   send_watermark,
                                                   send_buffer_size);
 
-    if (j.getZeromq().previewSocketIsSet())
-        tmp->PreviewSocket(j.getZeromq().getPreviewSocket());
-
     if (j.getZeromq().writerNotificationSocketIsSet())
         tmp->WriterNotificationSocket(j.getZeromq().getWriterNotificationSocket());
     return std::move(tmp);
@@ -162,3 +161,17 @@ void ParseAcquisitionDeviceGroup(const org::openapitools::server::model::Jfjoch_
             aq_devices.AddPCIeDevice(p.getBlk(), ipv4_addr);
         }
 }
+
+void ParseReceiverSettings(const org::openapitools::server::model::Jfjoch_settings &input, JFJochReceiverService &service) {
+    std::string numa_policy = input.getNumaPolicy();
+    if (!numa_policy.empty())
+        service.NUMAPolicy(numa_policy);
+
+    // Using default in case
+    service.NumThreads(input.getReceiverThreads());
+
+    if (input.zeromqPreviewIsSet()) {
+        service.PreviewSocket(input.getZeromqPreview().getSocketAddress());
+        service.PreviewSocketSettings(Convert(input.getZeromqPreview()));
+    }
+}

broker/JFJochBrokerParser.h

@@ -6,7 +6,7 @@
 #include "../common/DiffractionExperiment.h"
 #include "../acquisition_device/AcquisitionDeviceGroup.h"
 #include "../image_pusher/ImagePusher.h"
-
+#include "../receiver/JFJochReceiverService.h"
 #include "gen/model/Jfjoch_settings.h"
 
 DetectorGeometry ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j);
@@ -19,5 +19,6 @@ void ParseFacilityConfiguration(const org::openapitools::server::model::Jfjoch_s
 std::unique_ptr<ImagePusher> ParseImagePusher(const org::openapitools::server::model::Jfjoch_settings &j);
 
 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);
 
 #endif //JUNGFRAUJOCH_JFJOCHBROKERPARSER_H

broker/JFJochServices.cpp

@@ -199,4 +199,16 @@ std::vector<DeviceStatus> JFJochServices::GetDeviceStatus() const {
     if (receiver)
         ret = receiver->GetDeviceStatus();
     return ret;
-}
+}
+
+ZMQPreviewSettings JFJochServices::GetPreviewSocketSettings() {
+    if (receiver)
+        return receiver->GetPreviewSocketSettings();
+    else
+        return {};
+}
+
+void JFJochServices::SetPreviewSocketSettings(const ZMQPreviewSettings &input) {
+    if (receiver)
+        receiver->PreviewSocketSettings(input);
+}

broker/JFJochServices.h

@@ -49,6 +49,9 @@ public:
     void GetXFELEventCode(std::vector<uint64_t> &v) const;
 
     std::vector<DeviceStatus> GetDeviceStatus() const;
+
+    void SetPreviewSocketSettings(const ZMQPreviewSettings &input);
+    ZMQPreviewSettings GetPreviewSocketSettings();
 };
 
 

broker/JFJochStateMachine.cpp

@@ -46,6 +46,13 @@ bool JFJochStateMachine::ImportPedestalG1G2(const JFJochReceiverOutput &receiver
 }
 
 void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock<std::mutex> &ul) {
+    if (experiment.GetDetectorSetup().GetDetectorType() == DetectorType::EIGER) {
+        logger.Info("EIGER configuration");
+        services.ConfigureDetector(experiment);
+        logger.Info("   ... done ");
+        return;
+    }
+
     calibration = std::make_unique<JFCalibration>(experiment);
 
     if (!gain_calibration.empty()) {
@@ -361,22 +368,26 @@ void JFJochStateMachine::SetCalibrationStatistics(const std::vector<JFCalibratio
     calibration_statistics = input;
 }
 
-
 DetectorSettings JFJochStateMachine::GetDetectorSettings() const {
-    std::unique_lock<std::mutex> ul(m);
+    std::unique_lock<std::mutex> ul(experiment_detector_settings_mutex);
     return experiment.GetDetectorSettings();
 }
 
+void JFJochStateMachine::ImportDetectorSettings(const DetectorSettings &input) {
+    std::unique_lock<std::mutex> ul(experiment_detector_settings_mutex);
+    experiment.ImportDetectorSettings(input);
+}
+
 void JFJochStateMachine::LoadDetectorSettings(const DetectorSettings &settings) {
     std::unique_lock<std::mutex> ul(m);
     switch (state) {
         case JFJochState::Inactive:
         case JFJochState::Error:
-            experiment.ImportDetectorSettings(settings);
+            ImportDetectorSettings(settings);
             break;
         case JFJochState::Idle:
             state = JFJochState::Busy;
-            experiment.ImportDetectorSettings(settings);
+            ImportDetectorSettings(settings);
             measurement = std::async(std::launch::async, &JFJochStateMachine::PedestalThread, this, std::move(ul));
             break;
         case JFJochState::Measuring:
@@ -704,4 +715,12 @@ void JFJochStateMachine::ConvImageFormatSettings() {
 
 std::vector<DeviceStatus> JFJochStateMachine::GetDeviceStatus() const {
     return services.GetDeviceStatus();
-}
+}
+
+void JFJochStateMachine::SetPreviewSocketSettings(const ZMQPreviewSettings &input) {
+    services.SetPreviewSocketSettings(input);
+}
+
+ZMQPreviewSettings JFJochStateMachine::GetPreviewSocketSettings() {
+    return services.GetPreviewSocketSettings();
+}

broker/JFJochStateMachine.h

@@ -69,11 +69,13 @@ class JFJochStateMachine {
     Logger &logger;
     JFJochServices &services;
 
+    mutable std::mutex experiment_detector_settings_mutex;
+    DiffractionExperiment experiment;
+
     mutable std::mutex m;
     std::condition_variable c;
 
     // mutex m is protecting:
-    DiffractionExperiment experiment;
     volatile JFJochState state = JFJochState::Inactive;
     volatile bool cancel_sequence = false;
     std::unique_ptr<JFCalibration> calibration;
@@ -103,6 +105,7 @@ class JFJochStateMachine {
     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);
+    void ImportDetectorSettings(const DetectorSettings& input);
 public:
     JFJochStateMachine(JFJochServices &in_services, Logger &logger);
     ~JFJochStateMachine();
@@ -176,6 +179,9 @@ public:
     std::string GetUserPixelMaskTIFF() const;
     void SetUserPixelMask(const std::string &v);
     std::vector<DeviceStatus> GetDeviceStatus() const;
+
+    void SetPreviewSocketSettings(const ZMQPreviewSettings &input);
+    ZMQPreviewSettings GetPreviewSocketSettings();
 };
 
 

broker/OpenAPIConvert.cpp

@@ -556,3 +556,22 @@ std::vector<org::openapitools::server::model::Fpga_status_inner> Convert(const s
     }
     return ret;
 }
+
+ZMQPreviewSettings Convert(const org::openapitools::server::model::Zeromq_preview_settings &input) {
+    ZMQPreviewSettings ret;
+    if (input.isEnabled())
+        ret.period = std::chrono::milliseconds(input.getPeriodMs());
+    else
+        ret.period = {};
+    ret.address = "";
+    return ret;
+}
+
+org::openapitools::server::model::Zeromq_preview_settings Convert(const ZMQPreviewSettings &settings) {
+    org::openapitools::server::model::Zeromq_preview_settings ret;
+    ret.setEnabled(settings.period.has_value());
+    if (settings.period.has_value())
+        ret.setPeriodMs(settings.period.value().count() / 1000);
+    ret.setSocketAddress(settings.address);
+    return ret;
+}

broker/OpenAPIConvert.h

@@ -28,6 +28,7 @@
 #include "../common/DetectorSettings.h"
 #include "../jungfrau/JFCalibration.h"
 #include "../common/InstrumentMetadata.h"
+#include "Zeromq_preview_settings.h"
 
 SpotFindingSettings Convert(const org::openapitools::server::model::Spot_finding_settings &input);
 org::openapitools::server::model::Spot_finding_settings Convert(const SpotFindingSettings &input);
@@ -57,4 +58,7 @@ org::openapitools::server::model::Image_format_settings Convert(const ImageForma
 DatasetSettings Convert(const org::openapitools::server::model::Dataset_settings& input);
 std::vector<org::openapitools::server::model::Fpga_status_inner> Convert(const std::vector<DeviceStatus> &input);
 
+org::openapitools::server::model::Zeromq_preview_settings Convert(const ZMQPreviewSettings& settings);
+ZMQPreviewSettings Convert(const org::openapitools::server::model::Zeromq_preview_settings& input);
+
 #endif //JFJOCH_OPENAPICONVERT_H

broker/gen/api/ApiBase.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/api/DefaultApi.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -53,6 +53,8 @@ void DefaultApi::setupRoutes() {
     Routes::Put(*router, base + "/config/spot_finding", Routes::bind(&DefaultApi::config_spot_finding_put_handler, this));
     Routes::Get(*router, base + "/config/user_mask.tiff", Routes::bind(&DefaultApi::config_user_mask_tiff_get_handler, this));
     Routes::Put(*router, base + "/config/user_mask.tiff", Routes::bind(&DefaultApi::config_user_mask_tiff_put_handler, this));
+    Routes::Get(*router, base + "/config/zeromq_preview", Routes::bind(&DefaultApi::config_zeromq_preview_get_handler, this));
+    Routes::Put(*router, base + "/config/zeromq_preview", Routes::bind(&DefaultApi::config_zeromq_preview_put_handler, this));
     Routes::Post(*router, base + "/deactivate", Routes::bind(&DefaultApi::deactivate_post_handler, this));
     Routes::Get(*router, base + "/detector/status", Routes::bind(&DefaultApi::detector_status_get_handler, this));
     Routes::Get(*router, base + "/fpga_status", Routes::bind(&DefaultApi::fpga_status_get_handler, this));
@@ -572,6 +574,56 @@ void DefaultApi::config_user_mask_tiff_put_handler(const Pistache::Rest::Request
         response.send(Pistache::Http::Code::Internal_Server_Error, e.what());
     }
 
+}
+void DefaultApi::config_zeromq_preview_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) {
+    try {
+
+
+    try {
+        this->config_zeromq_preview_get(response);
+    } catch (Pistache::Http::HttpError &e) {
+        response.send(static_cast<Pistache::Http::Code>(e.code()), e.what());
+        return;
+    } catch (std::exception &e) {
+        this->handleOperationException(e, response);
+        return;
+    }
+
+    } catch (std::exception &e) {
+        response.send(Pistache::Http::Code::Internal_Server_Error, e.what());
+    }
+
+}
+void DefaultApi::config_zeromq_preview_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
+    try {
+
+
+    // Getting the body param
+    
+    Zeromq_preview_settings zeromqPreviewSettings;
+    
+    try {
+        nlohmann::json::parse(request.body()).get_to(zeromqPreviewSettings);
+        zeromqPreviewSettings.validate();
+    } catch (std::exception &e) {
+        this->handleParsingException(e, response);
+        return;
+    }
+
+    try {
+        this->config_zeromq_preview_put(zeromqPreviewSettings, response);
+    } catch (Pistache::Http::HttpError &e) {
+        response.send(static_cast<Pistache::Http::Code>(e.code()), e.what());
+        return;
+    } catch (std::exception &e) {
+        this->handleOperationException(e, response);
+        return;
+    }
+
+    } catch (std::exception &e) {
+        response.send(Pistache::Http::Code::Internal_Server_Error, e.what());
+    }
+
 }
 void DefaultApi::deactivate_post_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) {
     try {

broker/gen/api/DefaultApi.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -47,6 +47,7 @@
 #include "Roi_box_list.h"
 #include "Roi_circle_list.h"
 #include "Spot_finding_settings.h"
+#include "Zeromq_preview_settings.h"
 #include <string>
 #include <vector>
 
@@ -84,6 +85,8 @@ private:
     void config_spot_finding_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_user_mask_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void config_user_mask_tiff_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void config_zeromq_preview_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void config_zeromq_preview_put_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void deactivate_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void detector_status_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
     void fpga_status_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -297,6 +300,21 @@ private:
     /// </remarks>
     virtual void config_user_mask_tiff_put(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter &response) = 0;
     /// <summary>
+    /// Get ZeroMQ preview settings
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    virtual void config_zeromq_preview_get(Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Set ZeroMQ preview settings
+    /// </summary>
+    /// <remarks>
+    /// 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;
+    /// <summary>
     /// Prepare detector to turn off
     /// </summary>
     /// <remarks>

broker/gen/model/Azim_int_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Broker_status.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Broker_status.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Calibration_statistics_inner.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings_unit_cell.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings_unit_cell.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -28,6 +28,8 @@ Detector::Detector()
     m_High_voltage_VIsSet = false;
     m_Udp_interface_count = 1L;
     m_Udp_interface_countIsSet = false;
+    m_Module_sync = true;
+    m_Module_syncIsSet = false;
     m_Sensor_thickness_um = 320.0f;
     m_Sensor_thickness_umIsSet = false;
     m_Calibration_fileIsSet = false;
@@ -129,7 +131,7 @@ bool Detector::validate(std::stringstream& msg, const std::string& pathPrefix) c
         }
 
     }
-         
+             
     if (sensorThicknessUmIsSet())
     {
         const float& value = m_Sensor_thickness_um;
@@ -252,6 +254,9 @@ bool Detector::operator==(const Detector& rhs) const
     ((!udpInterfaceCountIsSet() && !rhs.udpInterfaceCountIsSet()) || (udpInterfaceCountIsSet() && rhs.udpInterfaceCountIsSet() && getUdpInterfaceCount() == rhs.getUdpInterfaceCount())) &&
     
     
+    ((!moduleSyncIsSet() && !rhs.moduleSyncIsSet()) || (moduleSyncIsSet() && rhs.moduleSyncIsSet() && isModuleSync() == rhs.isModuleSync())) &&
+    
+    
     ((!sensorThicknessUmIsSet() && !rhs.sensorThicknessUmIsSet()) || (sensorThicknessUmIsSet() && rhs.sensorThicknessUmIsSet() && getSensorThicknessUm() == rhs.getSensorThicknessUm())) &&
     
     
@@ -297,6 +302,8 @@ void to_json(nlohmann::json& j, const Detector& o)
         j["high_voltage_V"] = o.m_High_voltage_V;
     if(o.udpInterfaceCountIsSet())
         j["udp_interface_count"] = o.m_Udp_interface_count;
+    if(o.moduleSyncIsSet())
+        j["module_sync"] = o.m_Module_sync;
     if(o.sensorThicknessUmIsSet())
         j["sensor_thickness_um"] = o.m_Sensor_thickness_um;
     if(o.calibrationFileIsSet() || !o.m_Calibration_file.empty())
@@ -337,6 +344,11 @@ void from_json(const nlohmann::json& j, Detector& o)
         j.at("udp_interface_count").get_to(o.m_Udp_interface_count);
         o.m_Udp_interface_countIsSet = true;
     } 
+    if(j.find("module_sync") != j.end())
+    {
+        j.at("module_sync").get_to(o.m_Module_sync);
+        o.m_Module_syncIsSet = true;
+    } 
     if(j.find("sensor_thickness_um") != j.end())
     {
         j.at("sensor_thickness_um").get_to(o.m_Sensor_thickness_um);
@@ -452,6 +464,23 @@ void Detector::unsetUdp_interface_count()
 {
     m_Udp_interface_countIsSet = false;
 }
+bool Detector::isModuleSync() const
+{
+    return m_Module_sync;
+}
+void Detector::setModuleSync(bool const value)
+{
+    m_Module_sync = value;
+    m_Module_syncIsSet = true;
+}
+bool Detector::moduleSyncIsSet() const
+{
+    return m_Module_syncIsSet;
+}
+void Detector::unsetModule_sync()
+{
+    m_Module_syncIsSet = false;
+}
 float Detector::getSensorThicknessUm() const
 {
     return m_Sensor_thickness_um;

broker/gen/model/Detector.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -94,6 +94,13 @@ public:
     bool udpInterfaceCountIsSet() const;
     void unsetUdp_interface_count();
     /// <summary>
+    /// Use module 0 as master for timing. Only applies to JUNGFRAU detector (this cannot be turned off for EIGER).
+    /// </summary>
+    bool isModuleSync() const;
+    void setModuleSync(bool const value);
+    bool moduleSyncIsSet() const;
+    void unsetModule_sync();
+    /// <summary>
     /// 
     /// </summary>
     float getSensorThicknessUm() const;
@@ -170,6 +177,8 @@ protected:
     bool m_High_voltage_VIsSet;
     int64_t m_Udp_interface_count;
     bool m_Udp_interface_countIsSet;
+    bool m_Module_sync;
+    bool m_Module_syncIsSet;
     float m_Sensor_thickness_um;
     bool m_Sensor_thickness_umIsSet;
     std::vector<std::string> m_Calibration_file;

broker/gen/model/Detector_list.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list_detectors_inner.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -26,7 +26,6 @@ Detector_list_detectors_inner::Detector_list_detectors_inner()
     m_Serial_number = "";
     m_Base_ipv4_addr = "";
     m_Udp_interface_count = 0L;
-    m_Udp_interface_countIsSet = false;
     m_Nmodules = 0L;
     m_Width = 0L;
     m_Height = 0L;
@@ -87,8 +86,8 @@ bool Detector_list_detectors_inner::operator==(const Detector_list_detectors_inn
     (getBaseIpv4Addr() == rhs.getBaseIpv4Addr())
      &&
     
-    
-    ((!udpInterfaceCountIsSet() && !rhs.udpInterfaceCountIsSet()) || (udpInterfaceCountIsSet() && rhs.udpInterfaceCountIsSet() && getUdpInterfaceCount() == rhs.getUdpInterfaceCount())) &&
+    (getUdpInterfaceCount() == rhs.getUdpInterfaceCount())
+     &&
     
     (getNmodules() == rhs.getNmodules())
      &&
@@ -114,8 +113,7 @@ void to_json(nlohmann::json& j, const Detector_list_detectors_inner& o)
     j["description"] = o.m_Description;
     j["serial_number"] = o.m_Serial_number;
     j["base_ipv4_addr"] = o.m_Base_ipv4_addr;
-    if(o.udpInterfaceCountIsSet())
-        j["udp_interface_count"] = o.m_Udp_interface_count;
+    j["udp_interface_count"] = o.m_Udp_interface_count;
     j["nmodules"] = o.m_Nmodules;
     j["width"] = o.m_Width;
     j["height"] = o.m_Height;
@@ -128,11 +126,7 @@ void from_json(const nlohmann::json& j, Detector_list_detectors_inner& o)
     j.at("description").get_to(o.m_Description);
     j.at("serial_number").get_to(o.m_Serial_number);
     j.at("base_ipv4_addr").get_to(o.m_Base_ipv4_addr);
-    if(j.find("udp_interface_count") != j.end())
-    {
-        j.at("udp_interface_count").get_to(o.m_Udp_interface_count);
-        o.m_Udp_interface_countIsSet = true;
-    } 
+    j.at("udp_interface_count").get_to(o.m_Udp_interface_count);
     j.at("nmodules").get_to(o.m_Nmodules);
     j.at("width").get_to(o.m_Width);
     j.at("height").get_to(o.m_Height);
@@ -178,15 +172,6 @@ int64_t Detector_list_detectors_inner::getUdpInterfaceCount() const
 void Detector_list_detectors_inner::setUdpInterfaceCount(int64_t const value)
 {
     m_Udp_interface_count = value;
-    m_Udp_interface_countIsSet = true;
-}
-bool Detector_list_detectors_inner::udpInterfaceCountIsSet() const
-{
-    return m_Udp_interface_countIsSet;
-}
-void Detector_list_detectors_inner::unsetUdp_interface_count()
-{
-    m_Udp_interface_countIsSet = false;
 }
 int64_t Detector_list_detectors_inner::getNmodules() const
 {

broker/gen/model/Detector_list_detectors_inner.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -83,8 +83,6 @@ public:
     /// </summary>
     int64_t getUdpInterfaceCount() const;
     void setUdpInterfaceCount(int64_t const value);
-    bool udpInterfaceCountIsSet() const;
-    void unsetUdp_interface_count();
     /// <summary>
     /// 
     /// </summary>
@@ -113,7 +111,7 @@ protected:
     std::string m_Base_ipv4_addr;
 
     int64_t m_Udp_interface_count;
-    bool m_Udp_interface_countIsSet;
+
     int64_t m_Nmodules;
 
     int64_t m_Width;

broker/gen/model/Detector_module.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_state.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_state.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_format_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Instrument_metadata.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Instrument_metadata.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Jfjoch_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -34,6 +34,7 @@ Jfjoch_settings::Jfjoch_settings()
     m_Numa_policy = "";
     m_Numa_policyIsSet = false;
     m_Frontend_directory = "";
+    m_Zeromq_previewIsSet = false;
     
 }
 
@@ -131,7 +132,7 @@ bool Jfjoch_settings::validate(std::stringstream& msg, const std::string& pathPr
         }
 
     }
-                
+                    
     return success;
 }
 
@@ -174,8 +175,11 @@ bool Jfjoch_settings::operator==(const Jfjoch_settings& rhs) const
      &&
     
     (getImagePusher() == rhs.getImagePusher())
+     &&
     
     
+    ((!zeromqPreviewIsSet() && !rhs.zeromqPreviewIsSet()) || (zeromqPreviewIsSet() && rhs.zeromqPreviewIsSet() && getZeromqPreview() == rhs.getZeromqPreview()))
+    
     ;
 }
 
@@ -208,6 +212,8 @@ void to_json(nlohmann::json& j, const Jfjoch_settings& o)
         j["numa_policy"] = o.m_Numa_policy;
     j["frontend_directory"] = o.m_Frontend_directory;
     j["image_pusher"] = o.m_Image_pusher;
+    if(o.zeromqPreviewIsSet())
+        j["zeromq_preview"] = o.m_Zeromq_preview;
     
 }
 
@@ -261,6 +267,11 @@ void from_json(const nlohmann::json& j, Jfjoch_settings& o)
     } 
     j.at("frontend_directory").get_to(o.m_Frontend_directory);
     j.at("image_pusher").get_to(o.m_Image_pusher);
+    if(j.find("zeromq_preview") != j.end())
+    {
+        j.at("zeromq_preview").get_to(o.m_Zeromq_preview);
+        o.m_Zeromq_previewIsSet = true;
+    } 
     
 }
 
@@ -441,6 +452,23 @@ void Jfjoch_settings::setImagePusher(org::openapitools::server::model::Image_pus
 {
     m_Image_pusher = value;
 }
+org::openapitools::server::model::Zeromq_preview_settings Jfjoch_settings::getZeromqPreview() const
+{
+    return m_Zeromq_preview;
+}
+void Jfjoch_settings::setZeromqPreview(org::openapitools::server::model::Zeromq_preview_settings const& value)
+{
+    m_Zeromq_preview = value;
+    m_Zeromq_previewIsSet = true;
+}
+bool Jfjoch_settings::zeromqPreviewIsSet() const
+{
+    return m_Zeromq_previewIsSet;
+}
+void Jfjoch_settings::unsetZeromq_preview()
+{
+    m_Zeromq_previewIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Jfjoch_settings.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -20,6 +20,7 @@
 
 
 #include "Detector.h"
+#include "Zeromq_preview_settings.h"
 #include "Image_pusher_type.h"
 #include "Pcie_devices_inner.h"
 #include <string>
@@ -145,6 +146,13 @@ public:
     /// </summary>
     org::openapitools::server::model::Image_pusher_type getImagePusher() const;
     void setImagePusher(org::openapitools::server::model::Image_pusher_type const& value);
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Zeromq_preview_settings getZeromqPreview() const;
+    void setZeromqPreview(org::openapitools::server::model::Zeromq_preview_settings const& value);
+    bool zeromqPreviewIsSet() const;
+    void unsetZeromq_preview();
 
     friend  void to_json(nlohmann::json& j, const Jfjoch_settings& o);
     friend  void from_json(const nlohmann::json& j, Jfjoch_settings& o);
@@ -173,6 +181,8 @@ protected:
 
     org::openapitools::server::model::Image_pusher_type m_Image_pusher;
 
+    org::openapitools::server::model::Zeromq_preview_settings m_Zeromq_preview;
+    bool m_Zeromq_previewIsSet;
     
 };
 

broker/gen/model/Jfjoch_statistics.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -22,10 +22,16 @@ namespace org::openapitools::server::model
 Jfjoch_statistics::Jfjoch_statistics()
 {
     m_DetectorIsSet = false;
+    m_Detector_listIsSet = false;
+    m_Detector_settingsIsSet = false;
+    m_Image_format_settingsIsSet = false;
+    m_Instrument_metadataIsSet = false;
+    m_Data_processing_settingsIsSet = false;
     m_MeasurementIsSet = false;
     m_BrokerIsSet = false;
     m_FpgaIsSet = false;
     m_CalibrationIsSet = false;
+    m_Zeromq_previewIsSet = false;
     
 }
 
@@ -48,7 +54,7 @@ bool Jfjoch_statistics::validate(std::stringstream& msg, const std::string& path
     bool success = true;
     const std::string _pathPrefix = pathPrefix.empty() ? "Jfjoch_statistics" : pathPrefix;
 
-                     
+                                         
     if (fpgaIsSet())
     {
         const std::vector<org::openapitools::server::model::Fpga_status_inner>& value = m_Fpga;
@@ -90,7 +96,7 @@ bool Jfjoch_statistics::validate(std::stringstream& msg, const std::string& path
         }
 
     }
-    
+        
     return success;
 }
 
@@ -103,6 +109,21 @@ bool Jfjoch_statistics::operator==(const Jfjoch_statistics& rhs) const
     ((!detectorIsSet() && !rhs.detectorIsSet()) || (detectorIsSet() && rhs.detectorIsSet() && getDetector() == rhs.getDetector())) &&
     
     
+    ((!detectorListIsSet() && !rhs.detectorListIsSet()) || (detectorListIsSet() && rhs.detectorListIsSet() && getDetectorList() == rhs.getDetectorList())) &&
+    
+    
+    ((!detectorSettingsIsSet() && !rhs.detectorSettingsIsSet()) || (detectorSettingsIsSet() && rhs.detectorSettingsIsSet() && getDetectorSettings() == rhs.getDetectorSettings())) &&
+    
+    
+    ((!imageFormatSettingsIsSet() && !rhs.imageFormatSettingsIsSet()) || (imageFormatSettingsIsSet() && rhs.imageFormatSettingsIsSet() && getImageFormatSettings() == rhs.getImageFormatSettings())) &&
+    
+    
+    ((!instrumentMetadataIsSet() && !rhs.instrumentMetadataIsSet()) || (instrumentMetadataIsSet() && rhs.instrumentMetadataIsSet() && getInstrumentMetadata() == rhs.getInstrumentMetadata())) &&
+    
+    
+    ((!dataProcessingSettingsIsSet() && !rhs.dataProcessingSettingsIsSet()) || (dataProcessingSettingsIsSet() && rhs.dataProcessingSettingsIsSet() && getDataProcessingSettings() == rhs.getDataProcessingSettings())) &&
+    
+    
     ((!measurementIsSet() && !rhs.measurementIsSet()) || (measurementIsSet() && rhs.measurementIsSet() && getMeasurement() == rhs.getMeasurement())) &&
     
     
@@ -112,7 +133,10 @@ bool Jfjoch_statistics::operator==(const Jfjoch_statistics& rhs) const
     ((!fpgaIsSet() && !rhs.fpgaIsSet()) || (fpgaIsSet() && rhs.fpgaIsSet() && getFpga() == rhs.getFpga())) &&
     
     
-    ((!calibrationIsSet() && !rhs.calibrationIsSet()) || (calibrationIsSet() && rhs.calibrationIsSet() && getCalibration() == rhs.getCalibration()))
+    ((!calibrationIsSet() && !rhs.calibrationIsSet()) || (calibrationIsSet() && rhs.calibrationIsSet() && getCalibration() == rhs.getCalibration())) &&
+    
+    
+    ((!zeromqPreviewIsSet() && !rhs.zeromqPreviewIsSet()) || (zeromqPreviewIsSet() && rhs.zeromqPreviewIsSet() && getZeromqPreview() == rhs.getZeromqPreview()))
     
     ;
 }
@@ -127,6 +151,16 @@ void to_json(nlohmann::json& j, const Jfjoch_statistics& o)
     j = nlohmann::json::object();
     if(o.detectorIsSet())
         j["detector"] = o.m_Detector;
+    if(o.detectorListIsSet())
+        j["detector_list"] = o.m_Detector_list;
+    if(o.detectorSettingsIsSet())
+        j["detector_settings"] = o.m_Detector_settings;
+    if(o.imageFormatSettingsIsSet())
+        j["image_format_settings"] = o.m_Image_format_settings;
+    if(o.instrumentMetadataIsSet())
+        j["instrument_metadata"] = o.m_Instrument_metadata;
+    if(o.dataProcessingSettingsIsSet())
+        j["data_processing_settings"] = o.m_Data_processing_settings;
     if(o.measurementIsSet())
         j["measurement"] = o.m_Measurement;
     if(o.brokerIsSet())
@@ -135,6 +169,8 @@ void to_json(nlohmann::json& j, const Jfjoch_statistics& o)
         j["fpga"] = o.m_Fpga;
     if(o.calibrationIsSet() || !o.m_Calibration.empty())
         j["calibration"] = o.m_Calibration;
+    if(o.zeromqPreviewIsSet())
+        j["zeromq_preview"] = o.m_Zeromq_preview;
     
 }
 
@@ -145,6 +181,31 @@ void from_json(const nlohmann::json& j, Jfjoch_statistics& o)
         j.at("detector").get_to(o.m_Detector);
         o.m_DetectorIsSet = true;
     } 
+    if(j.find("detector_list") != j.end())
+    {
+        j.at("detector_list").get_to(o.m_Detector_list);
+        o.m_Detector_listIsSet = true;
+    } 
+    if(j.find("detector_settings") != j.end())
+    {
+        j.at("detector_settings").get_to(o.m_Detector_settings);
+        o.m_Detector_settingsIsSet = true;
+    } 
+    if(j.find("image_format_settings") != j.end())
+    {
+        j.at("image_format_settings").get_to(o.m_Image_format_settings);
+        o.m_Image_format_settingsIsSet = true;
+    } 
+    if(j.find("instrument_metadata") != j.end())
+    {
+        j.at("instrument_metadata").get_to(o.m_Instrument_metadata);
+        o.m_Instrument_metadataIsSet = true;
+    } 
+    if(j.find("data_processing_settings") != j.end())
+    {
+        j.at("data_processing_settings").get_to(o.m_Data_processing_settings);
+        o.m_Data_processing_settingsIsSet = true;
+    } 
     if(j.find("measurement") != j.end())
     {
         j.at("measurement").get_to(o.m_Measurement);
@@ -165,6 +226,11 @@ void from_json(const nlohmann::json& j, Jfjoch_statistics& o)
         j.at("calibration").get_to(o.m_Calibration);
         o.m_CalibrationIsSet = true;
     } 
+    if(j.find("zeromq_preview") != j.end())
+    {
+        j.at("zeromq_preview").get_to(o.m_Zeromq_preview);
+        o.m_Zeromq_previewIsSet = true;
+    } 
     
 }
 
@@ -185,6 +251,91 @@ void Jfjoch_statistics::unsetDetector()
 {
     m_DetectorIsSet = false;
 }
+org::openapitools::server::model::Detector_list Jfjoch_statistics::getDetectorList() const
+{
+    return m_Detector_list;
+}
+void Jfjoch_statistics::setDetectorList(org::openapitools::server::model::Detector_list const& value)
+{
+    m_Detector_list = value;
+    m_Detector_listIsSet = true;
+}
+bool Jfjoch_statistics::detectorListIsSet() const
+{
+    return m_Detector_listIsSet;
+}
+void Jfjoch_statistics::unsetDetector_list()
+{
+    m_Detector_listIsSet = false;
+}
+org::openapitools::server::model::Detector_settings Jfjoch_statistics::getDetectorSettings() const
+{
+    return m_Detector_settings;
+}
+void Jfjoch_statistics::setDetectorSettings(org::openapitools::server::model::Detector_settings const& value)
+{
+    m_Detector_settings = value;
+    m_Detector_settingsIsSet = true;
+}
+bool Jfjoch_statistics::detectorSettingsIsSet() const
+{
+    return m_Detector_settingsIsSet;
+}
+void Jfjoch_statistics::unsetDetector_settings()
+{
+    m_Detector_settingsIsSet = false;
+}
+org::openapitools::server::model::Image_format_settings Jfjoch_statistics::getImageFormatSettings() const
+{
+    return m_Image_format_settings;
+}
+void Jfjoch_statistics::setImageFormatSettings(org::openapitools::server::model::Image_format_settings const& value)
+{
+    m_Image_format_settings = value;
+    m_Image_format_settingsIsSet = true;
+}
+bool Jfjoch_statistics::imageFormatSettingsIsSet() const
+{
+    return m_Image_format_settingsIsSet;
+}
+void Jfjoch_statistics::unsetImage_format_settings()
+{
+    m_Image_format_settingsIsSet = false;
+}
+org::openapitools::server::model::Instrument_metadata Jfjoch_statistics::getInstrumentMetadata() const
+{
+    return m_Instrument_metadata;
+}
+void Jfjoch_statistics::setInstrumentMetadata(org::openapitools::server::model::Instrument_metadata const& value)
+{
+    m_Instrument_metadata = value;
+    m_Instrument_metadataIsSet = true;
+}
+bool Jfjoch_statistics::instrumentMetadataIsSet() const
+{
+    return m_Instrument_metadataIsSet;
+}
+void Jfjoch_statistics::unsetInstrument_metadata()
+{
+    m_Instrument_metadataIsSet = false;
+}
+org::openapitools::server::model::Spot_finding_settings Jfjoch_statistics::getDataProcessingSettings() const
+{
+    return m_Data_processing_settings;
+}
+void Jfjoch_statistics::setDataProcessingSettings(org::openapitools::server::model::Spot_finding_settings const& value)
+{
+    m_Data_processing_settings = value;
+    m_Data_processing_settingsIsSet = true;
+}
+bool Jfjoch_statistics::dataProcessingSettingsIsSet() const
+{
+    return m_Data_processing_settingsIsSet;
+}
+void Jfjoch_statistics::unsetData_processing_settings()
+{
+    m_Data_processing_settingsIsSet = false;
+}
 org::openapitools::server::model::Measurement_statistics Jfjoch_statistics::getMeasurement() const
 {
     return m_Measurement;
@@ -253,6 +404,23 @@ void Jfjoch_statistics::unsetCalibration()
 {
     m_CalibrationIsSet = false;
 }
+org::openapitools::server::model::Zeromq_preview_settings Jfjoch_statistics::getZeromqPreview() const
+{
+    return m_Zeromq_preview;
+}
+void Jfjoch_statistics::setZeromqPreview(org::openapitools::server::model::Zeromq_preview_settings const& value)
+{
+    m_Zeromq_preview = value;
+    m_Zeromq_previewIsSet = true;
+}
+bool Jfjoch_statistics::zeromqPreviewIsSet() const
+{
+    return m_Zeromq_previewIsSet;
+}
+void Jfjoch_statistics::unsetZeromq_preview()
+{
+    m_Zeromq_previewIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

broker/gen/model/Jfjoch_statistics.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -23,7 +23,13 @@
 #include "Detector_status.h"
 #include "Broker_status.h"
 #include "Measurement_statistics.h"
+#include "Spot_finding_settings.h"
+#include "Zeromq_preview_settings.h"
+#include "Detector_list.h"
 #include "Fpga_status_inner.h"
+#include "Image_format_settings.h"
+#include "Detector_settings.h"
+#include "Instrument_metadata.h"
 #include <vector>
 #include <nlohmann/json.hpp>
 
@@ -73,6 +79,41 @@ public:
     /// <summary>
     /// 
     /// </summary>
+    org::openapitools::server::model::Detector_list getDetectorList() const;
+    void setDetectorList(org::openapitools::server::model::Detector_list const& value);
+    bool detectorListIsSet() const;
+    void unsetDetector_list();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Detector_settings getDetectorSettings() const;
+    void setDetectorSettings(org::openapitools::server::model::Detector_settings const& value);
+    bool detectorSettingsIsSet() const;
+    void unsetDetector_settings();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Image_format_settings getImageFormatSettings() const;
+    void setImageFormatSettings(org::openapitools::server::model::Image_format_settings const& value);
+    bool imageFormatSettingsIsSet() const;
+    void unsetImage_format_settings();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Instrument_metadata getInstrumentMetadata() const;
+    void setInstrumentMetadata(org::openapitools::server::model::Instrument_metadata const& value);
+    bool instrumentMetadataIsSet() const;
+    void unsetInstrument_metadata();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Spot_finding_settings getDataProcessingSettings() const;
+    void setDataProcessingSettings(org::openapitools::server::model::Spot_finding_settings const& value);
+    bool dataProcessingSettingsIsSet() const;
+    void unsetData_processing_settings();
+    /// <summary>
+    /// 
+    /// </summary>
     org::openapitools::server::model::Measurement_statistics getMeasurement() const;
     void setMeasurement(org::openapitools::server::model::Measurement_statistics const& value);
     bool measurementIsSet() const;
@@ -98,12 +139,29 @@ public:
     void setCalibration(std::vector<org::openapitools::server::model::Calibration_statistics_inner> const& value);
     bool calibrationIsSet() const;
     void unsetCalibration();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Zeromq_preview_settings getZeromqPreview() const;
+    void setZeromqPreview(org::openapitools::server::model::Zeromq_preview_settings const& value);
+    bool zeromqPreviewIsSet() const;
+    void unsetZeromq_preview();
 
     friend  void to_json(nlohmann::json& j, const Jfjoch_statistics& o);
     friend  void from_json(const nlohmann::json& j, Jfjoch_statistics& o);
 protected:
     org::openapitools::server::model::Detector_status m_Detector;
     bool m_DetectorIsSet;
+    org::openapitools::server::model::Detector_list m_Detector_list;
+    bool m_Detector_listIsSet;
+    org::openapitools::server::model::Detector_settings m_Detector_settings;
+    bool m_Detector_settingsIsSet;
+    org::openapitools::server::model::Image_format_settings m_Image_format_settings;
+    bool m_Image_format_settingsIsSet;
+    org::openapitools::server::model::Instrument_metadata m_Instrument_metadata;
+    bool m_Instrument_metadataIsSet;
+    org::openapitools::server::model::Spot_finding_settings m_Data_processing_settings;
+    bool m_Data_processing_settingsIsSet;
     org::openapitools::server::model::Measurement_statistics m_Measurement;
     bool m_MeasurementIsSet;
     org::openapitools::server::model::Broker_status m_Broker;
@@ -112,6 +170,8 @@ protected:
     bool m_FpgaIsSet;
     std::vector<org::openapitools::server::model::Calibration_statistics_inner> m_Calibration;
     bool m_CalibrationIsSet;
+    org::openapitools::server::model::Zeromq_preview_settings m_Zeromq_preview;
+    bool m_Zeromq_previewIsSet;
     
 };
 

broker/gen/model/Measurement_statistics.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Measurement_statistics.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * 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

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plots.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plots.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Preview_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Preview_settings.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box_list.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box_list.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle_list.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle_list.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Rotation_axis.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Rotation_axis.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Spot_finding_settings.cpp

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Spot_finding_settings.h

@@ -2,7 +2,7 @@
 * 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. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.17
+* The version of the OpenAPI document: 1.0.0-rc.23
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).