Merge branch 'jfjoch_lite' into 'main'

v1.0.0-rc.36 See merge request jungfraujoch/nextgendcu!120
v1.0.0-rc.36
2025-05-05 19:32:23 +02:00 · 2025-05-05 19:32:22 +02:00 · 2025-04-23 17:22:11 +02:00 · 2025-04-23 17:22:11 +02:00 · 2025-04-23 16:01:22 +02:00 · 2025-04-23 15:13:13 +02:00
333 changed files with 22755 additions and 15250 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,13 @@ 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)")
 SET(JFJOCH_USE_CUDA              ON CACHE BOOL "Compile Jungfraujoch with CUDA")
 SET(JFJOCH_VIEWER_BUILD          OFF CACHE BOOL "Compile Jungfraujoch viewer")
+SET(JFJOCH_USE_TORCH             OFF CACHE BOOL "Compile ML support")
+
+#This is to supress error in TORCH
+IF ((NOT EXISTS /usr/bin/python) AND (EXISTS /usr/bin/python3))
+    SET(PYTHON_EXECUTABLE /usr/bin/python3)
+ENDIF()
+

 SET(BUILD_SHARED_LIBS OFF)
 SET(BUILD_TESTING OFF)
@@ -65,6 +72,14 @@ IF (CMAKE_CUDA_COMPILER)
    ENDIF()
 ENDIF()

+IF(JFJOCH_USE_TORCH)
+    FIND_PACKAGE(Protobuf REQUIRED)
+    FIND_PACKAGE(Torch HINTS /home/jungfrau/torch/lib/python3.11/site-packages/torch REQUIRED)
+    IF (${TORCH_FOUND})
+        ADD_COMPILE_DEFINITIONS(JFJOCH_USE_TORCH)
+    ENDIF()
+ENDIF()
+
 INCLUDE_DIRECTORIES(include)
 INCLUDE(CheckIncludeFile)

@@ -125,6 +140,8 @@ ADD_SUBDIRECTORY(writer)
 ADD_SUBDIRECTORY(frame_serialize)
 ADD_SUBDIRECTORY(reader)
 ADD_SUBDIRECTORY(detector_control)
+ADD_SUBDIRECTORY(image_puller)
+ADD_SUBDIRECTORY(preview)

 IF (JFJOCH_WRITER_ONLY)
    MESSAGE(STATUS "Compiling HDF5 writer only")
@@ -137,7 +154,6 @@ ELSE()
    ADD_SUBDIRECTORY(image_analysis)
    ADD_SUBDIRECTORY(tests)
    ADD_SUBDIRECTORY(tools)
-    ADD_SUBDIRECTORY(preview)
 ENDIF()

 IF (JFJOCH_VIEWER_BUILD)
