version 1.0.0-rc.28

.gitlab-ci.yml

@@ -4,7 +4,23 @@ stages:
   - synthesis
   - release
 
-build:x86:gcc:
+build:x86:gcc-11:
+  stage: build
+  variables:
+    CC: gcc
+    CXX: g++
+  tags:
+    - gcc
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-11/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release ..
+    - make -j48
+
+build:x86:gcc-12:
   stage: build
   variables:
     CC: gcc
@@ -20,6 +36,22 @@ build:x86:gcc:
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - make -j48
 
+build:x86:gcc-13:
+  stage: build
+  variables:
+    CC: gcc
+    CXX: g++
+  tags:
+    - gcc
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-13/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release ..
+    - make -j48
+
 build:x86:gcc_writer:
   stage: build
   variables:
@@ -36,6 +68,22 @@ build:x86:gcc_writer:
     - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_WRITER_ONLY=ON ..
     - make -j48
 
+build:x86:gcc_nocuda:
+  stage: build
+  variables:
+    CC: gcc
+    CXX: g++
+  tags:
+    - gcc
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-12/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_USE_CUDA=OFF ..
+    - make -j48
+
 build:x86:driver:
   stage: build
   variables:
@@ -104,7 +152,7 @@ test:x86:gcc:
     CTEST_OUTPUT_ON_FAILURE: 1
     CC: gcc
     CXX: g++
-  needs: ["build:x86:gcc"]
+  needs: ["build:x86:gcc-12"]
   dependencies: []
   tags:
     - gcc
@@ -131,7 +179,7 @@ test:x86:crystfel:
     CTEST_OUTPUT_ON_FAILURE: 1
     CC: gcc
     CXX: g++
-  needs: ["build:x86:gcc"]
+  needs: ["build:x86:gcc-12"]
   dependencies: []
   tags:
     - gcc
@@ -154,7 +202,7 @@ test:x86:xds_durin:
     CTEST_OUTPUT_ON_FAILURE: 1
     CC: gcc
     CXX: g++
-  needs: ["build:x86:gcc"]
+  needs: ["build:x86:gcc-12"]
   dependencies: []
   tags:
     - gcc
@@ -177,7 +225,7 @@ test:x86:xds_neggia:
     CTEST_OUTPUT_ON_FAILURE: 1
     CC: gcc
     CXX: g++
-  needs: ["build:x86:gcc"]
+  needs: ["build:x86:gcc-12"]
   dependencies: []
   tags:
     - gcc
@@ -200,7 +248,7 @@ test:x86:xia2.ssx:
     CTEST_OUTPUT_ON_FAILURE: 1
     CC: gcc
     CXX: g++
-  needs: ["build:x86:gcc"]
+  needs: ["build:x86:gcc-12"]
   dependencies: []
   tags:
     - gcc
@@ -236,7 +284,7 @@ synthesis:hls:
     - cd build
     - /usr/bin/cmake ..
     - make hls
-  needs: ["build:x86:gcc", "test:x86:gcc"]
+  needs: ["build:x86:gcc-12", "test:x86:gcc"]
 
 synthesis:100g:
   stage: synthesis
@@ -262,7 +310,7 @@ synthesis:100g:
     - /usr/bin/cmake ..
     - make -j4 pcie_100g
     - mv fpga/jfjoch_fpga_pcie_100g.mcs ..
-  needs: ["build:x86:gcc", "test:x86:gcc"]
+  needs: ["build:x86:gcc-12", "test:x86:gcc"]
 
 synthesis:8x10g:
   stage: synthesis
@@ -288,7 +336,7 @@ synthesis:8x10g:
     - /usr/bin/cmake ..
     - make -j4 pcie_8x10g
     - mv fpga/jfjoch_fpga_pcie_8x10g.mcs ..
-  needs: [ "build:x86:gcc", "test:x86:gcc" ]
+  needs: [ "build:x86:gcc-12", "test:x86:gcc" ]
 
 release:
   stage: release