--- a/2
+++ b/2
@@ -1 +1 @@
-1.0.0-rc.35
+1.0.0-rc.36
--- a/acquisition_device/AcquisitionCounters.cpp
+++ b/acquisition_device/AcquisitionCounters.cpp
@@ -38,9 +38,9 @@ void AcquisitionCounters::Reset(const DiffractionExperiment &experiment, uint16_
    total_packets = 0;
    expected_packets_per_module = 512 * experiment.GetFPGASummation();

-    if (experiment.GetByteDepthReadout() == 4)
+    if (experiment.GetBitDepthReadout() == 32)
        bytes_per_packet = 4096LU;
-    else if (experiment.GetByteDepthReadout() == 1)
+    else if (experiment.GetBitDepthReadout() == 8)
        bytes_per_packet = 1024LU; // Need to seriously refactor, to have expected_packets_per_module specific for detector
    else
        bytes_per_packet = 2048LU;
--- a/acquisition_device/AcquisitionDevice.cpp
+++ b/acquisition_device/AcquisitionDevice.cpp
@@ -103,6 +103,9 @@ void AcquisitionDevice::WaitForActionComplete() {
                logger->Error("Completion with wrong module number data stream {} completion frame number {} module {} handle {}",
                              data_stream, c.frame_number, c.module_number, c.handle);
            SendWorkRequest(c.handle);
+        } else if (c.frame_number < counters.GetSlowestFrameNumber()) {
+            // Module is falling behind, needs to return the handle then
+            SendWorkRequest(c.handle);
        } else {
            try {
                counters.UpdateCounters(&c);
@@ -172,8 +175,7 @@ void AcquisitionDevice::InitializeROIMap(const uint16_t *map, size_t module_numb
 void AcquisitionDevice::InitializePixelMask(const uint32_t *module_mask, size_t module_number) {}

 void AcquisitionDevice::InitializeROIMap(const DiffractionExperiment& experiment, const std::vector<uint16_t>& roi_map) {
-    if (roi_map.size() != experiment.GetDetectorSetup().GetGeometry().GetWidth() *
-                                  experiment.GetDetectorSetup().GetGeometry().GetHeight())
+    if (roi_map.size() != experiment.GetXPixelsNumConv() * experiment.GetYPixelsNumConv())
        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Mismatch in array size");

    std::vector<uint16_t> tmp(RAW_MODULE_SIZE);
@@ -195,23 +197,42 @@ void AcquisitionDevice::InitializeEmptyPixelMask(const DiffractionExperiment &ex


 void AcquisitionDevice::InitializeDataProcessing(const DiffractionExperiment &experiment,
-                                                 const RawGeomAzimuthalIntegration &azint) {
+                                                 const AzimuthalIntegration &azint) {
    auto offset = experiment.GetFirstModuleOfDataStream(data_stream);
    size_t modules = experiment.GetModulesNum(data_stream);
-    for (int m = 0; m < modules; m++) {
-        InitializeSpotFinderResolutionMap(azint.Resolution().data() + (m + offset) * RAW_MODULE_SIZE,
-                                          m);
-        InitializeIntegrationMap(azint.GetPixelToBin().data() + (m + offset) * RAW_MODULE_SIZE,
-                                 azint.Corrections().data() + (m + offset) * RAW_MODULE_SIZE,
-                                 m);
+
+    if (experiment.IsGeometryTransformed()) {
+        std::vector<float> tmp1(RAW_MODULE_SIZE);
+        std::vector<uint16_t> tmp2(RAW_MODULE_SIZE);
+
+        for (int m = 0; m < modules; m++) {
+            ConvertedToRawGeometry(experiment, offset + m, tmp1.data(), azint.Corrections().data());
+            ConvertedToRawGeometry(experiment, offset + m, tmp2.data(), azint.GetPixelToBin().data());
+            InitializeIntegrationMap(tmp2.data(), tmp1.data(), m);
+
+            ConvertedToRawGeometry(experiment, offset + m, tmp1.data(), azint.Resolution().data());
+            InitializeSpotFinderResolutionMap(tmp1.data(), m);
+        }
+    } else {
+        for (int m = 0; m < modules; m++) {
+            InitializeIntegrationMap(azint.GetPixelToBin().data() + (offset + m) * RAW_MODULE_SIZE,
+                                     azint.Corrections().data() + (offset + m) * RAW_MODULE_SIZE,
+                                     m);
+            InitializeSpotFinderResolutionMap(azint.Resolution().data() + (m + offset) * RAW_MODULE_SIZE,
+                                              m);
+        }
    }
 }

 void AcquisitionDevice::InitializePixelMask(const DiffractionExperiment &experiment, const PixelMask &mask) {
    auto offset = experiment.GetFirstModuleOfDataStream(data_stream);
    size_t modules = experiment.GetModulesNum(data_stream);
-    for (int m = 0; m < modules; m++)
-        InitializePixelMask(mask.GetMaskRaw().data() + RAW_MODULE_SIZE * (offset + m), m);
+
+    std::vector<uint32_t> tmp(RAW_MODULE_SIZE);
+    for (int m = 0; m < modules; m++) {
+        ConvertedToRawGeometry(experiment, offset + m, tmp.data(), mask.GetMask().data());
+        InitializePixelMask(tmp.data(), m);
+    }
 }

 void AcquisitionDevice::MapBuffersStandard(size_t c2h_buffer_count, int16_t numa_node) {
@@ -314,8 +335,10 @@ void AcquisitionDevice::RunInternalGenerator(const DiffractionExperiment &experi
            break;
        case DetectorType::EIGER:
            config.detector_type = SLS_DETECTOR_TYPE_EIGER;
-            config.eiger_bit_depth = experiment.GetByteDepthReadout() * 8;
+            config.eiger_bit_depth = experiment.GetBitDepthReadout();
            break;
+        default:
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Detector not supported");
    }
    HW_RunInternalGenerator(config);
 }
--- a/acquisition_device/AcquisitionDevice.h
+++ b/acquisition_device/AcquisitionDevice.h
@@ -21,7 +21,7 @@
 #include "Completion.h"
 #include "../fpga/pcie_driver/jfjoch_fpga.h"
 #include "../common/NetworkAddressConvert.h"
-#include "../common/RawGeomAzimuthalIntegration.h"
+#include "../common/AzimuthalIntegration.h"

 struct AcquisitionDeviceStatistics {
    uint64_t good_packets;
@@ -98,10 +98,10 @@ public:
    virtual void InitializeSpotFinderResolutionMap(const float *data, size_t module_number);
    virtual void InitializeROIMap(const uint16_t *map, size_t module_number);
    void InitializeEmptyPixelMask(const DiffractionExperiment &experiment); // Empty Mask
-    void InitializePixelMask(const DiffractionExperiment &experiment, const PixelMask &mask);
+    void InitializePixelMask(const DiffractionExperiment &experiment, const PixelMask &mask_raw);
    virtual void InitializePixelMask(const uint32_t *module_mask, size_t module_number);
    void InitializeROIMap(const DiffractionExperiment& experiment, const std::vector<uint16_t>& raw_roi_map);
-    void InitializeDataProcessing(const DiffractionExperiment &experiment, const RawGeomAzimuthalIntegration& azint);
+    void InitializeDataProcessing(const DiffractionExperiment &experiment, const AzimuthalIntegration& azint);

    const AcquisitionCounters& Counters() const;

--- a/broker/JFJochBrokerHttp.cpp
+++ b/broker/JFJochBrokerHttp.cpp
@@ -227,39 +227,6 @@ void JFJochBrokerHttp::detector_status_get(Pistache::Http::ResponseWriter &respo
        response.send(Pistache::Http::Code::Not_Found);
 }

-void JFJochBrokerHttp::preview_calibration_tiff_get(Pistache::Http::ResponseWriter &response) {
-    std::string s = state_machine.GetPreviewTIFF(true);
-    if (!s.empty())
-        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/tiff"));
-    else
-        response.send(Pistache::Http::Code::Not_Found);
-}
-
-void
-JFJochBrokerHttp::preview_image_jpeg_post(const org::openapitools::server::model::Preview_settings &previewSettings,
-                                          Pistache::Http::ResponseWriter &response) {
-    std::string s = state_machine.GetPreviewJPEG(Convert(previewSettings));
-    if (!s.empty())
-        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/jpeg"));
-    else
-        response.send(Pistache::Http::Code::Not_Found);
-}
-
-void JFJochBrokerHttp::preview_image_jpeg_get(Pistache::Http::ResponseWriter &response) {
-    std::string s = state_machine.GetPreviewJPEG(PreviewJPEGSettings());
-    if (!s.empty())
-        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/jpeg"));
-    else
-        response.send(Pistache::Http::Code::Not_Found);
-}
-
-void JFJochBrokerHttp::preview_image_tiff_get(Pistache::Http::ResponseWriter &response) {
-    std::string s = state_machine.GetPreviewTIFF(false);
-    if (!s.empty())
-        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/tiff"));
-    else
-        response.send(Pistache::Http::Code::Not_Found);
-}

 void JFJochBrokerHttp::config_internal_generator_image_put(const Pistache::Rest::Request &request,
                                                           Pistache::Http::ResponseWriter &response) {
@@ -352,6 +319,12 @@ void JFJochBrokerHttp::plot_bkg_estimate_get(const std::optional<int32_t> &binni
    GenericPlot(PlotType::BkgEstimate, binning, compression, response);
 }

+void JFJochBrokerHttp::plot_resolution_estimate_get(const std::optional<int32_t> &binning,
+                                                    const std::optional<bool> &compression,
+                                                    Pistache::Http::ResponseWriter &response) {
+    GenericPlot(PlotType::ResolutionEstimate, binning, compression, response);
+}
+
 void JFJochBrokerHttp::plot_error_pixel_get(const std::optional<int32_t> &binning,
                                            const std::optional<bool>& compression,
                                            Pistache::Http::ResponseWriter &response) {
@@ -553,6 +526,7 @@ void JFJochBrokerHttp::statistics_get(const std::optional<bool> &compression, Pi
    statistics.setRoi(Convert(state_machine.GetROIDefintion()));
    statistics.setFileWriterSettings(Convert(state_machine.GetFileWriterSettings()));
    statistics.setAzInt(Convert(state_machine.GetRadialIntegrationSettings()));
+    statistics.setBuffer(Convert(state_machine.GetImageBufferStatus()));

    auto zeromq_prev = state_machine.GetPreviewSocketSettings();
    if (!zeromq_prev.address.empty())
@@ -609,6 +583,53 @@ void JFJochBrokerHttp::image_buffer_image_cbor_get(const std::optional<int64_t>
        response.send(Pistache::Http::Code::Not_Found);
 }

+void JFJochBrokerHttp::image_buffer_image_jpeg_get(const std::optional<int64_t> &id,
+                                                   const std::optional<bool> &showUserMask,
+                                                   const std::optional<bool> &showRoi,
+                                                   const std::optional<bool> &showSpots,
+                                                   const std::optional<int64_t> &saturation,
+                                                   const std::optional<int64_t> &jpegQuality,
+                                                   const std::optional<float> &showResRing,
+                                                   const std::optional<std::string> &color,
+                                                   Pistache::Http::ResponseWriter &response)  {
+    int64_t image_id = id.value_or(ImageBuffer::MaxImage);
+    PreviewJPEGSettings settings{};
+
+    settings.show_user_mask = showUserMask.value_or(true);
+    settings.show_roi = showRoi.value_or(false);
+    settings.show_spots = showSpots.value_or(true);
+    settings.saturation_value = saturation.value_or(10);
+    settings.jpeg_quality = jpegQuality.value_or(100);
+    settings.resolution_ring = showResRing;
+    settings.scale = ColorScaleEnum::Indigo;
+
+    if (color == "viridis")
+        settings.scale = ColorScaleEnum::Viridis;
+    else if (color == "bw")
+        settings.scale = ColorScaleEnum::BW;
+    else if (color == "heat")
+        settings.scale = ColorScaleEnum::Heat;
+
+    std::string s = state_machine.GetPreviewJPEG(settings, image_id);
+    if (!s.empty())
+        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/jpeg"));
+    else
+        response.send(Pistache::Http::Code::Not_Found);
+}
+
+void
+JFJochBrokerHttp::image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) {
+    int64_t image_id = ImageBuffer::MaxImage;
+    if (id.has_value())
+        image_id = id.value();
+
+    std::string s = state_machine.GetPreviewTIFF(image_id);
+    if (!s.empty())
+        response.send(Pistache::Http::Code::Ok, s, Pistache::Http::Mime::MediaType::fromString("image/tiff"));
+    else
+        response.send(Pistache::Http::Code::Not_Found);
+}
+
 void JFJochBrokerHttp::image_buffer_start_cbor_get(Pistache::Http::ResponseWriter &response) {
    std::vector<uint8_t> tmp_vector;
    state_machine.GetStartMessageFromBuffer(tmp_vector);
--- a/broker/JFJochBrokerHttp.h
+++ b/broker/JFJochBrokerHttp.h
@@ -58,6 +58,8 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {

    void plot_bkg_estimate_get(const std::optional<int32_t> &binning, const std::optional<bool>& compression,
                               Pistache::Http::ResponseWriter &response) override;
+    void plot_resolution_estimate_get(const std::optional<int32_t> &binning, const std::optional<bool> &compression,
+                                      Pistache::Http::ResponseWriter &response) override;
    void plot_error_pixel_get(const std::optional<int32_t> &binning, const std::optional<bool>& compression,
                              Pistache::Http::ResponseWriter &response) override;
    void plot_image_collection_efficiency_get(const std::optional<int32_t> &binning, const std::optional<bool>& compression,
@@ -101,17 +103,10 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {
    void trigger_post(Pistache::Http::ResponseWriter &response) override;
    void pedestal_post(Pistache::Http::ResponseWriter &response) override;

-
-    void preview_calibration_tiff_get(Pistache::Http::ResponseWriter &response) override;
    void preview_pedestal_tiff_get(const std::optional<int32_t> &gainLevel,
                                   const std::optional<int32_t> &sc,
                                   Pistache::Http::ResponseWriter &response) override;

-    void preview_image_jpeg_get(Pistache::Http::ResponseWriter &response) override;
-    void preview_image_jpeg_post(const org::openapitools::server::model::Preview_settings &previewSettings,
-                                 Pistache::Http::ResponseWriter &response) override;
-    void preview_image_tiff_get(Pistache::Http::ResponseWriter &response) override;
-
    void config_roi_get(Pistache::Http::ResponseWriter &response) override;
    void config_roi_put(const org::openapitools::server::model::Roi_definitions &roiDefinitions,
        Pistache::Http::ResponseWriter &response) override;
@@ -192,9 +187,20 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi {

    void image_buffer_clear_post(Pistache::Http::ResponseWriter &response) override;

-    void image_buffer_image_cbor_get(const std::optional<int64_t> &imageNumber,
+    void image_buffer_image_cbor_get(const std::optional<int64_t> &id,
                                     Pistache::Http::ResponseWriter &response) override;

+    void image_buffer_image_jpeg_get(const std::optional<int64_t> &id,
+                                     const std::optional<bool> &showUserMask,
+                                     const std::optional<bool> &showRoi,
+                                     const std::optional<bool> &showSpots,
+                                     const std::optional<int64_t> &saturation,
+                                     const std::optional<int64_t> &jpegQuality,
+                                     const std::optional<float> &showResRing,
+                                     const std::optional<std::string> &color,
+                                     Pistache::Http::ResponseWriter &response) override;
+    void image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) override;
+
    void image_buffer_start_cbor_get(Pistache::Http::ResponseWriter &response) override;

    void image_buffer_status_get(Pistache::Http::ResponseWriter &response) override;
--- a/broker/JFJochBrokerParser.cpp
+++ b/broker/JFJochBrokerParser.cpp
@@ -10,9 +10,9 @@
 #include "Detector_type.h"
 #include "../image_pusher/NonePusher.h"

-DetectorGeometry ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j) {
+DetectorGeometryModular ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j) {
    auto s = j.getStandardGeometry();
-    return {s.getNmodules(), s.getModulesInRow(), s.getGapX(), s.getGapY(), false};
+    return DetectorGeometryModular(s.getNmodules(), s.getModulesInRow(), s.getGapX(), s.getGapY(), false);
 }

 DetectorModuleGeometry::Direction Convert(const org::openapitools::server::model::Detector_module_direction& d) {
@@ -36,23 +36,25 @@ DetectorType Convert(const org::openapitools::server::model::Detector_type &d) {
            return DetectorType::EIGER;
        case org::openapitools::server::model::Detector_type::eDetector_type::JUNGFRAU:
            return DetectorType::JUNGFRAU;
+        case org::openapitools::server::model::Detector_type::eDetector_type::DECTRIS:
+            return DetectorType::DECTRIS;
        default:
            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "invalid detector type");
    }
 }

-DetectorGeometry ParseCustomDetectorGeometry(const org::openapitools::server::model::Detector &j) {
+DetectorGeometryModular ParseCustomDetectorGeometry(const org::openapitools::server::model::Detector &j) {
    std::vector<DetectorModuleGeometry> modules;
    for (const auto &iter: j.getCustomGeometry()) {
        auto fast = Convert(iter.getFastAxis());
        auto slow = Convert(iter.getSlowAxis());
        modules.emplace_back(iter.getX0(), iter.getY0(), fast, slow);
    }
-    return {modules, false};
+    return DetectorGeometryModular(modules, false);
 }


-DetectorGeometry ParseDetectorGeometry(const org::openapitools::server::model::Detector &d) {
+DetectorGeometryModular ParseDetectorGeometry(const org::openapitools::server::model::Detector &d) {
    if (d.standardGeometryIsSet() && d.customGeometryIsSet())
        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Need to set EITHER standard or custom geometry");

@@ -65,24 +67,54 @@ DetectorGeometry ParseDetectorGeometry(const org::openapitools::server::model::D
 }

 DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detector &d) {
-    DetectorGeometry geom = ParseDetectorGeometry(d);
+    DetectorType detector_type = Convert(d.getType());
+
+    if (detector_type == DetectorType::DECTRIS) {
+       std::string hostname;
+        if (d.getHostname().size() > 1)
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "DECTRIS detector requires single hostname (or none)");
+        else if (d.getHostname().size() == 1)
+            hostname = d.getHostname()[0];
+
+        DetectorSetup setup = DetDECTRIS(1,1, d.getDescription(), hostname);
+
+        if (d.roiModeIsSet())
+            setup.DECTRISROI(d.getRoiMode());
+
+        return setup;
+    }
+
+    DetectorGeometryModular geom = ParseDetectorGeometry(d);
    if (d.isMirrorY())
        geom.VerticalFlip();

-    DetectorType detector_type = Convert(d.getType());
    DetectorSetup setup(geom, detector_type, d.getDescription(), d.getHostname());

    auto calib = d.getCalibrationFile();
    if (!calib.empty()) {
-        if (detector_type == DetectorType::JUNGFRAU)
-            setup.LoadGain(calib);
-        else if (detector_type == DetectorType::EIGER)
-            setup.SetTrimFiles(calib);
+        switch (detector_type) {
+            case DetectorType::EIGER:
+                setup.SetTrimFiles(calib);
+                break;
+            case DetectorType::JUNGFRAU:
+                setup.LoadGain(calib);
+                break;
+            default:
+                throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                      "Detector type not supported");
+        }
    }

-    if ((detector_type == DetectorType::EIGER) || (detector_type == DetectorType::JUNGFRAU))
-        setup.PixelSize_um(75.0f);
-
+    switch (detector_type) {
+        case DetectorType::EIGER:
+        case DetectorType::JUNGFRAU:
+            setup.PixelSize_um(75.0f);
+            break;
+        default:
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "Detector type not supported");
+    }
    if (d.highVoltageVIsSet())
        setup.HighVoltage(d.getHighVoltageV());

@@ -101,6 +133,12 @@ DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detecto
    if (d.txDelayIsSet())
        setup.TxDelay(d.getTxDelay());

+    if (d.minimumCountTimeUsIsSet())
+        setup.MinCountTime(std::chrono::microseconds(d.getMinimumCountTimeUs()));
+
+    if (d.minimumFrameTimeUsIsSet())
+        setup.MinFrameTime(std::chrono::microseconds(d.getMinimumFrameTimeUs()));
+
    return setup;
 }

--- a/broker/JFJochBrokerParser.h
+++ b/broker/JFJochBrokerParser.h
@@ -10,9 +10,9 @@
 #include "../receiver/JFJochReceiverService.h"
 #include "gen/model/Jfjoch_settings.h"

-DetectorGeometry ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j);
-DetectorGeometry ParseCustomDetectorGeometry(const org::openapitools::server::model::Detector &j);
-DetectorGeometry ParseDetectorGeometry(const org::openapitools::server::model::Detector &j);
+DetectorGeometryModular ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j);
+DetectorGeometryModular ParseCustomDetectorGeometry(const org::openapitools::server::model::Detector &j);
+DetectorGeometryModular ParseDetectorGeometry(const org::openapitools::server::model::Detector &j);
 DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detector &j);

 void ParseFacilityConfiguration(const org::openapitools::server::model::Jfjoch_settings &j, DiffractionExperiment &experiment);
--- a/broker/JFJochServices.cpp
+++ b/broker/JFJochServices.cpp
@@ -3,6 +3,8 @@

 #include "JFJochServices.h"
 #include "../common/JFJochException.h"
+#include "../detector_control/SLSDetectorWrapper.h"
+#include "../detector_control/DectrisDetectorWrapper.h"

 JFJochServices::JFJochServices(Logger &in_logger) : logger(in_logger) {}

@@ -34,16 +36,21 @@ void JFJochServices::Off() {
        detector->Deactivate();
 }

-void JFJochServices::On(const DiffractionExperiment &x) {
+void JFJochServices::On(DiffractionExperiment &x) {
    if (x.IsUsingInternalPacketGen() || (receiver == nullptr))  {
        detector.reset();
    } else {
        logger.Info("Detector on");
-
-        if (!detector)
-            detector = std::make_unique<DetectorWrapper>();
+        switch (x.GetDetectorType()) {
+            case DetectorType::EIGER:
+            case DetectorType::JUNGFRAU:
+                detector = std::make_unique<SLSDetectorWrapper>();
+                break;
+            case DetectorType::DECTRIS:
+                detector = std::make_unique<DectrisDetectorWrapper>();
+                break;
+        }
        detector->Initialize(x, receiver->GetNetworkConfig());
-
        logger.Info("   ... done");
    }
 }
@@ -58,7 +65,7 @@ JFJochServicesOutput JFJochServices::Stop() {
    if (receiver != nullptr) {
        try {
            if (detector) {
-                logger.Info("Wait for detector done");
+                logger.Info("Wait for detector idle");
                DetectorState state = detector->GetState();
                while ((!cannot_stop_detector)
                       && ((state == DetectorState::WAITING) || (state == DetectorState::BUSY))) {
@@ -67,6 +74,7 @@ JFJochServicesOutput JFJochServices::Stop() {
                    state = detector->GetState();
                }
                if (state == DetectorState::IDLE) {
+                    logger.Info("   ... detector idle");
                    receiver->Cancel(true); // cancel silently
                } else {
                    logger.Error("   ... detector in error state");
@@ -77,15 +85,10 @@ JFJochServicesOutput JFJochServices::Stop() {
            logger.Info("Wait for receiver done");
            ret.receiver_output = receiver->Stop();

-            if (ret.receiver_output.status.compressed_ratio)
            logger.Info("    ... Receiver efficiency: {} %     Max delay: {}     Compression ratio {}x",
-                        static_cast<int>(ret.receiver_output.efficiency * 100.0),
-                        ret.receiver_output.status.max_receive_delay,
-                        static_cast<int>(std::round(ret.receiver_output.status.compressed_ratio.value())));
-            else
-                logger.Info("    ... Receiver efficiency: {} %     Max delay: {}",
-                            static_cast<int>(ret.receiver_output.efficiency * 100.0),
-                            ret.receiver_output.status.max_receive_delay);
+                    static_cast<int>(ret.receiver_output.efficiency * 100.0),
+                    ret.receiver_output.status.max_receive_delay.value_or(0),
+                    static_cast<int>(std::round(ret.receiver_output.status.compressed_ratio.value_or(1))));

            if (ret.receiver_output.efficiency < 1.0) {
                for (int i = 0; i < ret.receiver_output.received_packets.size(); i++) {
@@ -173,16 +176,16 @@ std::optional<DetectorStatus> JFJochServices::GetDetectorStatus() const {
        return {};
 }

-std::string JFJochServices::GetPreviewJPEG(const PreviewJPEGSettings &settings) const {
+std::string JFJochServices::GetPreviewJPEG(const PreviewJPEGSettings &settings, int64_t image_number) const {
    if (receiver != nullptr)
-        return receiver->GetJPEG(settings);
+        return receiver->GetJPEGFromBuffer(settings, image_number);
    else
        return {};
 }

-std::string JFJochServices::GetPreviewTIFF(bool calibration) const {
+std::string JFJochServices::GetPreviewTIFF(int64_t image_number) const {
    if (receiver != nullptr)
-        return receiver->GetTIFF(calibration);
+        return receiver->GetTIFFFromBuffer(image_number);
    else
        return "";
 }
@@ -243,9 +246,10 @@ void JFJochServices::GetStartMessageFromBuffer(std::vector<uint8_t> &v) {
        return receiver->GetStartMessageFromBuffer(v);
 }

-void JFJochServices::GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number) {
+bool JFJochServices::GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number) {
    if (receiver)
        return receiver->GetImageFromBuffer(v, image_number);
+    return false;
 }

 ImageBufferStatus JFJochServices::GetImageBufferStatus() const {
--- a/broker/JFJochServices.h
+++ b/broker/JFJochServices.h
@@ -22,7 +22,7 @@ class JFJochServices {
    Logger &logger;
 public:
    explicit JFJochServices(Logger &in_logger);
-    void On(const DiffractionExperiment& experiment);
+    void On(DiffractionExperiment& experiment);
    void Off();
    void ConfigureDetector(const DiffractionExperiment& experiment);
    void Start(const DiffractionExperiment& experiment,
@@ -44,8 +44,8 @@ public:

    std::optional<DetectorStatus> GetDetectorStatus() const;

-    std::string GetPreviewJPEG(const PreviewJPEGSettings &settings) const;
-    std::string GetPreviewTIFF(bool calibration) const;
+    std::string GetPreviewJPEG(const PreviewJPEGSettings &settings, int64_t image_number) const;
+    std::string GetPreviewTIFF(int64_t image_number) const;

    void GetXFELPulseID(std::vector<uint64_t> &v) const;
    void GetXFELEventCode(std::vector<uint64_t> &v) const;
@@ -59,7 +59,7 @@ public:
    ZMQMetadataSettings GetMetadataSocketSettings();

    void GetStartMessageFromBuffer(std::vector<uint8_t> &v);
-    void GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number = -1);
+    bool GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number = -1);
    ImageBufferStatus GetImageBufferStatus() const;
    void ClearImageBuffer() const;
 };
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -6,6 +6,7 @@
 #include "JFJochStateMachine.h"
 #include "../preview/JFJochTIFF.h"
 #include "pistache/net.h"
+#include "../common/CUDAWrapper.h"

 JFJochStateMachine::JFJochStateMachine(JFJochServices &in_services, Logger &in_logger)
    : logger(in_logger),
@@ -14,6 +15,18 @@ JFJochStateMachine::JFJochStateMachine(JFJochServices &in_services, Logger &in_l
      current_detector_setup(0),
      data_processing_settings(DiffractionExperiment::DefaultDataProcessingSettings()),
      pixel_mask_statistics({0, 0, 0}) {
+
+    indexing_possible =  (get_gpu_count() >= 0);
+#ifdef JFJOCH_USE_TORCH
+    resolution_estimate_possible = true;
+#else
+    resolution_estimate_possible = false;
+#endif
+    if (!indexing_possible)
+        data_processing_settings.indexing = false;
+    if (!resolution_estimate_possible)
+        data_processing_settings.resolution_estimate = false;
+
    SupressTIFFErrors();
 }

@@ -50,17 +63,17 @@ bool JFJochStateMachine::ImportPedestalG1G2(const JFJochReceiverOutput &receiver
 }

 void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock<std::mutex> &ul) {
-    if (experiment.GetDetectorSetup().GetDetectorType() == DetectorType::EIGER) {
+    if (experiment.GetDetectorSetup().GetDetectorType() != DetectorType::JUNGFRAU) {
        try {
            logger.Info("EIGER configuration");
            services.ConfigureDetector(experiment);
            logger.Info("   ... done ");
            SetState(JFJochState::Idle,
-                     "EIGER detector configured",
+                     "Detector configured",
                     BrokerStatus::MessageSeverity::Success);
            return;
        } catch (const std::exception &e) {
-            logger.Error("EIGER configuration error {}", e.what());
+            logger.Error("Configuration error {}", e.what());
            SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
            throw;
        }
@@ -263,8 +276,12 @@ void JFJochStateMachine::PedestalThread(std::unique_lock<std::mutex> ul) {

 void JFJochStateMachine::InitializeThread(std::unique_lock<std::mutex> ul) {
    try {
+        // On might modify experiment (reads DECTRIS configuration), so need to have lock acquired at this point
        services.On(experiment);
+        detector_setup[current_detector_setup] = experiment.GetDetectorSetup();
+        pixel_mask = PixelMask(experiment);
    } catch (const std::exception &e) {
+        logger.Error("Initialize error {}", e.what());
        SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
        throw;
    }
@@ -489,8 +506,16 @@ MultiLinePlot JFJochStateMachine::GetPlots(const PlotRequest &request) const {
 void JFJochStateMachine::SetSpotFindingSettings(const SpotFindingSettings &settings) {
    std::unique_lock ul(data_processing_settings_mutex);
    DiffractionExperiment::CheckDataProcessingSettings(settings);
+
+    // If there is no capability to use the features, make sure these are disabled
+    if (!indexing_possible)
+        data_processing_settings.indexing = false;
+    if (!resolution_estimate_possible)
+        data_processing_settings.resolution_estimate = false;
+
    data_processing_settings = settings;
-    services.SetSpotFindingSettings(settings);
+
+    services.SetSpotFindingSettings(data_processing_settings);
 }

 SpotFindingSettings JFJochStateMachine::GetSpotFindingSettings() const {
@@ -518,20 +543,18 @@ DetectorList JFJochStateMachine::GetDetectorsList() const {
        DetectorListElement tmp;
        tmp.description = i.GetDescription();
        tmp.nmodules = i.GetModulesNum();
-        tmp.width = i.GetGeometry().GetWidth();
-        tmp.height = i.GetGeometry().GetHeight();
+        tmp.width = i.GetGeometry().GetWidth(true);
+        tmp.height = i.GetGeometry().GetHeight(true);
        tmp.serial_number = i.GetSerialNumber();
        tmp.base_ipv4_addr = i.GetBaseIPv4Addr();
        tmp.udp_interface_count = i.GetUDPInterfaceCount();
        tmp.min_frame_time = i.GetMinFrameTime();
        tmp.min_count_time = i.GetMinCountTime();
        tmp.readout_time = i.GetReadOutTime();
+        tmp.detector_type = i.GetDetectorType();
        ret.detector.emplace_back(std::move(tmp));
    }
-    {
-        std::unique_lock ul(current_detector_setup_mutex);
-        ret.current_id = current_detector_setup;
-    }
+    ret.current_id = current_detector_setup;
    return ret;
 }

@@ -554,10 +577,7 @@ void JFJochStateMachine::SelectDetector(int64_t id) {
        gain_calibration = detector_setup[id].GetGainCalibration();
        pixel_mask = PixelMask(experiment);
        SetState(JFJochState::Inactive, detector_setup[id].GetDescription() + " selected; please initialize");
-        {
-            std::unique_lock ul(current_detector_setup_mutex);
-            current_detector_setup = id;
-        }
+        current_detector_setup = id;
    } catch (const JFJochException &e) {
        logger.ErrorException(e);
        SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
@@ -620,12 +640,12 @@ void JFJochStateMachine::ResetError() noexcept {
    }
 }

-std::string JFJochStateMachine::GetPreviewJPEG(const PreviewJPEGSettings &settings) const {
-    return services.GetPreviewJPEG(settings);
+std::string JFJochStateMachine::GetPreviewJPEG(const PreviewJPEGSettings &settings, int64_t image_number) const {
+    return services.GetPreviewJPEG(settings, image_number);
 }

-std::string JFJochStateMachine::GetPreviewTIFF(bool calibration) const {
-    return services.GetPreviewTIFF(calibration);
+std::string JFJochStateMachine::GetPreviewTIFF(int64_t image_number) const {
+    return services.GetPreviewTIFF(image_number);
 }

 std::string JFJochStateMachine::GetPedestalTIFF(size_t gain_level, size_t sc) const {
@@ -713,6 +733,9 @@ std::vector<uint64_t> JFJochStateMachine::GetXFELEventCode() const {

 std::string JFJochStateMachine::GetFullPixelMaskTIFF() const {
    std::unique_lock ul(m);
+    if (state == JFJochState::Inactive)
+        return {};
+
    std::vector v = pixel_mask.GetMask(experiment);
    return WriteTIFFToString(v.data(), experiment.GetXPixelsNum(), experiment.GetYPixelsNum(),
                             sizeof(uint32_t), false);
@@ -720,6 +743,10 @@ std::string JFJochStateMachine::GetFullPixelMaskTIFF() const {

 std::string JFJochStateMachine::GetUserPixelMaskTIFF() const {
    std::unique_lock ul(m);
+
+    if (state == JFJochState::Inactive)
+        return {};
+
    std::vector v = pixel_mask.GetUserMask(experiment);
    return WriteTIFFToString(v.data(), experiment.GetXPixelsNum(), experiment.GetYPixelsNum(),
                             sizeof(uint32_t), false);
@@ -727,11 +754,17 @@ std::string JFJochStateMachine::GetUserPixelMaskTIFF() const {

 std::vector<uint32_t> JFJochStateMachine::GetFullPixelMask() const {
    std::unique_lock ul(m);
+    if (state == JFJochState::Inactive)
+        return {};
+
    return pixel_mask.GetMask(experiment);
 }

 std::vector<uint32_t> JFJochStateMachine::GetUserPixelMask() const {
    std::unique_lock ul(m);
+    if (state == JFJochState::Inactive)
+        return {};
+
    return pixel_mask.GetUserMask(experiment);
 }

@@ -782,7 +815,7 @@ void JFJochStateMachine::LoadImageFormatSettings(const ImageFormatSettings &sett
    if (recalc_mask)
        pixel_mask.LoadDetectorBadPixelMask(experiment, calibration.get());
    else
-        pixel_mask.Update(settings);
+        pixel_mask.CalcEdgePixels(experiment);

    UpdatePixelMaskStatistics(pixel_mask.GetStatistics());
 }
@@ -830,7 +863,7 @@ void JFJochStateMachine::GetStartMessageFromBuffer(std::vector<uint8_t> &v) {
 }

 void JFJochStateMachine::GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number) {
-    return services.GetImageFromBuffer(v, image_number);
+    services.GetImageFromBuffer(v, image_number);
 }

 ImageBufferStatus JFJochStateMachine::GetImageBufferStatus() const {
--- a/broker/JFJochStateMachine.h
+++ b/broker/JFJochStateMachine.h
@@ -36,6 +36,7 @@ struct DetectorListElement {
    std::chrono::microseconds readout_time;
    std::chrono::microseconds min_frame_time;
    std::chrono::microseconds min_count_time;
+    DetectorType detector_type;
 };

 struct DetectorList {
@@ -57,7 +58,7 @@ struct MeasurementStatistics {
    std::optional<float> compression_ratio;

    bool cancelled;
-    int64_t max_receive_delay;
+    std::optional<int64_t> max_receive_delay;

    std::optional<float> indexing_rate;

@@ -97,9 +98,7 @@ class JFJochStateMachine {
    volatile bool cancel_sequence = false;
    std::unique_ptr<JFCalibration> calibration;
    PixelMask pixel_mask;
-
-    mutable std::mutex current_detector_setup_mutex;
-    int64_t current_detector_setup;
+    int64_t current_detector_setup; // Lock only on change

    mutable std::mutex calibration_statistics_mutex;
    std::vector<JFCalibrationModuleStatistics> calibration_statistics;
@@ -116,6 +115,9 @@ class JFJochStateMachine {
    mutable std::mutex roi_mutex;
    ROIDefinition roi;

+    bool indexing_possible;
+    bool resolution_estimate_possible;
+
    void UpdatePixelMaskStatistics(const PixelMaskStatistics &input);

    // Private functions assume that lock m is acquired
@@ -182,8 +184,8 @@ public:
    void SetRadialIntegrationSettings(const AzimuthalIntegrationSettings& settings);
    AzimuthalIntegrationSettings GetRadialIntegrationSettings() const;

-    std::string GetPreviewJPEG(const PreviewJPEGSettings& settings) const;
-    std::string GetPreviewTIFF(bool calibration) const;
+    std::string GetPreviewJPEG(const PreviewJPEGSettings& settings, int64_t image_number) const;
+    std::string GetPreviewTIFF(int64_t image_number) const;
    std::string GetPedestalTIFF(size_t gain_level, size_t sc) const;

    void LoadInternalGeneratorImage(const void *data, size_t size, uint64_t image_number);
--- a/broker/OpenAPIConvert.cpp
+++ b/broker/OpenAPIConvert.cpp
@@ -19,6 +19,7 @@ SpotFindingSettings Convert(const org::openapitools::server::model::Spot_finding
    ret.low_resolution_limit = input.getLowResolutionLimit();
    ret.enable = input.isEnable();
    ret.indexing = input.isIndexing();
+    ret.resolution_estimate = input.isResolutionEstimate();
    ret.indexing_tolerance = input.getIndexingTolerance();
    if (input.filterPowderRingsIsSet())
        ret.filter_spots_powder_ring = input.isFilterPowderRings();
@@ -40,6 +41,7 @@ org::openapitools::server::model::Spot_finding_settings Convert(const SpotFindin
    ret.setIndexingTolerance(input.indexing_tolerance);
    ret.setFilterPowderRings(input.filter_spots_powder_ring);
    ret.setMinSpotCountPowderRing(input.min_spot_count_powder_ring);
+    ret.setResolutionEstimate(input.resolution_estimate);
    return ret;
 }

@@ -61,7 +63,8 @@ org::openapitools::server::model::Measurement_statistics Convert(const Measureme
        ret.setCompressionRatio(input.compression_ratio.value());

    ret.setCancelled(input.cancelled);
-    ret.setMaxReceiverDelay(input.max_receive_delay);
+    if (input.max_receive_delay)
+        ret.setMaxReceiverDelay(input.max_receive_delay.value());

    ret.setDetectorWidth(input.detector_width);
    ret.setDetectorHeight(input.detector_height);
@@ -336,6 +339,22 @@ org::openapitools::server::model::Detector_status Convert(const DetectorStatus &
    return output;
 }

+org::openapitools::server::model::Detector_type Convert(const DetectorType &input) {
+    org::openapitools::server::model::Detector_type dt;
+    switch (input) {
+        case DetectorType::EIGER:
+            dt.setValue(org::openapitools::server::model::Detector_type::eDetector_type::EIGER);
+            break;
+        case DetectorType::JUNGFRAU:
+            dt.setValue(org::openapitools::server::model::Detector_type::eDetector_type::JUNGFRAU);
+            break;
+        case DetectorType::DECTRIS:
+            dt.setValue(org::openapitools::server::model::Detector_type::eDetector_type::DECTRIS);
+            break;
+    }
+    return dt;
+}
+
 org::openapitools::server::model::Detector_list Convert(const DetectorList &input) {
    org::openapitools::server::model::Detector_list ret;
    std::vector<org::openapitools::server::model::Detector_list_element> dets;
@@ -352,6 +371,7 @@ org::openapitools::server::model::Detector_list Convert(const DetectorList &inpu
        d.setMinFrameTimeUs(input.detector[i].min_frame_time.count());
        d.setMinCountTimeUs(input.detector[i].min_count_time.count());
        d.setReadoutTimeUs(input.detector[i].readout_time.count());
+        d.setType(Convert(input.detector[i].detector_type));
        dets.emplace_back(std::move(d));
    }
    ret.setDetectors(dets);
@@ -400,7 +420,9 @@ ROIDefinition Convert(const org::openapitools::server::model::Roi_definitions& i
    for (const auto &i: input.getCircle().getRois())
        output.circles.emplace_back(ROICircle(i.getName(), i.getCenterXPxl(), i.getCenterYPxl(), i.getRadiusPxl()));
    for (const auto &i: input.getAzim().getRois())
-        output.azimuthal.emplace_back(ROIAzimuthal(i.getName(), 2.0f * M_PI / i.getQMaxRecipA(), 2.0f * M_PI / i.getQMinRecipA()));
+        output.azimuthal.emplace_back(ROIAzimuthal(i.getName(),
+                                                   (i.getQMaxRecipA() == 0.0) ? 0.0 : 2.0f * M_PI / i.getQMaxRecipA(),
+                                                   (i.getQMinRecipA() == 0.0) ? 0.0 : 2.0f * M_PI / i.getQMinRecipA()));
    return output;
 }

@@ -426,7 +448,7 @@ org::openapitools::server::model::Roi_azim_list Convert(const std::vector<ROIAzi
        org::openapitools::server::model::Roi_azimuthal elem;
        elem.setName(i.GetName());
        elem.setQMinRecipA(i.GetQMin_recipA());
-        elem.setQMinRecipA(i.GetQMax_recipA());
+        elem.setQMaxRecipA(i.GetQMax_recipA());
        tmp.emplace_back(elem);
    }
    ret.setRois(tmp);
@@ -457,19 +479,6 @@ org::openapitools::server::model::Roi_definitions Convert(const ROIDefinition &i
    return ret;
 }

-PreviewJPEGSettings Convert(const org::openapitools::server::model::Preview_settings& input) {
-    PreviewJPEGSettings ret{};
-    ret.show_spots = input.isShowSpots();
-    ret.jpeg_quality = input.getJpegQuality();
-    ret.saturation_value = input.getSaturation();
-    ret.show_roi = input.isShowRoi();
-    ret.show_indexed = input.isShowIndexed();
-    ret.show_user_mask = input.isShowUserMask();
-    if (input.resolutionRingIsSet())
-        ret.resolution_ring = input.getResolutionRing();
-    return ret;
-}
-
 ImageFormatSettings Convert(const org::openapitools::server::model::Image_format_settings& input) {
    ImageFormatSettings ret{};
    ret.GeometryTransformed(input.isGeometryTransform());
@@ -671,6 +680,8 @@ org::openapitools::server::model::Image_buffer_status Convert(const ImageBufferS
    ret.setAvailableSlots(input.available_slots);
    ret.setTotalSlots(input.total_slots);
    ret.setImageNumbers(input.images_in_the_buffer);
+    ret.setMaxImageNumber(input.max_image_number);
+    ret.setMinImageNumber(input.min_image_number);
    return ret;
 }

@@ -688,33 +699,45 @@ FileWriterSettings Convert(const org::openapitools::server::model::File_writer_s
    return ret;
 }

-org::openapitools::server::model::File_writer_format Convert(FileWriterFileFormat input) {
+org::openapitools::server::model::File_writer_format Convert(FileWriterFormat input) {
    org::openapitools::server::model::File_writer_format ret;
    switch (input) {
-        case FileWriterFileFormat::DataOnly:
+        case FileWriterFormat::DataOnly:
            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::NONE);
            break;
-        case FileWriterFileFormat::NXmxLegacy:
+        case FileWriterFormat::NXmxLegacy:
            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::NXMXLEGACY);
            break;
-        case FileWriterFileFormat::NXmxVDS:
+        case FileWriterFormat::NXmxVDS:
            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::NXMXVDS);
            break;
+        case FileWriterFormat::CBF:
+            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::CBF);
+            break;
+        case FileWriterFormat::TIFF:
+            ret.setValue(org::openapitools::server::model::File_writer_format::eFile_writer_format::TIFF);
+            break;
        default:
            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown file writer format enum value");
    }
    return ret;
 }

-FileWriterFileFormat Convert(const org::openapitools::server::model::File_writer_format& input) {
+FileWriterFormat Convert(const org::openapitools::server::model::File_writer_format& input) {
    switch (input.getValue()) {
        case org::openapitools::server::model::File_writer_format::eFile_writer_format::NONE:
-            return FileWriterFileFormat::DataOnly;
+            return FileWriterFormat::DataOnly;
        case org::openapitools::server::model::File_writer_format::eFile_writer_format::NXMXLEGACY:
-            return FileWriterFileFormat::NXmxLegacy;
+            return FileWriterFormat::NXmxLegacy;
        case org::openapitools::server::model::File_writer_format::eFile_writer_format::NXMXVDS:
-            return FileWriterFileFormat::NXmxVDS;
+            return FileWriterFormat::NXmxVDS;
+        case org::openapitools::server::model::File_writer_format::eFile_writer_format::CBF:
+            return FileWriterFormat::CBF;
+        case org::openapitools::server::model::File_writer_format::eFile_writer_format::TIFF:
+            return FileWriterFormat::TIFF;
        default:
-            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown file writer format enum value");
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "Unknown file writer format enum value");
    }
-}
+}
+
--- a/broker/OpenAPIConvert.h
+++ b/broker/OpenAPIConvert.h
@@ -17,7 +17,6 @@
 #include "gen/model/Azim_int_settings.h"
 #include "gen/model/Roi_definitions.h"
 #include "gen/model/Image_format_settings.h"
-#include "gen/model/Preview_settings.h"
 #include "gen/model/Dataset_settings.h"
 #include "gen/model/Fpga_status_inner.h"
 #include "gen/model/Pixel_mask_statistics.h"
@@ -59,7 +58,6 @@ AzimuthalIntegrationSettings Convert(const org::openapitools::server::model::Azi
 org::openapitools::server::model::Azim_int_settings Convert(const AzimuthalIntegrationSettings& settings);
 ROIDefinition Convert(const org::openapitools::server::model::Roi_definitions& input);
 org::openapitools::server::model::Roi_definitions Convert(const ROIDefinition &input);
-PreviewJPEGSettings Convert(const org::openapitools::server::model::Preview_settings& input);
 ImageFormatSettings Convert(const org::openapitools::server::model::Image_format_settings& input);
 org::openapitools::server::model::Image_format_settings Convert(const ImageFormatSettings& input);
 DatasetSettings Convert(const org::openapitools::server::model::Dataset_settings& input);
@@ -72,6 +70,6 @@ ZMQPreviewSettings Convert(const org::openapitools::server::model::Zeromq_previe
 org::openapitools::server::model::Zeromq_metadata_settings Convert(const ZMQMetadataSettings& settings);
 ZMQMetadataSettings Convert(const org::openapitools::server::model::Zeromq_metadata_settings& input);

-org::openapitools::server::model::File_writer_format Convert(FileWriterFileFormat input);
-FileWriterFileFormat Convert(const org::openapitools::server::model::File_writer_format& input);
+org::openapitools::server::model::File_writer_format Convert(FileWriterFormat input);
+FileWriterFormat Convert(const org::openapitools::server::model::File_writer_format& input);
 #endif //JFJOCH_OPENAPICONVERT_H
--- a/broker/gen/api/ApiBase.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/api/DefaultApi.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -69,6 +69,8 @@ void DefaultApi::setupRoutes() {
    Routes::Get(*router, base + "/fpga_status", Routes::bind(&DefaultApi::fpga_status_get_handler, this));
    Routes::Post(*router, base + "/image_buffer/clear", Routes::bind(&DefaultApi::image_buffer_clear_post_handler, this));
    Routes::Get(*router, base + "/image_buffer/image.cbor", Routes::bind(&DefaultApi::image_buffer_image_cbor_get_handler, this));
+    Routes::Get(*router, base + "/image_buffer/image.jpeg", Routes::bind(&DefaultApi::image_buffer_image_jpeg_get_handler, this));
+    Routes::Get(*router, base + "/image_buffer/image.tiff", Routes::bind(&DefaultApi::image_buffer_image_tiff_get_handler, this));
    Routes::Get(*router, base + "/image_buffer/start.cbor", Routes::bind(&DefaultApi::image_buffer_start_cbor_get_handler, this));
    Routes::Get(*router, base + "/image_buffer/status", Routes::bind(&DefaultApi::image_buffer_status_get_handler, this));
    Routes::Post(*router, base + "/initialize", Routes::bind(&DefaultApi::initialize_post_handler, this));
@@ -84,6 +86,7 @@ void DefaultApi::setupRoutes() {
    Routes::Get(*router, base + "/plot/packets_received", Routes::bind(&DefaultApi::plot_packets_received_get_handler, this));
    Routes::Get(*router, base + "/plot/receiver_delay", Routes::bind(&DefaultApi::plot_receiver_delay_get_handler, this));
    Routes::Get(*router, base + "/plot/receiver_free_send_buffers", Routes::bind(&DefaultApi::plot_receiver_free_send_buffers_get_handler, this));
+    Routes::Get(*router, base + "/plot/resolution_estimate", Routes::bind(&DefaultApi::plot_resolution_estimate_get_handler, this));
    Routes::Get(*router, base + "/plot/roi_max_count", Routes::bind(&DefaultApi::plot_roi_max_count_get_handler, this));
    Routes::Get(*router, base + "/plot/roi_mean", Routes::bind(&DefaultApi::plot_roi_mean_get_handler, this));
    Routes::Get(*router, base + "/plot/roi_sum", Routes::bind(&DefaultApi::plot_roi_sum_get_handler, this));
@@ -92,10 +95,6 @@ void DefaultApi::setupRoutes() {
    Routes::Get(*router, base + "/plot/roi_y", Routes::bind(&DefaultApi::plot_roi_y_get_handler, this));
    Routes::Get(*router, base + "/plot/spot_count", Routes::bind(&DefaultApi::plot_spot_count_get_handler, this));
    Routes::Get(*router, base + "/plot/strong_pixel", Routes::bind(&DefaultApi::plot_strong_pixel_get_handler, this));
-    Routes::Get(*router, base + "/preview/calibration.tiff", Routes::bind(&DefaultApi::preview_calibration_tiff_get_handler, this));
-    Routes::Get(*router, base + "/preview/image.jpeg", Routes::bind(&DefaultApi::preview_image_jpeg_get_handler, this));
-    Routes::Post(*router, base + "/preview/image.jpeg", Routes::bind(&DefaultApi::preview_image_jpeg_post_handler, this));
-    Routes::Get(*router, base + "/preview/image.tiff", Routes::bind(&DefaultApi::preview_image_tiff_get_handler, this));
    Routes::Get(*router, base + "/preview/pedestal.tiff", Routes::bind(&DefaultApi::preview_pedestal_tiff_get_handler, this));
    Routes::Post(*router, base + "/start", Routes::bind(&DefaultApi::start_post_handler, this));
    Routes::Get(*router, base + "/statistics/calibration", Routes::bind(&DefaultApi::statistics_calibration_get_handler, this));
@@ -928,17 +927,131 @@ void DefaultApi::image_buffer_image_cbor_get_handler(const Pistache::Rest::Reque


    // Getting the query params
-    auto imageNumberQuery = request.query().get("image_number");
-    std::optional<int64_t> imageNumber;
-    if(imageNumberQuery.has_value()){
+    auto idQuery = request.query().get("id");
+    std::optional<int64_t> id;
+    if(idQuery.has_value()){
        int64_t valueQuery_instance;
-        if(fromStringValue(imageNumberQuery.value(), valueQuery_instance)){
-            imageNumber = valueQuery_instance;
+        if(fromStringValue(idQuery.value(), valueQuery_instance)){
+            id = valueQuery_instance;
        }
    }
    
    try {
-        this->image_buffer_image_cbor_get(imageNumber, response);
+        this->image_buffer_image_cbor_get(id, 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::image_buffer_image_jpeg_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
+    try {
+
+
+    // Getting the query params
+    auto idQuery = request.query().get("id");
+    std::optional<int64_t> id;
+    if(idQuery.has_value()){
+        int64_t valueQuery_instance;
+        if(fromStringValue(idQuery.value(), valueQuery_instance)){
+            id = valueQuery_instance;
+        }
+    }
+    auto showUserMaskQuery = request.query().get("show_user_mask");
+    std::optional<bool> showUserMask;
+    if(showUserMaskQuery.has_value()){
+        bool valueQuery_instance;
+        if(fromStringValue(showUserMaskQuery.value(), valueQuery_instance)){
+            showUserMask = valueQuery_instance;
+        }
+    }
+    auto showRoiQuery = request.query().get("show_roi");
+    std::optional<bool> showRoi;
+    if(showRoiQuery.has_value()){
+        bool valueQuery_instance;
+        if(fromStringValue(showRoiQuery.value(), valueQuery_instance)){
+            showRoi = valueQuery_instance;
+        }
+    }
+    auto showSpotsQuery = request.query().get("show_spots");
+    std::optional<bool> showSpots;
+    if(showSpotsQuery.has_value()){
+        bool valueQuery_instance;
+        if(fromStringValue(showSpotsQuery.value(), valueQuery_instance)){
+            showSpots = valueQuery_instance;
+        }
+    }
+    auto saturationQuery = request.query().get("saturation");
+    std::optional<int64_t> saturation;
+    if(saturationQuery.has_value()){
+        int64_t valueQuery_instance;
+        if(fromStringValue(saturationQuery.value(), valueQuery_instance)){
+            saturation = valueQuery_instance;
+        }
+    }
+    auto jpegQualityQuery = request.query().get("jpeg_quality");
+    std::optional<int64_t> jpegQuality;
+    if(jpegQualityQuery.has_value()){
+        int64_t valueQuery_instance;
+        if(fromStringValue(jpegQualityQuery.value(), valueQuery_instance)){
+            jpegQuality = valueQuery_instance;
+        }
+    }
+    auto showResRingQuery = request.query().get("show_res_ring");
+    std::optional<float> showResRing;
+    if(showResRingQuery.has_value()){
+        float valueQuery_instance;
+        if(fromStringValue(showResRingQuery.value(), valueQuery_instance)){
+            showResRing = valueQuery_instance;
+        }
+    }
+    auto colorQuery = request.query().get("color");
+    std::optional<std::string> color;
+    if(colorQuery.has_value()){
+        std::string valueQuery_instance;
+        if(fromStringValue(colorQuery.value(), valueQuery_instance)){
+            color = valueQuery_instance;
+        }
+    }
+    
+    try {
+        this->image_buffer_image_jpeg_get(id, showUserMask, showRoi, showSpots, saturation, jpegQuality, showResRing, color, 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::image_buffer_image_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
+    try {
+
+
+    // Getting the query params
+    auto idQuery = request.query().get("id");
+    std::optional<int64_t> id;
+    if(idQuery.has_value()){
+        int64_t valueQuery_instance;
+        if(fromStringValue(idQuery.value(), valueQuery_instance)){
+            id = valueQuery_instance;
+        }
+    }
+    
+    try {
+        this->image_buffer_image_tiff_get(id, response);
    } catch (Pistache::Http::HttpError &e) {
        response.send(static_cast<Pistache::Http::Code>(e.code()), e.what());
        return;
@@ -1426,6 +1539,43 @@ void DefaultApi::plot_receiver_free_send_buffers_get_handler(const Pistache::Res
        response.send(Pistache::Http::Code::Internal_Server_Error, e.what());
    }

+}
+void DefaultApi::plot_resolution_estimate_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
+    try {
+
+
+    // Getting the query params
+    auto binningQuery = request.query().get("binning");
+    std::optional<int32_t> binning;
+    if(binningQuery.has_value()){
+        int32_t valueQuery_instance;
+        if(fromStringValue(binningQuery.value(), valueQuery_instance)){
+            binning = valueQuery_instance;
+        }
+    }
+    auto compressionQuery = request.query().get("compression");
+    std::optional<bool> compression;
+    if(compressionQuery.has_value()){
+        bool valueQuery_instance;
+        if(fromStringValue(compressionQuery.value(), valueQuery_instance)){
+            compression = valueQuery_instance;
+        }
+    }
+    
+    try {
+        this->plot_resolution_estimate_get(binning, compression, 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::plot_roi_max_count_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
    try {
@@ -1722,94 +1872,6 @@ void DefaultApi::plot_strong_pixel_get_handler(const Pistache::Rest::Request &re
        response.send(Pistache::Http::Code::Internal_Server_Error, e.what());
    }

-}
-void DefaultApi::preview_calibration_tiff_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) {
-    try {
-
-
-    try {
-        this->preview_calibration_tiff_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::preview_image_jpeg_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) {
-    try {
-
-
-    try {
-        this->preview_image_jpeg_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::preview_image_jpeg_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
-    try {
-
-
-    // Getting the body param
-    
-    Preview_settings previewSettings;
-    
-    try {
-        nlohmann::json::parse(request.body()).get_to(previewSettings);
-        previewSettings.validate();
-    } catch (std::exception &e) {
-        this->handleParsingException(e, response);
-        return;
-    }
-
-    try {
-        this->preview_image_jpeg_post(previewSettings, 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::preview_image_tiff_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) {
-    try {
-
-
-    try {
-        this->preview_image_tiff_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::preview_pedestal_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
    try {
--- a/broker/gen/api/DefaultApi.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -45,7 +45,6 @@
 #include "Jfjoch_statistics.h"
 #include "Measurement_statistics.h"
 #include "Plots.h"
-#include "Preview_settings.h"
 #include "Roi_definitions.h"
 #include "Spot_finding_settings.h"
 #include "Zeromq_metadata_settings.h"
@@ -103,6 +102,8 @@ private:
    void fpga_status_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void image_buffer_clear_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void image_buffer_image_cbor_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void image_buffer_image_jpeg_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void image_buffer_image_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void image_buffer_start_cbor_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void image_buffer_status_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void initialize_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -118,6 +119,7 @@ private:
    void plot_packets_received_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_receiver_delay_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_receiver_free_send_buffers_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
+    void plot_resolution_estimate_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_roi_max_count_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_roi_mean_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_roi_sum_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -126,10 +128,6 @@ private:
    void plot_roi_y_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_spot_count_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void plot_strong_pixel_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
-    void preview_calibration_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
-    void preview_image_jpeg_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
-    void preview_image_jpeg_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
-    void preview_image_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void preview_pedestal_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void start_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
    void statistics_calibration_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
@@ -432,8 +430,31 @@ private:
    /// <remarks>
    /// Contains full image data and metadata. The image must come from the latest data collection.
    /// </remarks>
-    /// <param name="imageNumber">Image number. If omitted, the image with the highest number in the image buffer will be provided. (optional, default to 0L)</param>
-    virtual void image_buffer_image_cbor_get(const std::optional<int64_t> &imageNumber, Pistache::Http::ResponseWriter &response) = 0;
+    /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
+    virtual void image_buffer_image_cbor_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Get preview image in JPEG format using custom settings
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
+    /// <param name="showUserMask">Show user mask (optional, default to false)</param>
+    /// <param name="showRoi">Show ROI areas on the image (optional, default to false)</param>
+    /// <param name="showSpots">Show spot finding results on the image (optional, default to true)</param>
+    /// <param name="saturation">Saturation value to set contrast in the preview image (optional, default to 0L)</param>
+    /// <param name="jpegQuality">Quality of JPEG image (100 - highest; 0 - lowest) (optional, default to 100L)</param>
+    /// <param name="showResRing">Show resolution ring, provided in Angstrom (optional, default to 0.1f)</param>
+    /// <param name="color">Color scale for preview image: 0 - indigo, 1 - viridis, 2 - B/W, 3 - heat (optional, default to &quot;indigo&quot;)</param>
+    virtual void image_buffer_image_jpeg_get(const std::optional<int64_t> &id, const std::optional<bool> &showUserMask, const std::optional<bool> &showRoi, const std::optional<bool> &showSpots, const std::optional<int64_t> &saturation, const std::optional<int64_t> &jpegQuality, const std::optional<float> &showResRing, const std::optional<std::string> &color, Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
+    /// Get preview image in TIFF format
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    /// <param name="id">Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer (optional, default to -1L)</param>
+    virtual void image_buffer_image_tiff_get(const std::optional<int64_t> &id, Pistache::Http::ResponseWriter &response) = 0;
    /// <summary>
    /// Get Start message in CBOR format
    /// </summary>
@@ -561,6 +582,15 @@ private:
    /// <param name="compression">Enable DEFLATE compression of output data. (optional, default to true)</param>
    virtual void plot_receiver_free_send_buffers_get(const std::optional<int32_t> &binning, const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) = 0;
    /// <summary>
+    /// Generate resolution estimate plot
+    /// </summary>
+    /// <remarks>
+    /// Diffraction resolution, as estimated by SSRL ML model; binning is configurable 
+    /// </remarks>
+    /// <param name="binning">Binning of frames for the plot (0 &#x3D; default binning) (optional, default to 0)</param>
+    /// <param name="compression">Enable DEFLATE compression of output data. (optional, default to true)</param>
+    virtual void plot_resolution_estimate_get(const std::optional<int32_t> &binning, const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) = 0;
+    /// <summary>
    /// Generate plot of ROI max count
    /// </summary>
    /// <remarks>
@@ -633,35 +663,6 @@ private:
    /// <param name="compression">Enable DEFLATE compression of output data. (optional, default to true)</param>
    virtual void plot_strong_pixel_get(const std::optional<int32_t> &binning, const std::optional<bool> &compression, Pistache::Http::ResponseWriter &response) = 0;
    /// <summary>
-    /// Get last preview image in TIFF format for calibration with PyFAI/Dioptas
-    /// </summary>
-    /// <remarks>
-    /// Image is reduced to unsigned 16-bit images, all bad pixels are set to 65535 and image is mirrored in vertical direction
-    /// </remarks>
-    virtual void preview_calibration_tiff_get(Pistache::Http::ResponseWriter &response) = 0;
-    /// <summary>
-    /// Get last preview image in JPEG format using default settings
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// </remarks>
-    virtual void preview_image_jpeg_get(Pistache::Http::ResponseWriter &response) = 0;
-    /// <summary>
-    /// Get last preview image in JPEG format using custom settings
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// </remarks>
-    /// <param name="previewSettings"> (optional)</param>
-    virtual void preview_image_jpeg_post(const org::openapitools::server::model::Preview_settings &previewSettings, Pistache::Http::ResponseWriter &response) = 0;
-    /// <summary>
-    /// Get last preview image in TIFF format
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// </remarks>
-    virtual void preview_image_tiff_get(Pistache::Http::ResponseWriter &response) = 0;
-    /// <summary>
    /// Get pedestal in TIFF format
    /// </summary>
    /// <remarks>
--- a/broker/gen/model/Azim_int_settings.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Azim_int_settings.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Broker_status.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Broker_status.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Calibration_statistics_inner.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Calibration_statistics_inner.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Dataset_settings.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Dataset_settings.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Dataset_settings_unit_cell.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Dataset_settings_unit_cell.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -22,7 +22,8 @@ namespace org::openapitools::server::model
 Detector::Detector()
 {
    m_Description = "";
-    m_Serial_number = "";
+    m_Serial_number = "Unknown";
+    m_Serial_numberIsSet = false;
    m_TypeIsSet = false;
    m_High_voltage_V = 0L;
    m_High_voltage_VIsSet = false;
@@ -34,6 +35,10 @@ Detector::Detector()
    m_Sensor_thickness_umIsSet = false;
    m_Readout_time_us = 0L;
    m_Readout_time_usIsSet = false;
+    m_Minimum_count_time_us = 0L;
+    m_Minimum_count_time_usIsSet = false;
+    m_Minimum_frame_time_us = 0L;
+    m_Minimum_frame_time_usIsSet = false;
    m_Calibration_fileIsSet = false;
    m_HostnameIsSet = false;
    m_Sensor_material = "Si";
@@ -43,6 +48,8 @@ Detector::Detector()
    m_Base_data_ipv4_addressIsSet = false;
    m_Standard_geometryIsSet = false;
    m_Custom_geometryIsSet = false;
+    m_Roi_mode = "";
+    m_Roi_modeIsSet = false;
    m_Mirror_y = true;
    m_Mirror_yIsSet = false;
    
@@ -82,8 +89,8 @@ bool Detector::validate(std::stringstream& msg, const std::string& pathPrefix) c

    }
         
-    
-    /* Serial_number */ {
+    if (serialNumberIsSet())
+    {
        const std::string& value = m_Serial_number;
        const std::string currentValuePath = _pathPrefix + ".serialNumber";
                
@@ -162,6 +169,34 @@ bool Detector::validate(std::stringstream& msg, const std::string& pathPrefix) c

    }
         
+    if (minimumCountTimeUsIsSet())
+    {
+        const int64_t& value = m_Minimum_count_time_us;
+        const std::string currentValuePath = _pathPrefix + ".minimumCountTimeUs";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
+    if (minimumFrameTimeUsIsSet())
+    {
+        const int64_t& value = m_Minimum_frame_time_us;
+        const std::string currentValuePath = _pathPrefix + ".minimumFrameTimeUs";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
    if (calibrationFileIsSet())
    {
        const std::vector<std::string>& value = m_Calibration_file;
@@ -245,7 +280,7 @@ bool Detector::validate(std::stringstream& msg, const std::string& pathPrefix) c
        }

    }
-        
+            
    return success;
 }

@@ -257,8 +292,8 @@ bool Detector::operator==(const Detector& rhs) const
    (getDescription() == rhs.getDescription())
     &&
    
-    (getSerialNumber() == rhs.getSerialNumber())
-     &&
+    
+    ((!serialNumberIsSet() && !rhs.serialNumberIsSet()) || (serialNumberIsSet() && rhs.serialNumberIsSet() && getSerialNumber() == rhs.getSerialNumber())) &&
    
    
    ((!typeIsSet() && !rhs.typeIsSet()) || (typeIsSet() && rhs.typeIsSet() && getType() == rhs.getType())) &&
@@ -279,6 +314,12 @@ bool Detector::operator==(const Detector& rhs) const
    ((!readoutTimeUsIsSet() && !rhs.readoutTimeUsIsSet()) || (readoutTimeUsIsSet() && rhs.readoutTimeUsIsSet() && getReadoutTimeUs() == rhs.getReadoutTimeUs())) &&
    
    
+    ((!minimumCountTimeUsIsSet() && !rhs.minimumCountTimeUsIsSet()) || (minimumCountTimeUsIsSet() && rhs.minimumCountTimeUsIsSet() && getMinimumCountTimeUs() == rhs.getMinimumCountTimeUs())) &&
+    
+    
+    ((!minimumFrameTimeUsIsSet() && !rhs.minimumFrameTimeUsIsSet()) || (minimumFrameTimeUsIsSet() && rhs.minimumFrameTimeUsIsSet() && getMinimumFrameTimeUs() == rhs.getMinimumFrameTimeUs())) &&
+    
+    
    ((!calibrationFileIsSet() && !rhs.calibrationFileIsSet()) || (calibrationFileIsSet() && rhs.calibrationFileIsSet() && getCalibrationFile() == rhs.getCalibrationFile())) &&
    
    
@@ -300,6 +341,9 @@ bool Detector::operator==(const Detector& rhs) const
    ((!customGeometryIsSet() && !rhs.customGeometryIsSet()) || (customGeometryIsSet() && rhs.customGeometryIsSet() && getCustomGeometry() == rhs.getCustomGeometry())) &&
    
    
+    ((!roiModeIsSet() && !rhs.roiModeIsSet()) || (roiModeIsSet() && rhs.roiModeIsSet() && getRoiMode() == rhs.getRoiMode())) &&
+    
+    
    ((!mirrorYIsSet() && !rhs.mirrorYIsSet()) || (mirrorYIsSet() && rhs.mirrorYIsSet() && isMirrorY() == rhs.isMirrorY()))
    
    ;
@@ -314,7 +358,8 @@ void to_json(nlohmann::json& j, const Detector& o)
 {
    j = nlohmann::json::object();
    j["description"] = o.m_Description;
-    j["serial_number"] = o.m_Serial_number;
+    if(o.serialNumberIsSet())
+        j["serial_number"] = o.m_Serial_number;
    if(o.typeIsSet())
        j["type"] = o.m_Type;
    if(o.highVoltageVIsSet())
@@ -327,6 +372,10 @@ void to_json(nlohmann::json& j, const Detector& o)
        j["sensor_thickness_um"] = o.m_Sensor_thickness_um;
    if(o.readoutTimeUsIsSet())
        j["readout_time_us"] = o.m_Readout_time_us;
+    if(o.minimumCountTimeUsIsSet())
+        j["minimum_count_time_us"] = o.m_Minimum_count_time_us;
+    if(o.minimumFrameTimeUsIsSet())
+        j["minimum_frame_time_us"] = o.m_Minimum_frame_time_us;
    if(o.calibrationFileIsSet() || !o.m_Calibration_file.empty())
        j["calibration_file"] = o.m_Calibration_file;
    if(o.hostnameIsSet() || !o.m_Hostname.empty())
@@ -341,6 +390,8 @@ void to_json(nlohmann::json& j, const Detector& o)
        j["standard_geometry"] = o.m_Standard_geometry;
    if(o.customGeometryIsSet() || !o.m_Custom_geometry.empty())
        j["custom_geometry"] = o.m_Custom_geometry;
+    if(o.roiModeIsSet())
+        j["roi_mode"] = o.m_Roi_mode;
    if(o.mirrorYIsSet())
        j["mirror_y"] = o.m_Mirror_y;
    
@@ -349,7 +400,11 @@ void to_json(nlohmann::json& j, const Detector& o)
 void from_json(const nlohmann::json& j, Detector& o)
 {
    j.at("description").get_to(o.m_Description);
-    j.at("serial_number").get_to(o.m_Serial_number);
+    if(j.find("serial_number") != j.end())
+    {
+        j.at("serial_number").get_to(o.m_Serial_number);
+        o.m_Serial_numberIsSet = true;
+    } 
    if(j.find("type") != j.end())
    {
        j.at("type").get_to(o.m_Type);
@@ -380,6 +435,16 @@ void from_json(const nlohmann::json& j, Detector& o)
        j.at("readout_time_us").get_to(o.m_Readout_time_us);
        o.m_Readout_time_usIsSet = true;
    } 
+    if(j.find("minimum_count_time_us") != j.end())
+    {
+        j.at("minimum_count_time_us").get_to(o.m_Minimum_count_time_us);
+        o.m_Minimum_count_time_usIsSet = true;
+    } 
+    if(j.find("minimum_frame_time_us") != j.end())
+    {
+        j.at("minimum_frame_time_us").get_to(o.m_Minimum_frame_time_us);
+        o.m_Minimum_frame_time_usIsSet = true;
+    } 
    if(j.find("calibration_file") != j.end())
    {
        j.at("calibration_file").get_to(o.m_Calibration_file);
@@ -415,6 +480,11 @@ void from_json(const nlohmann::json& j, Detector& o)
        j.at("custom_geometry").get_to(o.m_Custom_geometry);
        o.m_Custom_geometryIsSet = true;
    } 
+    if(j.find("roi_mode") != j.end())
+    {
+        j.at("roi_mode").get_to(o.m_Roi_mode);
+        o.m_Roi_modeIsSet = true;
+    } 
    if(j.find("mirror_y") != j.end())
    {
        j.at("mirror_y").get_to(o.m_Mirror_y);
@@ -438,6 +508,15 @@ std::string Detector::getSerialNumber() const
 void Detector::setSerialNumber(std::string const& value)
 {
    m_Serial_number = value;
+    m_Serial_numberIsSet = true;
+}
+bool Detector::serialNumberIsSet() const
+{
+    return m_Serial_numberIsSet;
+}
+void Detector::unsetSerial_number()
+{
+    m_Serial_numberIsSet = false;
 }
 org::openapitools::server::model::Detector_type Detector::getType() const
 {
@@ -541,6 +620,40 @@ void Detector::unsetReadout_time_us()
 {
    m_Readout_time_usIsSet = false;
 }
+int64_t Detector::getMinimumCountTimeUs() const
+{
+    return m_Minimum_count_time_us;
+}
+void Detector::setMinimumCountTimeUs(int64_t const value)
+{
+    m_Minimum_count_time_us = value;
+    m_Minimum_count_time_usIsSet = true;
+}
+bool Detector::minimumCountTimeUsIsSet() const
+{
+    return m_Minimum_count_time_usIsSet;
+}
+void Detector::unsetMinimum_count_time_us()
+{
+    m_Minimum_count_time_usIsSet = false;
+}
+int64_t Detector::getMinimumFrameTimeUs() const
+{
+    return m_Minimum_frame_time_us;
+}
+void Detector::setMinimumFrameTimeUs(int64_t const value)
+{
+    m_Minimum_frame_time_us = value;
+    m_Minimum_frame_time_usIsSet = true;
+}
+bool Detector::minimumFrameTimeUsIsSet() const
+{
+    return m_Minimum_frame_time_usIsSet;
+}
+void Detector::unsetMinimum_frame_time_us()
+{
+    m_Minimum_frame_time_usIsSet = false;
+}
 std::vector<std::string> Detector::getCalibrationFile() const
 {
    return m_Calibration_file;
@@ -660,6 +773,23 @@ void Detector::unsetCustom_geometry()
 {
    m_Custom_geometryIsSet = false;
 }
+std::string Detector::getRoiMode() const
+{
+    return m_Roi_mode;
+}
+void Detector::setRoiMode(std::string const& value)
+{
+    m_Roi_mode = value;
+    m_Roi_modeIsSet = true;
+}
+bool Detector::roiModeIsSet() const
+{
+    return m_Roi_modeIsSet;
+}
+void Detector::unsetRoi_mode()
+{
+    m_Roi_modeIsSet = false;
+}
 bool Detector::isMirrorY() const
 {
    return m_Mirror_y;
--- a/broker/gen/model/Detector.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -72,6 +72,8 @@ public:
    /// </summary>
    std::string getSerialNumber() const;
    void setSerialNumber(std::string const& value);
+    bool serialNumberIsSet() const;
+    void unsetSerial_number();
    /// <summary>
    /// 
    /// </summary>
@@ -115,6 +117,20 @@ public:
    bool readoutTimeUsIsSet() const;
    void unsetReadout_time_us();
    /// <summary>
+    /// Minimum count time available for the detector.
+    /// </summary>
+    int64_t getMinimumCountTimeUs() const;
+    void setMinimumCountTimeUs(int64_t const value);
+    bool minimumCountTimeUsIsSet() const;
+    void unsetMinimum_count_time_us();
+    /// <summary>
+    /// Minimum frame time available for the detector.
+    /// </summary>
+    int64_t getMinimumFrameTimeUs() const;
+    void setMinimumFrameTimeUs(int64_t const value);
+    bool minimumFrameTimeUsIsSet() const;
+    void unsetMinimum_frame_time_us();
+    /// <summary>
    /// Can be empty for all detectors - default calibration used. For JUNGFRAU: list of gain files, one entry per module. For EIGER: one directory (with detector settings) or list of trim bit files, one entry per half-module. 
    /// </summary>
    std::vector<std::string> getCalibrationFile() const;
@@ -164,6 +180,13 @@ public:
    bool customGeometryIsSet() const;
    void unsetCustom_geometry();
    /// <summary>
+    /// ROI setting for DECTRIS detectors
+    /// </summary>
+    std::string getRoiMode() const;
+    void setRoiMode(std::string const& value);
+    bool roiModeIsSet() const;
+    void unsetRoi_mode();
+    /// <summary>
    /// Mirror detector in Y direction to account for MX convention of (0,0) point in top left corner
    /// </summary>
    bool isMirrorY() const;
@@ -177,7 +200,7 @@ protected:
    std::string m_Description;

    std::string m_Serial_number;
-
+    bool m_Serial_numberIsSet;
    org::openapitools::server::model::Detector_type m_Type;
    bool m_TypeIsSet;
    int64_t m_High_voltage_V;
@@ -190,6 +213,10 @@ protected:
    bool m_Sensor_thickness_umIsSet;
    int64_t m_Readout_time_us;
    bool m_Readout_time_usIsSet;
+    int64_t m_Minimum_count_time_us;
+    bool m_Minimum_count_time_usIsSet;
+    int64_t m_Minimum_frame_time_us;
+    bool m_Minimum_frame_time_usIsSet;
    std::vector<std::string> m_Calibration_file;
    bool m_Calibration_fileIsSet;
    std::vector<std::string> m_Hostname;
@@ -204,6 +231,8 @@ protected:
    bool m_Standard_geometryIsSet;
    std::vector<org::openapitools::server::model::Detector_module> m_Custom_geometry;
    bool m_Custom_geometryIsSet;
+    std::string m_Roi_mode;
+    bool m_Roi_modeIsSet;
    bool m_Mirror_y;
    bool m_Mirror_yIsSet;
    
--- a/broker/gen/model/Detector_list.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_list.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_list_detectors_inner.cpp
+++ b/broker/gen/model/Detector_list_detectors_inner.cpp
@@ -1,245 +0,0 @@
-/**
-* 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.29
-* Contact: filip.leonarski@psi.ch
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
-
-
-#include "Detector_list_detectors_inner.h"
-#include "Helpers.h"
-
-#include <sstream>
-
-namespace org::openapitools::server::model
-{
-
-Detector_list_detectors_inner::Detector_list_detectors_inner()
-{
-    m_Id = 0L;
-    m_Description = "";
-    m_Serial_number = "";
-    m_Base_ipv4_addr = "";
-    m_Udp_interface_count = 0L;
-    m_Nmodules = 0L;
-    m_Width = 0L;
-    m_Height = 0L;
-    m_Readout_time_us = 0L;
-    m_Min_frame_time_us = 0L;
-    m_Min_count_time_us = 0L;
-    
-}
-
-void Detector_list_detectors_inner::validate() const
-{
-    std::stringstream msg;
-    if (!validate(msg))
-    {
-        throw org::openapitools::server::helpers::ValidationException(msg.str());
-    }
-}
-
-bool Detector_list_detectors_inner::validate(std::stringstream& msg) const
-{
-    return validate(msg, "");
-}
-
-bool Detector_list_detectors_inner::validate(std::stringstream& msg, const std::string& pathPrefix) const
-{
-    bool success = true;
-    const std::string _pathPrefix = pathPrefix.empty() ? "Detector_list_detectors_inner" : pathPrefix;
-
-         
-    
-    /* Id */ {
-        const int64_t& value = m_Id;
-        const std::string currentValuePath = _pathPrefix + ".id";
-                
-        
-        if (value < 0ll)
-        {
-            success = false;
-            msg << currentValuePath << ": must be greater than or equal to 0;";
-        }
-
-    }
-                                            
-    return success;
-}
-
-bool Detector_list_detectors_inner::operator==(const Detector_list_detectors_inner& rhs) const
-{
-    return
-    
-    
-    (getId() == rhs.getId())
-     &&
-    
-    (getDescription() == rhs.getDescription())
-     &&
-    
-    (getSerialNumber() == rhs.getSerialNumber())
-     &&
-    
-    (getBaseIpv4Addr() == rhs.getBaseIpv4Addr())
-     &&
-    
-    (getUdpInterfaceCount() == rhs.getUdpInterfaceCount())
-     &&
-    
-    (getNmodules() == rhs.getNmodules())
-     &&
-    
-    (getWidth() == rhs.getWidth())
-     &&
-    
-    (getHeight() == rhs.getHeight())
-     &&
-    
-    (getReadoutTimeUs() == rhs.getReadoutTimeUs())
-     &&
-    
-    (getMinFrameTimeUs() == rhs.getMinFrameTimeUs())
-     &&
-    
-    (getMinCountTimeUs() == rhs.getMinCountTimeUs())
-    
-    
-    ;
-}
-
-bool Detector_list_detectors_inner::operator!=(const Detector_list_detectors_inner& rhs) const
-{
-    return !(*this == rhs);
-}
-
-void to_json(nlohmann::json& j, const Detector_list_detectors_inner& o)
-{
-    j = nlohmann::json::object();
-    j["id"] = o.m_Id;
-    j["description"] = o.m_Description;
-    j["serial_number"] = o.m_Serial_number;
-    j["base_ipv4_addr"] = o.m_Base_ipv4_addr;
-    j["udp_interface_count"] = o.m_Udp_interface_count;
-    j["nmodules"] = o.m_Nmodules;
-    j["width"] = o.m_Width;
-    j["height"] = o.m_Height;
-    j["readout_time_us"] = o.m_Readout_time_us;
-    j["min_frame_time_us"] = o.m_Min_frame_time_us;
-    j["min_count_time_us"] = o.m_Min_count_time_us;
-    
-}
-
-void from_json(const nlohmann::json& j, Detector_list_detectors_inner& o)
-{
-    j.at("id").get_to(o.m_Id);
-    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);
-    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);
-    j.at("readout_time_us").get_to(o.m_Readout_time_us);
-    j.at("min_frame_time_us").get_to(o.m_Min_frame_time_us);
-    j.at("min_count_time_us").get_to(o.m_Min_count_time_us);
-    
-}
-
-int64_t Detector_list_detectors_inner::getId() const
-{
-    return m_Id;
-}
-void Detector_list_detectors_inner::setId(int64_t const value)
-{
-    m_Id = value;
-}
-std::string Detector_list_detectors_inner::getDescription() const
-{
-    return m_Description;
-}
-void Detector_list_detectors_inner::setDescription(std::string const& value)
-{
-    m_Description = value;
-}
-std::string Detector_list_detectors_inner::getSerialNumber() const
-{
-    return m_Serial_number;
-}
-void Detector_list_detectors_inner::setSerialNumber(std::string const& value)
-{
-    m_Serial_number = value;
-}
-std::string Detector_list_detectors_inner::getBaseIpv4Addr() const
-{
-    return m_Base_ipv4_addr;
-}
-void Detector_list_detectors_inner::setBaseIpv4Addr(std::string const& value)
-{
-    m_Base_ipv4_addr = value;
-}
-int64_t Detector_list_detectors_inner::getUdpInterfaceCount() const
-{
-    return m_Udp_interface_count;
-}
-void Detector_list_detectors_inner::setUdpInterfaceCount(int64_t const value)
-{
-    m_Udp_interface_count = value;
-}
-int64_t Detector_list_detectors_inner::getNmodules() const
-{
-    return m_Nmodules;
-}
-void Detector_list_detectors_inner::setNmodules(int64_t const value)
-{
-    m_Nmodules = value;
-}
-int64_t Detector_list_detectors_inner::getWidth() const
-{
-    return m_Width;
-}
-void Detector_list_detectors_inner::setWidth(int64_t const value)
-{
-    m_Width = value;
-}
-int64_t Detector_list_detectors_inner::getHeight() const
-{
-    return m_Height;
-}
-void Detector_list_detectors_inner::setHeight(int64_t const value)
-{
-    m_Height = value;
-}
-int64_t Detector_list_detectors_inner::getReadoutTimeUs() const
-{
-    return m_Readout_time_us;
-}
-void Detector_list_detectors_inner::setReadoutTimeUs(int64_t const value)
-{
-    m_Readout_time_us = value;
-}
-int64_t Detector_list_detectors_inner::getMinFrameTimeUs() const
-{
-    return m_Min_frame_time_us;
-}
-void Detector_list_detectors_inner::setMinFrameTimeUs(int64_t const value)
-{
-    m_Min_frame_time_us = value;
-}
-int64_t Detector_list_detectors_inner::getMinCountTimeUs() const
-{
-    return m_Min_count_time_us;
-}
-void Detector_list_detectors_inner::setMinCountTimeUs(int64_t const value)
-{
-    m_Min_count_time_us = value;
-}
-
-
-} // namespace org::openapitools::server::model
-
--- a/broker/gen/model/Detector_list_detectors_inner.h
+++ b/broker/gen/model/Detector_list_detectors_inner.h
@@ -1,147 +0,0 @@
-/**
-* 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.29
-* Contact: filip.leonarski@psi.ch
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
-/*
- * Detector_list_detectors_inner.h
- *
- * 
- */
-
-#ifndef Detector_list_detectors_inner_H_
-#define Detector_list_detectors_inner_H_
-
-
-#include <string>
-#include <nlohmann/json.hpp>
-
-namespace org::openapitools::server::model
-{
-
-/// <summary>
-/// 
-/// </summary>
-class  Detector_list_detectors_inner
-{
-public:
-    Detector_list_detectors_inner();
-    virtual ~Detector_list_detectors_inner() = default;
-
-
-    /// <summary>
-    /// Validate the current data in the model. Throws a ValidationException on failure.
-    /// </summary>
-    void validate() const;
-
-    /// <summary>
-    /// Validate the current data in the model. Returns false on error and writes an error
-    /// message into the given stringstream.
-    /// </summary>
-    bool validate(std::stringstream& msg) const;
-
-    /// <summary>
-    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
-    /// Not meant to be called outside that case.
-    /// </summary>
-    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
-
-    bool operator==(const Detector_list_detectors_inner& rhs) const;
-    bool operator!=(const Detector_list_detectors_inner& rhs) const;
-
-    /////////////////////////////////////////////
-    /// Detector_list_detectors_inner members
-
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getId() const;
-    void setId(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    std::string getDescription() const;
-    void setDescription(std::string const& value);
-    /// <summary>
-    /// 
-    /// </summary>
-    std::string getSerialNumber() const;
-    void setSerialNumber(std::string const& value);
-    /// <summary>
-    /// 
-    /// </summary>
-    std::string getBaseIpv4Addr() const;
-    void setBaseIpv4Addr(std::string const& value);
-    /// <summary>
-    /// Number of UDP interfaces per detector module
-    /// </summary>
-    int64_t getUdpInterfaceCount() const;
-    void setUdpInterfaceCount(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getNmodules() const;
-    void setNmodules(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getWidth() const;
-    void setWidth(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getHeight() const;
-    void setHeight(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getReadoutTimeUs() const;
-    void setReadoutTimeUs(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getMinFrameTimeUs() const;
-    void setMinFrameTimeUs(int64_t const value);
-    /// <summary>
-    /// 
-    /// </summary>
-    int64_t getMinCountTimeUs() const;
-    void setMinCountTimeUs(int64_t const value);
-
-    friend  void to_json(nlohmann::json& j, const Detector_list_detectors_inner& o);
-    friend  void from_json(const nlohmann::json& j, Detector_list_detectors_inner& o);
-protected:
-    int64_t m_Id;
-
-    std::string m_Description;
-
-    std::string m_Serial_number;
-
-    std::string m_Base_ipv4_addr;
-
-    int64_t m_Udp_interface_count;
-
-    int64_t m_Nmodules;
-
-    int64_t m_Width;
-
-    int64_t m_Height;
-
-    int64_t m_Readout_time_us;
-
-    int64_t m_Min_frame_time_us;
-
-    int64_t m_Min_count_time_us;
-
-    
-};
-
-} // namespace org::openapitools::server::model
-
-#endif /* Detector_list_detectors_inner_H_ */
--- a/broker/gen/model/Detector_list_element.cpp
+++ b/broker/gen/model/Detector_list_element.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -32,6 +32,7 @@ Detector_list_element::Detector_list_element()
    m_Readout_time_us = 0L;
    m_Min_frame_time_us = 0L;
    m_Min_count_time_us = 0L;
+    m_TypeIsSet = false;
    
 }

@@ -68,7 +69,7 @@ bool Detector_list_element::validate(std::stringstream& msg, const std::string&
        }

    }
-                                            
+                                                
    return success;
 }

@@ -108,8 +109,11 @@ bool Detector_list_element::operator==(const Detector_list_element& rhs) const
     &&
    
    (getMinCountTimeUs() == rhs.getMinCountTimeUs())
+     &&
    
    
+    ((!typeIsSet() && !rhs.typeIsSet()) || (typeIsSet() && rhs.typeIsSet() && getType() == rhs.getType()))
+    
    ;
 }

@@ -132,6 +136,8 @@ void to_json(nlohmann::json& j, const Detector_list_element& o)
    j["readout_time_us"] = o.m_Readout_time_us;
    j["min_frame_time_us"] = o.m_Min_frame_time_us;
    j["min_count_time_us"] = o.m_Min_count_time_us;
+    if(o.typeIsSet())
+        j["type"] = o.m_Type;
    
 }

@@ -148,6 +154,11 @@ void from_json(const nlohmann::json& j, Detector_list_element& o)
    j.at("readout_time_us").get_to(o.m_Readout_time_us);
    j.at("min_frame_time_us").get_to(o.m_Min_frame_time_us);
    j.at("min_count_time_us").get_to(o.m_Min_count_time_us);
+    if(j.find("type") != j.end())
+    {
+        j.at("type").get_to(o.m_Type);
+        o.m_TypeIsSet = true;
+    } 
    
 }

@@ -239,6 +250,23 @@ void Detector_list_element::setMinCountTimeUs(int64_t const value)
 {
    m_Min_count_time_us = value;
 }
+org::openapitools::server::model::Detector_type Detector_list_element::getType() const
+{
+    return m_Type;
+}
+void Detector_list_element::setType(org::openapitools::server::model::Detector_type const& value)
+{
+    m_Type = value;
+    m_TypeIsSet = true;
+}
+bool Detector_list_element::typeIsSet() const
+{
+    return m_TypeIsSet;
+}
+void Detector_list_element::unsetType()
+{
+    m_TypeIsSet = false;
+}


 } // namespace org::openapitools::server::model
--- a/broker/gen/model/Detector_list_element.h
+++ b/broker/gen/model/Detector_list_element.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -19,6 +19,7 @@
 #define Detector_list_element_H_


+#include "Detector_type.h"
 #include <string>
 #include <nlohmann/json.hpp>

@@ -113,6 +114,13 @@ public:
    /// </summary>
    int64_t getMinCountTimeUs() const;
    void setMinCountTimeUs(int64_t const value);
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Detector_type getType() const;
+    void setType(org::openapitools::server::model::Detector_type const& value);
+    bool typeIsSet() const;
+    void unsetType();

    friend  void to_json(nlohmann::json& j, const Detector_list_element& o);
    friend  void from_json(const nlohmann::json& j, Detector_list_element& o);
@@ -139,6 +147,8 @@ protected:

    int64_t m_Min_count_time_us;

+    org::openapitools::server::model::Detector_type m_Type;
+    bool m_TypeIsSet;
    
 };

--- a/broker/gen/model/Detector_module.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_module.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_module_direction.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_module_direction.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_power_state.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_power_state.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_selection.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_selection.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_settings.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_settings.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_state.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_state.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_status.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_status.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_timing.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_timing.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Detector_type.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -81,6 +81,9 @@ void to_json(nlohmann::json& j, const Detector_type& o)
        case Detector_type::eDetector_type::JUNGFRAU:
            j = "JUNGFRAU";
            break;
+        case Detector_type::eDetector_type::DECTRIS:
+            j = "DECTRIS";
+            break;
    }
 }

@@ -93,6 +96,9 @@ void from_json(const nlohmann::json& j, Detector_type& o)
    } 
    else if (s == "JUNGFRAU") {
     o.setValue(Detector_type::eDetector_type::JUNGFRAU);
+    } 
+    else if (s == "DECTRIS") {
+     o.setValue(Detector_type::eDetector_type::DECTRIS);
    }  else {
     std::stringstream ss;
     ss << "Unexpected value " << s << " in json"
--- a/broker/gen/model/Detector_type.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -39,7 +39,8 @@ public:
    // enum values
    INVALID_VALUE_OPENAPI_GENERATED = 0,
    EIGER, 
-    JUNGFRAU
+    JUNGFRAU, 
+    DECTRIS
    };

    /// <summary>
--- a/broker/gen/model/Error_message.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Error_message.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/File_writer_format.cpp
+++ b/broker/gen/model/File_writer_format.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -84,6 +84,12 @@ void to_json(nlohmann::json& j, const File_writer_format& o)
        case File_writer_format::eFile_writer_format::NXMXVDS:
            j = "NXmxVDS";
            break;
+        case File_writer_format::eFile_writer_format::CBF:
+            j = "CBF";
+            break;
+        case File_writer_format::eFile_writer_format::TIFF:
+            j = "TIFF";
+            break;
    }
 }

@@ -99,6 +105,12 @@ void from_json(const nlohmann::json& j, File_writer_format& o)
    } 
    else if (s == "NXmxVDS") {
     o.setValue(File_writer_format::eFile_writer_format::NXMXVDS);
+    } 
+    else if (s == "CBF") {
+     o.setValue(File_writer_format::eFile_writer_format::CBF);
+    } 
+    else if (s == "TIFF") {
+     o.setValue(File_writer_format::eFile_writer_format::TIFF);
    }  else {
     std::stringstream ss;
     ss << "Unexpected value " << s << " in json"
--- a/broker/gen/model/File_writer_format.h
+++ b/broker/gen/model/File_writer_format.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -40,7 +40,9 @@ public:
    INVALID_VALUE_OPENAPI_GENERATED = 0,
    NONE, 
    NXMXLEGACY, 
-    NXMXVDS
+    NXMXVDS, 
+    CBF, 
+    TIFF
    };

    /// <summary>
--- a/broker/gen/model/File_writer_settings.cpp
+++ b/broker/gen/model/File_writer_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/File_writer_settings.h
+++ b/broker/gen/model/File_writer_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Fpga_status_inner.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Fpga_status_inner.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Helpers.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Helpers.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Image_buffer_status.cpp
+++ b/broker/gen/model/Image_buffer_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -21,6 +21,8 @@ namespace org::openapitools::server::model

 Image_buffer_status::Image_buffer_status()
 {
+    m_Min_image_number = 0L;
+    m_Max_image_number = 0L;
    m_Total_slots = 0L;
    m_Available_slots = 0L;
    
@@ -47,6 +49,34 @@ bool Image_buffer_status::validate(std::stringstream& msg, const std::string& pa

         
    
+    /* Min_image_number */ {
+        const int64_t& value = m_Min_image_number;
+        const std::string currentValuePath = _pathPrefix + ".minImageNumber";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
+    
+    /* Max_image_number */ {
+        const int64_t& value = m_Max_image_number;
+        const std::string currentValuePath = _pathPrefix + ".maxImageNumber";
+                
+        
+        if (value < 0ll)
+        {
+            success = false;
+            msg << currentValuePath << ": must be greater than or equal to 0;";
+        }
+
+    }
+         
+    
    /* Image_numbers */ {
        const std::vector<int64_t>& value = m_Image_numbers;
        const std::string currentValuePath = _pathPrefix + ".imageNumbers";
@@ -75,6 +105,12 @@ bool Image_buffer_status::operator==(const Image_buffer_status& rhs) const
    return
    
    
+    (getMinImageNumber() == rhs.getMinImageNumber())
+     &&
+    
+    (getMaxImageNumber() == rhs.getMaxImageNumber())
+     &&
+    
    (getImageNumbers() == rhs.getImageNumbers())
     &&
    
@@ -95,6 +131,8 @@ bool Image_buffer_status::operator!=(const Image_buffer_status& rhs) const
 void to_json(nlohmann::json& j, const Image_buffer_status& o)
 {
    j = nlohmann::json::object();
+    j["min_image_number"] = o.m_Min_image_number;
+    j["max_image_number"] = o.m_Max_image_number;
    j["image_numbers"] = o.m_Image_numbers;
    j["total_slots"] = o.m_Total_slots;
    j["available_slots"] = o.m_Available_slots;
@@ -103,12 +141,30 @@ void to_json(nlohmann::json& j, const Image_buffer_status& o)

 void from_json(const nlohmann::json& j, Image_buffer_status& o)
 {
+    j.at("min_image_number").get_to(o.m_Min_image_number);
+    j.at("max_image_number").get_to(o.m_Max_image_number);
    j.at("image_numbers").get_to(o.m_Image_numbers);
    j.at("total_slots").get_to(o.m_Total_slots);
    j.at("available_slots").get_to(o.m_Available_slots);
    
 }

+int64_t Image_buffer_status::getMinImageNumber() const
+{
+    return m_Min_image_number;
+}
+void Image_buffer_status::setMinImageNumber(int64_t const value)
+{
+    m_Min_image_number = value;
+}
+int64_t Image_buffer_status::getMaxImageNumber() const
+{
+    return m_Max_image_number;
+}
+void Image_buffer_status::setMaxImageNumber(int64_t const value)
+{
+    m_Max_image_number = value;
+}
 std::vector<int64_t> Image_buffer_status::getImageNumbers() const
 {
    return m_Image_numbers;
--- a/broker/gen/model/Image_buffer_status.h
+++ b/broker/gen/model/Image_buffer_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -58,6 +58,16 @@ public:
    /////////////////////////////////////////////
    /// Image_buffer_status members

+    /// <summary>
+    /// Smallest image number available in the buffer
+    /// </summary>
+    int64_t getMinImageNumber() const;
+    void setMinImageNumber(int64_t const value);
+    /// <summary>
+    /// Largest image number available in the buffer
+    /// </summary>
+    int64_t getMaxImageNumber() const;
+    void setMaxImageNumber(int64_t const value);
    /// <summary>
    /// Image numbers currently present in the buffer.
    /// </summary>
@@ -77,6 +87,10 @@ public:
    friend  void to_json(nlohmann::json& j, const Image_buffer_status& o);
    friend  void from_json(const nlohmann::json& j, Image_buffer_status& o);
 protected:
+    int64_t m_Min_image_number;
+
+    int64_t m_Max_image_number;
+
    std::vector<int64_t> m_Image_numbers;

    int64_t m_Total_slots;
--- a/broker/gen/model/Image_format_settings.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Image_format_settings.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Image_pusher_type.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Image_pusher_type.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Instrument_metadata.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Instrument_metadata.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Jfjoch_settings.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -35,6 +35,8 @@ Jfjoch_settings::Jfjoch_settings()
    m_Numa_policy = "";
    m_Numa_policyIsSet = false;
    m_Frontend_directory = "";
+    m_Resonet_model = "";
+    m_Resonet_modelIsSet = false;
    m_Zeromq_previewIsSet = false;
    m_Zeromq_metadataIsSet = false;
    
@@ -134,7 +136,7 @@ bool Jfjoch_settings::validate(std::stringstream& msg, const std::string& pathPr
        }

    }
-                        
+                            
    return success;
 }

@@ -179,6 +181,9 @@ bool Jfjoch_settings::operator==(const Jfjoch_settings& rhs) const
    (getFrontendDirectory() == rhs.getFrontendDirectory())
     &&
    
+    
+    ((!resonetModelIsSet() && !rhs.resonetModelIsSet()) || (resonetModelIsSet() && rhs.resonetModelIsSet() && getResonetModel() == rhs.getResonetModel())) &&
+    
    (getImagePusher() == rhs.getImagePusher())
     &&
    
@@ -221,6 +226,8 @@ void to_json(nlohmann::json& j, const Jfjoch_settings& o)
    if(o.numaPolicyIsSet())
        j["numa_policy"] = o.m_Numa_policy;
    j["frontend_directory"] = o.m_Frontend_directory;
+    if(o.resonetModelIsSet())
+        j["resonet_model"] = o.m_Resonet_model;
    j["image_pusher"] = o.m_Image_pusher;
    if(o.zeromqPreviewIsSet())
        j["zeromq_preview"] = o.m_Zeromq_preview;
@@ -283,6 +290,11 @@ void from_json(const nlohmann::json& j, Jfjoch_settings& o)
        o.m_Numa_policyIsSet = true;
    } 
    j.at("frontend_directory").get_to(o.m_Frontend_directory);
+    if(j.find("resonet_model") != j.end())
+    {
+        j.at("resonet_model").get_to(o.m_Resonet_model);
+        o.m_Resonet_modelIsSet = true;
+    } 
    j.at("image_pusher").get_to(o.m_Image_pusher);
    if(j.find("zeromq_preview") != j.end())
    {
@@ -483,6 +495,23 @@ void Jfjoch_settings::setFrontendDirectory(std::string const& value)
 {
    m_Frontend_directory = value;
 }
+std::string Jfjoch_settings::getResonetModel() const
+{
+    return m_Resonet_model;
+}
+void Jfjoch_settings::setResonetModel(std::string const& value)
+{
+    m_Resonet_model = value;
+    m_Resonet_modelIsSet = true;
+}
+bool Jfjoch_settings::resonetModelIsSet() const
+{
+    return m_Resonet_modelIsSet;
+}
+void Jfjoch_settings::unsetResonet_model()
+{
+    m_Resonet_modelIsSet = false;
+}
 org::openapitools::server::model::Image_pusher_type Jfjoch_settings::getImagePusher() const
 {
    return m_Image_pusher;
--- a/broker/gen/model/Jfjoch_settings.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -151,6 +151,13 @@ public:
    std::string getFrontendDirectory() const;
    void setFrontendDirectory(std::string const& value);
    /// <summary>
+    /// Path to Resonet model
+    /// </summary>
+    std::string getResonetModel() const;
+    void setResonetModel(std::string const& value);
+    bool resonetModelIsSet() const;
+    void unsetResonet_model();
+    /// <summary>
    /// 
    /// </summary>
    org::openapitools::server::model::Image_pusher_type getImagePusher() const;
@@ -197,6 +204,8 @@ protected:
    bool m_Numa_policyIsSet;
    std::string m_Frontend_directory;

+    std::string m_Resonet_model;
+    bool m_Resonet_modelIsSet;
    org::openapitools::server::model::Image_pusher_type m_Image_pusher;

    org::openapitools::server::model::Zeromq_preview_settings m_Zeromq_preview;
--- a/broker/gen/model/Jfjoch_statistics.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -37,6 +37,7 @@ Jfjoch_statistics::Jfjoch_statistics()
    m_Pixel_maskIsSet = false;
    m_RoiIsSet = false;
    m_Az_intIsSet = false;
+    m_BufferIsSet = false;
    
 }

@@ -101,7 +102,7 @@ bool Jfjoch_statistics::validate(std::stringstream& msg, const std::string& path
        }

    }
-                        
+                            
    return success;
 }

@@ -156,7 +157,10 @@ bool Jfjoch_statistics::operator==(const Jfjoch_statistics& rhs) const
    ((!roiIsSet() && !rhs.roiIsSet()) || (roiIsSet() && rhs.roiIsSet() && getRoi() == rhs.getRoi())) &&
    
    
-    ((!azIntIsSet() && !rhs.azIntIsSet()) || (azIntIsSet() && rhs.azIntIsSet() && getAzInt() == rhs.getAzInt()))
+    ((!azIntIsSet() && !rhs.azIntIsSet()) || (azIntIsSet() && rhs.azIntIsSet() && getAzInt() == rhs.getAzInt())) &&
+    
+    
+    ((!bufferIsSet() && !rhs.bufferIsSet()) || (bufferIsSet() && rhs.bufferIsSet() && getBuffer() == rhs.getBuffer()))
    
    ;
 }
@@ -201,6 +205,8 @@ void to_json(nlohmann::json& j, const Jfjoch_statistics& o)
        j["roi"] = o.m_Roi;
    if(o.azIntIsSet())
        j["az_int"] = o.m_Az_int;
+    if(o.bufferIsSet())
+        j["buffer"] = o.m_Buffer;
    
 }

@@ -286,6 +292,11 @@ void from_json(const nlohmann::json& j, Jfjoch_statistics& o)
        j.at("az_int").get_to(o.m_Az_int);
        o.m_Az_intIsSet = true;
    } 
+    if(j.find("buffer") != j.end())
+    {
+        j.at("buffer").get_to(o.m_Buffer);
+        o.m_BufferIsSet = true;
+    } 
    
 }

@@ -561,6 +572,23 @@ void Jfjoch_statistics::unsetAz_int()
 {
    m_Az_intIsSet = false;
 }
+org::openapitools::server::model::Image_buffer_status Jfjoch_statistics::getBuffer() const
+{
+    return m_Buffer;
+}
+void Jfjoch_statistics::setBuffer(org::openapitools::server::model::Image_buffer_status const& value)
+{
+    m_Buffer = value;
+    m_BufferIsSet = true;
+}
+bool Jfjoch_statistics::bufferIsSet() const
+{
+    return m_BufferIsSet;
+}
+void Jfjoch_statistics::unsetBuffer()
+{
+    m_BufferIsSet = false;
+}


 } // namespace org::openapitools::server::model
--- a/broker/gen/model/Jfjoch_statistics.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -35,6 +35,7 @@
 #include "Detector_status.h"
 #include "Roi_definitions.h"
 #include "Fpga_status_inner.h"
+#include "Image_buffer_status.h"
 #include "Instrument_metadata.h"
 #include <nlohmann/json.hpp>

@@ -186,6 +187,13 @@ public:
    void setAzInt(org::openapitools::server::model::Azim_int_settings const& value);
    bool azIntIsSet() const;
    void unsetAz_int();
+    /// <summary>
+    /// 
+    /// </summary>
+    org::openapitools::server::model::Image_buffer_status getBuffer() const;
+    void setBuffer(org::openapitools::server::model::Image_buffer_status const& value);
+    bool bufferIsSet() const;
+    void unsetBuffer();

    friend  void to_json(nlohmann::json& j, const Jfjoch_statistics& o);
    friend  void from_json(const nlohmann::json& j, Jfjoch_statistics& o);
@@ -222,6 +230,8 @@ protected:
    bool m_RoiIsSet;
    org::openapitools::server::model::Azim_int_settings m_Az_int;
    bool m_Az_intIsSet;
+    org::openapitools::server::model::Image_buffer_status m_Buffer;
+    bool m_BufferIsSet;
    
 };

--- a/broker/gen/model/Measurement_statistics.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Measurement_statistics.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Pcie_devices_inner.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Pcie_devices_inner.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Pixel_mask_statistics.cpp
+++ b/broker/gen/model/Pixel_mask_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Pixel_mask_statistics.h
+++ b/broker/gen/model/Pixel_mask_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Plot.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Plot.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Plots.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Plots.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Preview_settings.cpp
+++ b/broker/gen/model/Preview_settings.cpp
@@ -1,322 +0,0 @@
-/**
-* 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.35
-* Contact: filip.leonarski@psi.ch
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
-
-
-#include "Preview_settings.h"
-#include "Helpers.h"
-
-#include <sstream>
-
-namespace org::openapitools::server::model
-{
-
-Preview_settings::Preview_settings()
-{
-    m_Saturation = 0L;
-    m_Show_spots = true;
-    m_Show_spotsIsSet = false;
-    m_Show_roi = false;
-    m_Show_roiIsSet = false;
-    m_Jpeg_quality = 100L;
-    m_Jpeg_qualityIsSet = false;
-    m_Show_indexed = false;
-    m_Show_indexedIsSet = false;
-    m_Show_user_mask = false;
-    m_Show_user_maskIsSet = false;
-    m_Resolution_ring = 0.1f;
-    m_Resolution_ringIsSet = false;
-    
-}
-
-void Preview_settings::validate() const
-{
-    std::stringstream msg;
-    if (!validate(msg))
-    {
-        throw org::openapitools::server::helpers::ValidationException(msg.str());
-    }
-}
-
-bool Preview_settings::validate(std::stringstream& msg) const
-{
-    return validate(msg, "");
-}
-
-bool Preview_settings::validate(std::stringstream& msg, const std::string& pathPrefix) const
-{
-    bool success = true;
-    const std::string _pathPrefix = pathPrefix.empty() ? "Preview_settings" : pathPrefix;
-
-         
-    
-    /* Saturation */ {
-        const int64_t& value = m_Saturation;
-        const std::string currentValuePath = _pathPrefix + ".saturation";
-                
-        
-        if (value < 0ll)
-        {
-            success = false;
-            msg << currentValuePath << ": must be greater than or equal to 0;";
-        }
-        if (value > 65535ll)
-        {
-            success = false;
-            msg << currentValuePath << ": must be less than or equal to 65535;";
-        }
-
-    }
-                 
-    if (jpegQualityIsSet())
-    {
-        const int64_t& value = m_Jpeg_quality;
-        const std::string currentValuePath = _pathPrefix + ".jpegQuality";
-                
-        
-        if (value < 0ll)
-        {
-            success = false;
-            msg << currentValuePath << ": must be greater than or equal to 0;";
-        }
-        if (value > 100ll)
-        {
-            success = false;
-            msg << currentValuePath << ": must be less than or equal to 100;";
-        }
-
-    }
-                 
-    if (resolutionRingIsSet())
-    {
-        const float& value = m_Resolution_ring;
-        const std::string currentValuePath = _pathPrefix + ".resolutionRing";
-                
-        
-        if (value < static_cast<float>(0.1))
-        {
-            success = false;
-            msg << currentValuePath << ": must be greater than or equal to 0.1;";
-        }
-        if (value > static_cast<float>(100.0))
-        {
-            success = false;
-            msg << currentValuePath << ": must be less than or equal to 100.0;";
-        }
-
-    }
-    
-    return success;
-}
-
-bool Preview_settings::operator==(const Preview_settings& rhs) const
-{
-    return
-    
-    
-    (getSaturation() == rhs.getSaturation())
-     &&
-    
-    
-    ((!showSpotsIsSet() && !rhs.showSpotsIsSet()) || (showSpotsIsSet() && rhs.showSpotsIsSet() && isShowSpots() == rhs.isShowSpots())) &&
-    
-    
-    ((!showRoiIsSet() && !rhs.showRoiIsSet()) || (showRoiIsSet() && rhs.showRoiIsSet() && isShowRoi() == rhs.isShowRoi())) &&
-    
-    
-    ((!jpegQualityIsSet() && !rhs.jpegQualityIsSet()) || (jpegQualityIsSet() && rhs.jpegQualityIsSet() && getJpegQuality() == rhs.getJpegQuality())) &&
-    
-    
-    ((!showIndexedIsSet() && !rhs.showIndexedIsSet()) || (showIndexedIsSet() && rhs.showIndexedIsSet() && isShowIndexed() == rhs.isShowIndexed())) &&
-    
-    
-    ((!showUserMaskIsSet() && !rhs.showUserMaskIsSet()) || (showUserMaskIsSet() && rhs.showUserMaskIsSet() && isShowUserMask() == rhs.isShowUserMask())) &&
-    
-    
-    ((!resolutionRingIsSet() && !rhs.resolutionRingIsSet()) || (resolutionRingIsSet() && rhs.resolutionRingIsSet() && getResolutionRing() == rhs.getResolutionRing()))
-    
-    ;
-}
-
-bool Preview_settings::operator!=(const Preview_settings& rhs) const
-{
-    return !(*this == rhs);
-}
-
-void to_json(nlohmann::json& j, const Preview_settings& o)
-{
-    j = nlohmann::json::object();
-    j["saturation"] = o.m_Saturation;
-    if(o.showSpotsIsSet())
-        j["show_spots"] = o.m_Show_spots;
-    if(o.showRoiIsSet())
-        j["show_roi"] = o.m_Show_roi;
-    if(o.jpegQualityIsSet())
-        j["jpeg_quality"] = o.m_Jpeg_quality;
-    if(o.showIndexedIsSet())
-        j["show_indexed"] = o.m_Show_indexed;
-    if(o.showUserMaskIsSet())
-        j["show_user_mask"] = o.m_Show_user_mask;
-    if(o.resolutionRingIsSet())
-        j["resolution_ring"] = o.m_Resolution_ring;
-    
-}
-
-void from_json(const nlohmann::json& j, Preview_settings& o)
-{
-    j.at("saturation").get_to(o.m_Saturation);
-    if(j.find("show_spots") != j.end())
-    {
-        j.at("show_spots").get_to(o.m_Show_spots);
-        o.m_Show_spotsIsSet = true;
-    } 
-    if(j.find("show_roi") != j.end())
-    {
-        j.at("show_roi").get_to(o.m_Show_roi);
-        o.m_Show_roiIsSet = true;
-    } 
-    if(j.find("jpeg_quality") != j.end())
-    {
-        j.at("jpeg_quality").get_to(o.m_Jpeg_quality);
-        o.m_Jpeg_qualityIsSet = true;
-    } 
-    if(j.find("show_indexed") != j.end())
-    {
-        j.at("show_indexed").get_to(o.m_Show_indexed);
-        o.m_Show_indexedIsSet = true;
-    } 
-    if(j.find("show_user_mask") != j.end())
-    {
-        j.at("show_user_mask").get_to(o.m_Show_user_mask);
-        o.m_Show_user_maskIsSet = true;
-    } 
-    if(j.find("resolution_ring") != j.end())
-    {
-        j.at("resolution_ring").get_to(o.m_Resolution_ring);
-        o.m_Resolution_ringIsSet = true;
-    } 
-    
-}
-
-int64_t Preview_settings::getSaturation() const
-{
-    return m_Saturation;
-}
-void Preview_settings::setSaturation(int64_t const value)
-{
-    m_Saturation = value;
-}
-bool Preview_settings::isShowSpots() const
-{
-    return m_Show_spots;
-}
-void Preview_settings::setShowSpots(bool const value)
-{
-    m_Show_spots = value;
-    m_Show_spotsIsSet = true;
-}
-bool Preview_settings::showSpotsIsSet() const
-{
-    return m_Show_spotsIsSet;
-}
-void Preview_settings::unsetShow_spots()
-{
-    m_Show_spotsIsSet = false;
-}
-bool Preview_settings::isShowRoi() const
-{
-    return m_Show_roi;
-}
-void Preview_settings::setShowRoi(bool const value)
-{
-    m_Show_roi = value;
-    m_Show_roiIsSet = true;
-}
-bool Preview_settings::showRoiIsSet() const
-{
-    return m_Show_roiIsSet;
-}
-void Preview_settings::unsetShow_roi()
-{
-    m_Show_roiIsSet = false;
-}
-int64_t Preview_settings::getJpegQuality() const
-{
-    return m_Jpeg_quality;
-}
-void Preview_settings::setJpegQuality(int64_t const value)
-{
-    m_Jpeg_quality = value;
-    m_Jpeg_qualityIsSet = true;
-}
-bool Preview_settings::jpegQualityIsSet() const
-{
-    return m_Jpeg_qualityIsSet;
-}
-void Preview_settings::unsetJpeg_quality()
-{
-    m_Jpeg_qualityIsSet = false;
-}
-bool Preview_settings::isShowIndexed() const
-{
-    return m_Show_indexed;
-}
-void Preview_settings::setShowIndexed(bool const value)
-{
-    m_Show_indexed = value;
-    m_Show_indexedIsSet = true;
-}
-bool Preview_settings::showIndexedIsSet() const
-{
-    return m_Show_indexedIsSet;
-}
-void Preview_settings::unsetShow_indexed()
-{
-    m_Show_indexedIsSet = false;
-}
-bool Preview_settings::isShowUserMask() const
-{
-    return m_Show_user_mask;
-}
-void Preview_settings::setShowUserMask(bool const value)
-{
-    m_Show_user_mask = value;
-    m_Show_user_maskIsSet = true;
-}
-bool Preview_settings::showUserMaskIsSet() const
-{
-    return m_Show_user_maskIsSet;
-}
-void Preview_settings::unsetShow_user_mask()
-{
-    m_Show_user_maskIsSet = false;
-}
-float Preview_settings::getResolutionRing() const
-{
-    return m_Resolution_ring;
-}
-void Preview_settings::setResolutionRing(float const value)
-{
-    m_Resolution_ring = value;
-    m_Resolution_ringIsSet = true;
-}
-bool Preview_settings::resolutionRingIsSet() const
-{
-    return m_Resolution_ringIsSet;
-}
-void Preview_settings::unsetResolution_ring()
-{
-    m_Resolution_ringIsSet = false;
-}
-
-
-} // namespace org::openapitools::server::model
-
--- a/broker/gen/model/Preview_settings.h
+++ b/broker/gen/model/Preview_settings.h
@@ -1,130 +0,0 @@
-/**
-* 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.35
-* Contact: filip.leonarski@psi.ch
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
-/*
- * Preview_settings.h
- *
- * Settings for JPEG rendering of preview images
- */
-
-#ifndef Preview_settings_H_
-#define Preview_settings_H_
-
-
-#include <nlohmann/json.hpp>
-
-namespace org::openapitools::server::model
-{
-
-/// <summary>
-/// Settings for JPEG rendering of preview images
-/// </summary>
-class  Preview_settings
-{
-public:
-    Preview_settings();
-    virtual ~Preview_settings() = default;
-
-
-    /// <summary>
-    /// Validate the current data in the model. Throws a ValidationException on failure.
-    /// </summary>
-    void validate() const;
-
-    /// <summary>
-    /// Validate the current data in the model. Returns false on error and writes an error
-    /// message into the given stringstream.
-    /// </summary>
-    bool validate(std::stringstream& msg) const;
-
-    /// <summary>
-    /// Helper overload for validate. Used when one model stores another model and calls it's validate.
-    /// Not meant to be called outside that case.
-    /// </summary>
-    bool validate(std::stringstream& msg, const std::string& pathPrefix) const;
-
-    bool operator==(const Preview_settings& rhs) const;
-    bool operator!=(const Preview_settings& rhs) const;
-
-    /////////////////////////////////////////////
-    /// Preview_settings members
-
-    /// <summary>
-    /// Saturation value to set contrast in the preview image
-    /// </summary>
-    int64_t getSaturation() const;
-    void setSaturation(int64_t const value);
-    /// <summary>
-    /// Show spot finding results on the image
-    /// </summary>
-    bool isShowSpots() const;
-    void setShowSpots(bool const value);
-    bool showSpotsIsSet() const;
-    void unsetShow_spots();
-    /// <summary>
-    /// Show ROI areas on the image
-    /// </summary>
-    bool isShowRoi() const;
-    void setShowRoi(bool const value);
-    bool showRoiIsSet() const;
-    void unsetShow_roi();
-    /// <summary>
-    /// Quality of JPEG image (100 - highest; 0 - lowest)
-    /// </summary>
-    int64_t getJpegQuality() const;
-    void setJpegQuality(int64_t const value);
-    bool jpegQualityIsSet() const;
-    void unsetJpeg_quality();
-    /// <summary>
-    /// Preview indexed images only
-    /// </summary>
-    bool isShowIndexed() const;
-    void setShowIndexed(bool const value);
-    bool showIndexedIsSet() const;
-    void unsetShow_indexed();
-    /// <summary>
-    /// Show user mask
-    /// </summary>
-    bool isShowUserMask() const;
-    void setShowUserMask(bool const value);
-    bool showUserMaskIsSet() const;
-    void unsetShow_user_mask();
-    /// <summary>
-    /// 
-    /// </summary>
-    float getResolutionRing() const;
-    void setResolutionRing(float const value);
-    bool resolutionRingIsSet() const;
-    void unsetResolution_ring();
-
-    friend  void to_json(nlohmann::json& j, const Preview_settings& o);
-    friend  void from_json(const nlohmann::json& j, Preview_settings& o);
-protected:
-    int64_t m_Saturation;
-
-    bool m_Show_spots;
-    bool m_Show_spotsIsSet;
-    bool m_Show_roi;
-    bool m_Show_roiIsSet;
-    int64_t m_Jpeg_quality;
-    bool m_Jpeg_qualityIsSet;
-    bool m_Show_indexed;
-    bool m_Show_indexedIsSet;
-    bool m_Show_user_mask;
-    bool m_Show_user_maskIsSet;
-    float m_Resolution_ring;
-    bool m_Resolution_ringIsSet;
-    
-};
-
-} // namespace org::openapitools::server::model
-
-#endif /* Preview_settings_H_ */
--- a/broker/gen/model/Roi_azim_list.cpp
+++ b/broker/gen/model/Roi_azim_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_azim_list.h
+++ b/broker/gen/model/Roi_azim_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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_azimuthal.cpp
+++ b/broker/gen/model/Roi_azimuthal.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_azimuthal.h
+++ b/broker/gen/model/Roi_azimuthal.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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_box.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_box.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_box_list.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_box_list.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_circle.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_circle.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_circle_list.cpp
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/broker/gen/model/Roi_circle_list.h
+++ b/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.35
+* The version of the OpenAPI document: 1.0.0-rc.36
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
leonarski_f	2533499acc	Merge branch 'jfjoch_lite' into 'main' v1.0.0-rc.36 See merge request jungfraujoch/nextgendcu!120	2025-05-05 19:32:23 +02:00
leonarski_f	040cf08386	v1.0.0-rc.36	2025-05-05 19:32:22 +02:00
leonarski_f	759243d1bf	Merge branch '2404-test-ignore-frames' into 'main' jfjoch_tests: Add test for missing modules with data acquistion continuing See merge request jungfraujoch/nextgendcu!119	2025-04-23 17:22:11 +02:00
leonarski_f	b3898b1915	jfjoch_tests: Add test for missing modules with data acquistion continuing	2025-04-23 17:22:11 +02:00
leonarski_f	7c42c00fa9	Merge branch '2504-aq-dev-ret-handle' into 'main' jfjoch_broker: acquisition device handles ignored if module is falling behind See merge request jungfraujoch/nextgendcu!118	2025-04-23 16:01:22 +02:00
leonarski_f	5c1650e71b	jfjoch_broker: acquisition device handles ignored if module is falling behind	2025-04-23 15:13:13 +02:00