CMakeLists.txt

@@ -11,6 +11,10 @@ SET(CMAKE_CXX_STANDARD_REQUIRED True)
 SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-deprecated-enum-enum-conversion")
 SET(CMAKE_C_FLAGS_RELEASE "-O3")
 
+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(BUILD_SHARED_LIBS OFF)
 SET(BUILD_TESTING OFF)
 
@@ -46,15 +50,19 @@ SET(CMAKE_CUDA_ARCHITECTURES 70 75 80 86 89) # V100, T4, A100, RTX A4000, L4
 SET(CMAKE_CUDA_STANDARD 17)
 SET(CMAKE_CUDA_FLAGS_RELEASE "-O3")
 
-IF (CMAKE_CUDA_COMPILER)
-    ENABLE_LANGUAGE(CUDA)
-    MESSAGE(STATUS "CUDA VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
-    ADD_COMPILE_DEFINITIONS(JFJOCH_USE_CUDA)
-    FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
-ENDIF()
+SET(JFJOCH_CUDA_AVAILABLE OFF)
 
-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)")
+IF (CMAKE_CUDA_COMPILER)
+    IF (JFJOCH_USE_CUDA)
+        ENABLE_LANGUAGE(CUDA)
+        MESSAGE(STATUS "CUDA VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
+        ADD_COMPILE_DEFINITIONS(JFJOCH_USE_CUDA)
+        FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
+        SET(JFJOCH_CUDA_AVAILABLE ON)
+    ELSE()
+        MESSAGE(WARNING "CUDA Available, but disabled by user")
+    ENDIF()
+ENDIF()
 
 INCLUDE_DIRECTORIES(include)
 INCLUDE(CheckIncludeFile)

VERSION

@@ -1 +1 @@
-1.0.0-rc.27
+1.0.0-rc.28

broker/JFJochBrokerHttp.cpp

@@ -60,18 +60,18 @@ void JFJochBrokerHttp::status_get(Pistache::Http::ResponseWriter &response) {
 
 void JFJochBrokerHttp::wait_till_done_post(const std::optional<int32_t> &timeout,
                                            Pistache::Http::ResponseWriter &response) {
-    JFJochState state;
+    BrokerStatus status;
     if (!timeout)
-        state = state_machine.WaitTillMeasurementDone(std::chrono::minutes(1));
+        status = state_machine.WaitTillMeasurementDone(std::chrono::minutes(1));
     else if ((timeout.value() > 3600) || (timeout.value() < 0)) {
         response.send(Pistache::Http::Code::Bad_Request);
         return;
     } else if (timeout.value() == 0)
-        state = state_machine.GetState();
+        status = state_machine.GetStatus();
     else
-        state = state_machine.WaitTillMeasurementDone(std::chrono::seconds(timeout.value()));
+        status = state_machine.WaitTillMeasurementDone(std::chrono::seconds(timeout.value()));
 
-    switch (state) {
+    switch (status.state) {
         case JFJochState::Idle:
             response.send(Pistache::Http::Code::Ok);
             break;
@@ -79,7 +79,7 @@ void JFJochBrokerHttp::wait_till_done_post(const std::optional<int32_t> &timeout
             response.send(Pistache::Http::Code::Bad_Gateway);
             break;
         case JFJochState::Error:
-            throw WrongDAQStateException("Detector in error state");
+            throw WrongDAQStateException(status.error.value_or("Unknown error"));
         case JFJochState::Measuring:
         case JFJochState::Busy:
         case JFJochState::Pedestal:

broker/JFJochStateMachine.cpp

@@ -82,7 +82,7 @@ void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock<std::mutex> &u
         UpdatePixelMaskStatistics(pixel_mask.GetStatistics());
     } catch (const std::exception &e) {
         logger.Error("Pedestal sequence error {}", e.what());
-        state = JFJochState::Error;
+        SetState(JFJochState::Error, e.what());
         throw;
     }
     logger.Info("Pedestal sequence done");
@@ -102,15 +102,15 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock<std::mutex> &ul
         local_experiment.StorageCellStart(0);
 
     if (cancel_sequence) {
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
         return;
     }
     if (local_experiment.GetPedestalG0Frames() == 0) {
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
         return;
     }
 
-    state = JFJochState::Pedestal;
+    SetState(JFJochState::Pedestal);
     services.ConfigureDetector(local_experiment);
     services.Start(local_experiment, pixel_mask, *calibration);
 
@@ -123,9 +123,9 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock<std::mutex> &ul
     ul.lock();
 
     if (ImportPedestalG0(pedestal_output.receiver_output))
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
     else
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
 }
 
 void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock<std::mutex> &ul, int32_t storage_cell) {
@@ -139,16 +139,16 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock<std::mutex> &ul
 
 
     if (cancel_sequence) {
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
         return;
     }
 
     if (local_experiment.GetPedestalG1Frames() == 0) {
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
         return;
     }
 
-    state = JFJochState::Pedestal;
+    SetState(JFJochState::Pedestal);
     services.ConfigureDetector(local_experiment);
     services.Start(local_experiment, pixel_mask, *calibration);
 
@@ -161,9 +161,9 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock<std::mutex> &ul
     ul.lock();
 
     if (ImportPedestalG1G2(pedestal_output.receiver_output, 1, storage_cell))
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
     else
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
 
 }
 
@@ -177,16 +177,16 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock<std::mutex> &ul
         local_experiment.StorageCellStart(15);
 
     if (cancel_sequence) {
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
         return;
     }
 
     if (local_experiment.GetPedestalG2Frames() == 0) {
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
         return;
     }
 
-    state = JFJochState::Pedestal;
+    SetState(JFJochState::Pedestal);
     services.ConfigureDetector(local_experiment);
     services.Start(local_experiment, pixel_mask, *calibration);
 
@@ -199,9 +199,9 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock<std::mutex> &ul
     ul.lock();
 
     if (ImportPedestalG1G2(pedestal_output.receiver_output, 2, storage_cell))
-        state = JFJochState::Idle;
+        SetState(JFJochState::Idle);
     else
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
 }
 
 void JFJochStateMachine::Initialize() {
@@ -213,11 +213,11 @@ void JFJochStateMachine::Initialize() {
     if (detector_setup.empty())
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Detector information not provided");
 
-    CheckError(); // Clear error, we don't care what was it
+    ResetError(); // Clear error, we don't care what was it
 
     logger.Info("Initialize");
 
-    state = JFJochState::Busy;
+    SetState(JFJochState::Busy);
 
     measurement = std::async(std::launch::async, &JFJochStateMachine::InitializeThread, this, std::move(ul));
 }
@@ -239,8 +239,8 @@ void JFJochStateMachine::PedestalThread(std::unique_lock<std::mutex> ul) {
 void JFJochStateMachine::InitializeThread(std::unique_lock<std::mutex> ul) {
     try {
         services.On(experiment);
-    } catch (...) {
-        state = JFJochState::Error;
+    } catch (const std::exception& e) {
+        SetState(JFJochState::Error, e.what());
         throw;
     }
     TakePedestalInternalAll(ul);
@@ -272,14 +272,14 @@ void JFJochStateMachine::Start(const DatasetSettings& settings) {
     experiment.IncrementRunNumber();
 
     try {
-        state = JFJochState::Busy;
+        SetState(JFJochState::Busy);
         services.SetSpotFindingSettings(GetSpotFindingSettings());
         services.Start(experiment, pixel_mask, *calibration);
 
-        state = JFJochState::Measuring;
+        SetState(JFJochState::Measuring);
         measurement = std::async(std::launch::async, &JFJochStateMachine::MeasurementThread, this);
-    } catch (...) {
-        state = JFJochState::Error;
+    } catch (const std::exception &e) {
+        SetState(JFJochState::Error, e.what());
         services.Cancel();
         throw;
     }
@@ -300,11 +300,11 @@ void JFJochStateMachine::MeasurementThread() {
         auto tmp_output = services.Stop();
         {
             std::unique_lock ul(m);
-            state = JFJochState::Idle;
+            SetState(JFJochState::Idle);
         }
-    } catch (...) {
+    } catch (const std::exception &e) {
         std::unique_lock ul(m);
-        state = JFJochState::Error;
+        SetState(JFJochState::Error, e.what());
     }
     c.notify_all();
 }
@@ -318,9 +318,9 @@ void JFJochStateMachine::Cancel() {
     }
 }
 
-void JFJochStateMachine::DebugOnly_SetState(JFJochState in_state) {
+void JFJochStateMachine::DebugOnly_SetState(JFJochState in_state, const std::optional<std::string> &error_message) {
     std::unique_lock ul(m);
-    state = in_state;
+    SetState(in_state, error_message);
 }
 
 void JFJochStateMachine::Deactivate() {
@@ -329,18 +329,15 @@ void JFJochStateMachine::Deactivate() {
         if (measurement.valid())
             measurement.get();
         services.Off();
-        state = JFJochState::Inactive;
-    } catch (...) {
-        state = JFJochState::Error;
+        SetState(JFJochState::Inactive);
+    } catch (const std::exception &e) {
+        SetState(JFJochState::Error, e.what());
         throw;
     }
 }
 
 JFJochStateMachine::~JFJochStateMachine() {
-    try {
-        if (measurement.valid())
-            measurement.get();
-    } catch (...) {}
+    ResetError();
 }
 
 std::optional<MeasurementStatistics> JFJochStateMachine::GetMeasurementStatistics() const {
@@ -400,7 +397,7 @@ void JFJochStateMachine::LoadDetectorSettings(const DetectorSettings &settings)
             ImportDetectorSettings(settings);
             break;
         case JFJochState::Idle:
-            state = JFJochState::Busy;
+            SetState(JFJochState::Busy);
             ImportDetectorSettings(settings);
             measurement = std::async(std::launch::async, &JFJochStateMachine::PedestalThread, this, std::move(ul));
             break;
@@ -416,12 +413,22 @@ DiffractionExperiment &JFJochStateMachine::NotThreadSafe_Experiment() {
 }
 
 BrokerStatus JFJochStateMachine::GetStatus() const {
-    BrokerStatus ret{};
-    ret.broker_state = state;
+    std::unique_lock ul(broker_status_mutex);
+    BrokerStatus ret = broker_status;
     ret.progress = services.GetReceiverProgress();
     return ret;
 }
 
+void JFJochStateMachine::SetState(JFJochState curr_state, const std::optional<std::string> &error_message) {
+    std::unique_lock ul(broker_status_mutex);
+    state = curr_state;
+    broker_status.state = curr_state;
+    if (error_message && curr_state == JFJochState::Error)
+        broker_status.error =  error_message;
+    else
+        broker_status.error = {};
+}
+
 MultiLinePlot JFJochStateMachine::GetPlots(const PlotRequest &request) const {
     return services.GetPlots(request);
 }
@@ -438,10 +445,6 @@ SpotFindingSettings JFJochStateMachine::GetSpotFindingSettings() const {
     return data_processing_settings;
 }
 
-JFJochState JFJochStateMachine::GetState() const {
-    return state;
-}
-
 void JFJochStateMachine::AddDetectorSetup(const DetectorSetup &setup) {
     std::unique_lock ul(m);
 
@@ -491,11 +494,12 @@ void JFJochStateMachine::SelectDetector(int64_t id) {
         experiment.Detector(detector_setup[id]);
         gain_calibration = detector_setup[id].GetGainCalibration();
         pixel_mask = PixelMask(experiment);
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
         current_detector_setup = id;
-    } catch (JFJochException &e) {
+    } catch (const JFJochException &e) {
         logger.ErrorException(e);
-        state = JFJochState::Inactive;
+        SetState(JFJochState::Inactive);
+        throw; // re-throw the exception, so it is populated to caller
     }
 }
 
@@ -528,30 +532,27 @@ bool JFJochStateMachine::IsRunning() const {
     }
 }
 
-JFJochState JFJochStateMachine::WaitTillMeasurementDone() {
+BrokerStatus JFJochStateMachine::WaitTillMeasurementDone() {
     std::unique_lock ul(m);
 
     c.wait(ul, [&] { return !IsRunning(); });
 
-    return state;
+    return GetStatus();
 }
 
-JFJochState JFJochStateMachine::WaitTillMeasurementDone(std::chrono::milliseconds timeout) {
+BrokerStatus JFJochStateMachine::WaitTillMeasurementDone(std::chrono::milliseconds timeout) {
     std::unique_lock ul(m);
 
     c.wait_for(ul, timeout, [&] { return !IsRunning(); });
 
-    return state;
+    return GetStatus();
 }
 
-std::optional<std::string> JFJochStateMachine::CheckError() {
+void JFJochStateMachine::ResetError() noexcept {
     try {
         if (measurement.valid())
             measurement.get();
-    } catch (JFJochException &e) {
-        return e.what();
-    }
-    return {};
+    } catch (...) {}
 }
 
 std::string JFJochStateMachine::GetPreviewJPEG(const PreviewJPEGSettings& settings) const {

broker/JFJochStateMachine.h

@@ -19,8 +19,9 @@
 enum class JFJochState {Inactive, Idle, Measuring, Error, Busy, Pedestal};
 
 struct BrokerStatus {
-    JFJochState broker_state;
+    JFJochState state = JFJochState::Inactive;
     std::optional<float> progress;
+    std::optional<std::string> error;
 };
 
 struct DetectorListElement {
@@ -77,7 +78,7 @@ class JFJochStateMachine {
     std::condition_variable c;
 
     // mutex m is protecting:
-    volatile JFJochState state = JFJochState::Inactive;
+    volatile JFJochState state = JFJochState::Inactive; // state should not be set directly, but through SetState function
     volatile bool cancel_sequence = false;
     std::unique_ptr<JFCalibration> calibration;
     PixelMask pixel_mask;
@@ -97,16 +98,20 @@ class JFJochStateMachine {
     mutable std::mutex pixel_mask_statistics_mutex;
     PixelMaskStatistics pixel_mask_statistics;
 
+    mutable std::mutex broker_status_mutex;
+    BrokerStatus broker_status;
+
     void UpdatePixelMaskStatistics(const PixelMaskStatistics &input);
 
     // Private functions assume that lock m is acquired
+    void SetState(JFJochState curr_state, const std::optional<std::string> &error_message = {});
     void MeasurementThread();
     void PedestalThread(std::unique_lock<std::mutex> ul);
     void InitializeThread(std::unique_lock<std::mutex> ul);
     bool ImportPedestalG1G2(const JFJochReceiverOutput &receiver_output, size_t gain_level, size_t storage_cell = 0);
     bool ImportPedestalG0(const JFJochReceiverOutput &receiver_output);
     bool IsRunning() const; // Is state Busy/Pedestal/Measure
-    std::optional<std::string> CheckError();
+    void ResetError() noexcept;
     void TakePedestalInternalAll(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG0(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG1(std::unique_lock<std::mutex> &ul, int32_t storage_cell = 0);
@@ -120,8 +125,8 @@ public:
     void Pedestal();
     void Deactivate();
     void Start(const DatasetSettings& settings);
-    JFJochState WaitTillMeasurementDone();
-    JFJochState WaitTillMeasurementDone(std::chrono::milliseconds timeout);
+    BrokerStatus WaitTillMeasurementDone();
+    BrokerStatus WaitTillMeasurementDone(std::chrono::milliseconds timeout);
     void Trigger();
 
     void Cancel();
@@ -149,8 +154,6 @@ public:
     void SetSpotFindingSettings(const SpotFindingSettings& settings);
     SpotFindingSettings GetSpotFindingSettings() const;
 
-    JFJochState GetState() const;
-
     void AddDetectorSetup(const DetectorSetup& setup);
     DetectorList GetDetectorsList() const;
     void SelectDetector(int64_t id);
@@ -170,7 +173,7 @@ public:
     DiffractionExperiment& NotThreadSafe_Experiment();
 
     // Function for debug only - UNSAFE for real operation
-    void DebugOnly_SetState(JFJochState state);
+    void DebugOnly_SetState(JFJochState state, const std::optional<std::string> &error_message = {});
 
     void SetBoxROI(const std::vector<ROIBox>& input);
     void SetCircleROI(const std::vector<ROICircle>& input);

broker/OpenAPIConvert.cpp

@@ -186,7 +186,7 @@ org::openapitools::server::model::Detector_settings Convert(const DetectorSettin
 org::openapitools::server::model::Broker_status Convert(const BrokerStatus& input) {
     org::openapitools::server::model::Broker_status ret;
 
-    switch (input.broker_state) {
+    switch (input.state) {
         case JFJochState::Inactive:
             ret.setState("Inactive");
             break;
@@ -198,6 +198,7 @@ org::openapitools::server::model::Broker_status Convert(const BrokerStatus& inpu
             break;
         case JFJochState::Error:
             ret.setState("Error");
+            ret.setErrorMessage(input.error.value_or("Unknown error"));
             break;
         case JFJochState::Busy:
             ret.setState("Busy");

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

broker/gen/api/DefaultApi.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

broker/gen/model/Azim_int_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Broker_status.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,6 +24,8 @@ Broker_status::Broker_status()
     m_State = "";
     m_Progress = 0.0f;
     m_ProgressIsSet = false;
+    m_Error_message = "";
+    m_Error_messageIsSet = false;
     
 }
 
@@ -65,7 +67,7 @@ bool Broker_status::validate(std::stringstream& msg, const std::string& pathPref
         }
 
     }
-    
+        
     return success;
 }
 
@@ -78,7 +80,10 @@ bool Broker_status::operator==(const Broker_status& rhs) const
      &&
     
     
-    ((!progressIsSet() && !rhs.progressIsSet()) || (progressIsSet() && rhs.progressIsSet() && getProgress() == rhs.getProgress()))
+    ((!progressIsSet() && !rhs.progressIsSet()) || (progressIsSet() && rhs.progressIsSet() && getProgress() == rhs.getProgress())) &&
+    
+    
+    ((!errorMessageIsSet() && !rhs.errorMessageIsSet()) || (errorMessageIsSet() && rhs.errorMessageIsSet() && getErrorMessage() == rhs.getErrorMessage()))
     
     ;
 }
@@ -94,6 +99,8 @@ void to_json(nlohmann::json& j, const Broker_status& o)
     j["state"] = o.m_State;
     if(o.progressIsSet())
         j["progress"] = o.m_Progress;
+    if(o.errorMessageIsSet())
+        j["error_message"] = o.m_Error_message;
     
 }
 
@@ -105,6 +112,11 @@ void from_json(const nlohmann::json& j, Broker_status& o)
         j.at("progress").get_to(o.m_Progress);
         o.m_ProgressIsSet = true;
     } 
+    if(j.find("error_message") != j.end())
+    {
+        j.at("error_message").get_to(o.m_Error_message);
+        o.m_Error_messageIsSet = true;
+    } 
     
 }
 
@@ -133,6 +145,23 @@ void Broker_status::unsetProgress()
 {
     m_ProgressIsSet = false;
 }
+std::string Broker_status::getErrorMessage() const
+{
+    return m_Error_message;
+}
+void Broker_status::setErrorMessage(std::string const& value)
+{
+    m_Error_message = value;
+    m_Error_messageIsSet = true;
+}
+bool Broker_status::errorMessageIsSet() const
+{
+    return m_Error_messageIsSet;
+}
+void Broker_status::unsetError_message()
+{
+    m_Error_messageIsSet = false;
+}
 
 
 } // namespace org::openapitools::server::model

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.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -70,6 +70,13 @@ public:
     void setProgress(float const value);
     bool progressIsSet() const;
     void unsetProgress();
+    /// <summary>
+    /// Last error message in case detector is in the Error state This matters especially for async functions (start/initialize), where API won&#39;t return reason for the error during async operation. 
+    /// </summary>
+    std::string getErrorMessage() const;
+    void setErrorMessage(std::string const& value);
+    bool errorMessageIsSet() const;
+    void unsetError_message();
 
     friend  void to_json(nlohmann::json& j, const Broker_status& o);
     friend  void from_json(const nlohmann::json& j, Broker_status& o);
@@ -78,6 +85,8 @@ protected:
 
     float m_Progress;
     bool m_ProgressIsSet;
+    std::string m_Error_message;
+    bool m_Error_messageIsSet;
     
 };
 

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

broker/gen/model/Calibration_statistics_inner.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings_unit_cell.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Dataset_settings_unit_cell.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

broker/gen/model/Detector_list.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_list_detectors_inner.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

broker/gen/model/Detector_module.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module_direction.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_module_direction.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_power_state.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_power_state.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_selection.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_state.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_state.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_status.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_timing.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Detector_type.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Error_message.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Fpga_status_inner.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Fpga_status_inner.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Helpers.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_format_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_format_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_pusher_type.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Image_pusher_type.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Instrument_metadata.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Instrument_metadata.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Jfjoch_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

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

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

broker/gen/model/Measurement_statistics.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pcie_devices_inner.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pcie_devices_inner.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Pixel_mask_statistics.cpp

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

broker/gen/model/Pixel_mask_statistics.h

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

broker/gen/model/Plot.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plot.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plots.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Plots.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Preview_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Preview_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box_list.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_box_list.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle_list.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Roi_circle_list.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Rotation_axis.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Rotation_axis.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Spot_finding_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Spot_finding_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

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

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

broker/gen/model/Zeromq_preview_settings.cpp

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

broker/gen/model/Zeromq_preview_settings.h

@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.27
+* The version of the OpenAPI document: 1.0.0-rc.28
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

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

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

broker/jfjoch_api.yaml

@@ -5,7 +5,7 @@ info:
     API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).
     Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.
     Jungfraujoch uses FPGA boards to acquire data at high data rates.
-  version: 1.0.0-rc.27
+  version: 1.0.0-rc.28
   contact:
     name: Filip Leonarski (Paul Scherrer Institute)
     email: filip.leonarski@psi.ch
@@ -806,6 +806,12 @@ components:
           example: 1.0
           minimum: 0.0
           maximum: 1.0
+        error_message:
+          type: string
+          description: |
+            Last error message in case detector is in the Error state
+            This matters especially for async functions (start/initialize), where API won't return reason
+            for the error during async operation.
     plot:
       type: object
       required:

common/CMakeLists.txt

@@ -79,7 +79,7 @@ TARGET_LINK_LIBRARIES(JFJochCommon JFJochLogger Compression JFCalibration Thread
 
 TARGET_LINK_LIBRARIES(JFJochZMQ "$<BUILD_INTERFACE:libzmq-static>")
 
-IF (CMAKE_CUDA_COMPILER)
+IF (JFJOCH_CUDA_AVAILABLE)
     TARGET_SOURCES(JFJochCommon PRIVATE CUDAWrapper.cu )
     TARGET_LINK_LIBRARIES(JFJochCommon ${CUDART_LIBRARY} ${CMAKE_DL_LIBS} rt)
 ENDIF()

docs/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.0.0-rc.28
+* jfjoch_broker: save error message for initialization and data collection and provide these with OpenAPI
+* jfjoch_broker: fixed issue when in error state, response to /wait_till_done was not complaint to OpenAPI specs 
+* jfjoch_test: remove header that failed when CUDA is absent during compilation
+* frontend: add soft trigger button in data collection tab
+* frontend: show error message when in error state
+* CMake: add option to force compilation without CUDA (-DJFJOCH_USE_CUDA=OFF)
+
 ## 1.0.0-rc.27
 * jfjoch_broker: add option to select electron source in instrument metadata, adapt wavelength calculation
 * jfjoch_broker: update pistache web server version

docs/conf.py

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

docs/python_client/README.md

@@ -1,4 +1,4 @@
-# jfjochclient
+# jfjoch-client
 API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).
 Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.
 Jungfraujoch uses FPGA boards to acquire data at high data rates.
@@ -6,8 +6,8 @@ Jungfraujoch uses FPGA boards to acquire data at high data rates.
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.0.0-rc.27
-- Package version: 1.0.0-rc.27
+- API version: 1.0.0-rc.28
+- Package version: 1.0.0-rc.28
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
@@ -21,13 +21,13 @@ Python 3.7+
 If the python package is hosted on a repository, you can install directly using:
 
 ```sh
-pip install git+https://gitlab.psi.ch/jungfraujoch/nextgendcu.git
+pip install git+https://git.psi.ch/jungfraujoch/jungfraujoch.git
 ```
-(you may need to run `pip` with root permission: `sudo pip install git+https://gitlab.psi.ch/jungfraujoch/nextgendcu.git`)
+(you may need to run `pip` with root permission: `sudo pip install git+https://git.psi.ch/jungfraujoch/jungfraujoch.git`)
 
 Then import the package:
 ```python
-import jfjochclient
+import jfjoch_client
 ```
 
 ### Setuptools
@@ -41,7 +41,7 @@ python setup.py install --user
 
 Then import the package:
 ```python
-import jfjochclient
+import jfjoch_client
 ```
 
 ### Tests
@@ -54,22 +54,22 @@ Please follow the [installation procedure](#installation--usage) and then run th
 
 ```python
 
-import jfjochclient
-from jfjochclient.rest import ApiException
+import jfjoch_client
+from jfjoch_client.rest import ApiException
 from pprint import pprint
 
 # Defining the host is optional and defaults to http://localhost:5232
 # See configuration.py for a list of all supported configuration parameters.
-configuration = jfjochclient.Configuration(
+configuration = jfjoch_client.Configuration(
     host = "http://localhost:5232"
 )
 
 
 
 # Enter a context with an instance of the API client
-with jfjochclient.ApiClient(configuration) as api_client:
+with jfjoch_client.ApiClient(configuration) as api_client:
     # Create an instance of the API class
-    api_instance = jfjochclient.DefaultApi(api_client)
+    api_instance = jfjoch_client.DefaultApi(api_client)
 
     try:
         # Cancel running data collection

docs/python_client/docs/AzimIntSettings.md

@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 ## Example
 
 ```python
-from jfjochclient.models.azim_int_settings import AzimIntSettings
+from jfjoch_client.models.azim_int_settings import AzimIntSettings
 
 # TODO update the JSON string below
 json = "{}"

docs/python_client/docs/BrokerStatus.md

@@ -7,11 +7,12 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **state** | **str** |  | 
 **progress** | **float** | Progress of data collection (only available if receiving is running) | [optional] 
+**error_message** | **str** | Last error message in case detector is in the Error state This matters especially for async functions (start/initialize), where API won't return reason for the error during async operation.  | [optional] 
 
 ## Example
 
 ```python
-from jfjochclient.models.broker_status import BrokerStatus
+from jfjoch_client.models.broker_status import BrokerStatus
 
 # TODO update the JSON string below
 json = "{}"