From 95eaad3d35cf0079b7fdf2351f50ba21bec25acc Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Tue, 8 Oct 2024 21:04:09 +0200 Subject: [PATCH] version 1.0.0-rc.15 --- VERSION | 2 +- broker/JFJochBrokerHttp.cpp | 2 + broker/JFJochServices.cpp | 8 +- broker/JFJochServices.h | 3 +- broker/JFJochStateMachine.cpp | 82 ++--------------- broker/JFJochStateMachine.h | 7 -- broker/OpenAPIConvert.cpp | 3 +- broker/gen/api/ApiBase.h | 2 +- broker/gen/api/DefaultApi.cpp | 2 +- broker/gen/api/DefaultApi.h | 2 +- broker/gen/model/Azim_int_settings.cpp | 2 +- broker/gen/model/Azim_int_settings.h | 2 +- broker/gen/model/Broker_status.cpp | 52 +---------- broker/gen/model/Broker_status.h | 13 +-- .../model/Calibration_statistics_inner.cpp | 2 +- .../gen/model/Calibration_statistics_inner.h | 2 +- broker/gen/model/Dataset_settings.cpp | 2 +- broker/gen/model/Dataset_settings.h | 2 +- .../gen/model/Dataset_settings_unit_cell.cpp | 2 +- broker/gen/model/Dataset_settings_unit_cell.h | 2 +- broker/gen/model/Detector.cpp | 2 +- broker/gen/model/Detector.h | 2 +- broker/gen/model/Detector_list.cpp | 2 +- broker/gen/model/Detector_list.h | 2 +- .../model/Detector_list_detectors_inner.cpp | 2 +- .../gen/model/Detector_list_detectors_inner.h | 2 +- broker/gen/model/Detector_module.cpp | 2 +- broker/gen/model/Detector_module.h | 2 +- .../gen/model/Detector_module_direction.cpp | 2 +- broker/gen/model/Detector_module_direction.h | 2 +- broker/gen/model/Detector_selection.cpp | 2 +- broker/gen/model/Detector_selection.h | 2 +- broker/gen/model/Detector_settings.cpp | 2 +- broker/gen/model/Detector_settings.h | 2 +- broker/gen/model/Detector_status.cpp | 2 +- broker/gen/model/Detector_status.h | 2 +- broker/gen/model/Detector_type.cpp | 2 +- broker/gen/model/Detector_type.h | 2 +- broker/gen/model/Error_message.cpp | 2 +- broker/gen/model/Error_message.h | 2 +- broker/gen/model/Fpga_status_inner.cpp | 18 +++- broker/gen/model/Fpga_status_inner.h | 9 +- broker/gen/model/Helpers.cpp | 2 +- broker/gen/model/Helpers.h | 2 +- broker/gen/model/Image_format_settings.cpp | 2 +- broker/gen/model/Image_format_settings.h | 2 +- broker/gen/model/Image_pusher_type.cpp | 2 +- broker/gen/model/Image_pusher_type.h | 2 +- broker/gen/model/Instrument_metadata.cpp | 2 +- broker/gen/model/Instrument_metadata.h | 2 +- broker/gen/model/Jfjoch_settings.cpp | 2 +- broker/gen/model/Jfjoch_settings.h | 2 +- broker/gen/model/Measurement_statistics.cpp | 2 +- broker/gen/model/Measurement_statistics.h | 2 +- broker/gen/model/Pcie_devices_inner.cpp | 2 +- broker/gen/model/Pcie_devices_inner.h | 2 +- broker/gen/model/Plot.cpp | 2 +- broker/gen/model/Plot.h | 2 +- broker/gen/model/Plots.cpp | 2 +- broker/gen/model/Plots.h | 2 +- broker/gen/model/Preview_settings.cpp | 2 +- broker/gen/model/Preview_settings.h | 2 +- broker/gen/model/Roi_box.cpp | 2 +- broker/gen/model/Roi_box.h | 2 +- broker/gen/model/Roi_box_list.cpp | 2 +- broker/gen/model/Roi_box_list.h | 2 +- broker/gen/model/Roi_circle.cpp | 2 +- broker/gen/model/Roi_circle.h | 2 +- broker/gen/model/Roi_circle_list.cpp | 2 +- broker/gen/model/Roi_circle_list.h | 2 +- broker/gen/model/Rotation_axis.cpp | 2 +- broker/gen/model/Rotation_axis.h | 2 +- broker/gen/model/Spot_finding_settings.cpp | 2 +- broker/gen/model/Spot_finding_settings.h | 2 +- .../gen/model/Standard_detector_geometry.cpp | 2 +- broker/gen/model/Standard_detector_geometry.h | 2 +- broker/gen/model/Zeromq_settings.cpp | 2 +- broker/gen/model/Zeromq_settings.h | 2 +- broker/jfjoch_api.yaml | 13 ++- broker/redoc-static.html | 8 +- detector_control/DetectorWrapper.cpp | 12 ++- fpga/pcie_driver/dkms.conf | 2 +- fpga/pcie_driver/jfjoch_drv.c | 2 +- fpga/pcie_driver/jfjoch_fpga.h | 1 + fpga/pcie_driver/jfjoch_function.c | 5 ++ fpga/pcie_driver/postinstall.sh | 2 +- fpga/pcie_driver/preuninstall.sh | 2 +- frontend/src/components/FpgaStatus.tsx | 11 ++- frontend/src/components/StatusBar.tsx | 6 +- frontend/src/openapi/core/OpenAPI.ts | 2 +- frontend/src/openapi/models/broker_status.ts | 4 +- frontend/src/openapi/models/fpga_status.ts | 1 + frontend/src/version.ts | 2 +- jungfrau/JFPedestalCalc.cpp | 17 ++++ jungfrau/JFPedestalCalc.h | 5 +- python-client/README.md | 2 +- python-client/docs/BrokerStatus.md | 3 +- python-client/docs/FpgaStatusInner.md | 1 + python-client/openapi_client/__init__.py | 2 +- .../openapi_client/api/default_api.py | 2 +- python-client/openapi_client/api_client.py | 2 +- python-client/openapi_client/configuration.py | 4 +- python-client/openapi_client/exceptions.py | 2 +- .../openapi_client/models/__init__.py | 2 +- .../models/azim_int_settings.py | 2 +- .../openapi_client/models/broker_status.py | 10 +-- .../models/calibration_statistics_inner.py | 2 +- .../openapi_client/models/dataset_settings.py | 2 +- .../models/dataset_settings_unit_cell.py | 2 +- .../openapi_client/models/detector.py | 2 +- .../openapi_client/models/detector_list.py | 2 +- .../models/detector_list_detectors_inner.py | 2 +- .../openapi_client/models/detector_module.py | 2 +- .../models/detector_module_direction.py | 2 +- .../models/detector_selection.py | 2 +- .../models/detector_settings.py | 2 +- .../openapi_client/models/detector_status.py | 2 +- .../openapi_client/models/detector_type.py | 2 +- .../openapi_client/models/error_message.py | 2 +- .../models/fpga_status_inner.py | 10 ++- .../models/image_format_settings.py | 2 +- .../models/image_pusher_type.py | 2 +- .../models/instrument_metadata.py | 2 +- .../openapi_client/models/jfjoch_settings.py | 2 +- .../models/measurement_statistics.py | 2 +- .../models/pcie_devices_inner.py | 2 +- python-client/openapi_client/models/plot.py | 2 +- python-client/openapi_client/models/plots.py | 2 +- .../openapi_client/models/preview_settings.py | 2 +- .../openapi_client/models/roi_box.py | 2 +- .../openapi_client/models/roi_box_list.py | 2 +- .../openapi_client/models/roi_circle.py | 2 +- .../openapi_client/models/roi_circle_list.py | 2 +- .../openapi_client/models/rotation_axis.py | 2 +- .../models/spot_finding_settings.py | 2 +- .../models/standard_detector_geometry.py | 2 +- .../openapi_client/models/zeromq_settings.py | 2 +- python-client/openapi_client/rest.py | 2 +- python-client/setup.py | 2 +- receiver/JFJochReceiver.cpp | 82 ++++++++--------- receiver/JFJochReceiverCurrentStatus.cpp | 21 +++++ receiver/JFJochReceiverCurrentStatus.h | 6 +- receiver/JFJochReceiverService.cpp | 4 + receiver/JFJochReceiverService.h | 1 + tests/FPGAHostWriterTest.cpp | 3 +- tests/FPGAIntegrationTest.cpp | 90 ++++++++++++++++--- tests/JFJochReceiverProcessingTest.cpp | 6 ++ tests/ZMQImagePusherTest.cpp | 11 ++- writer/gen/api/ApiBase.h | 2 +- writer/gen/api/DefaultApi.cpp | 2 +- writer/gen/api/DefaultApi.h | 2 +- writer/gen/model/Helpers.cpp | 2 +- writer/gen/model/Helpers.h | 2 +- writer/gen/model/Writer_statistics.cpp | 2 +- writer/gen/model/Writer_statistics.h | 2 +- writer/writer_api.yaml | 2 +- 156 files changed, 402 insertions(+), 372 deletions(-) diff --git a/VERSION b/VERSION index e899313d..ceb7a602 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc.14 +1.0.0-rc.15 diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index 8abe8bca..8ccf00af 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -44,6 +44,8 @@ void JFJochBrokerHttp::initialize_post(Pistache::Http::ResponseWriter &response) void JFJochBrokerHttp::start_post(const org::openapitools::server::model::Dataset_settings &datasetSettings, Pistache::Http::ResponseWriter &response) { + nlohmann::json j = datasetSettings; + logger.Info("Start {}", j.dump()); state_machine.Start(Convert(datasetSettings)); response.send(Pistache::Http::Code::Ok); } diff --git a/broker/JFJochServices.cpp b/broker/JFJochServices.cpp index 5ceb8e14..30d27749 100644 --- a/broker/JFJochServices.cpp +++ b/broker/JFJochServices.cpp @@ -118,12 +118,18 @@ JFJochServices &JFJochServices::Receiver(JFJochReceiverService *input) { return *this; } -std::optional JFJochServices::GetReceiverStatus() { +std::optional JFJochServices::GetReceiverStatus() const { if (receiver == nullptr) return {}; return receiver->GetStatus(); } +std::optional JFJochServices::GetReceiverProgress() const { + if (receiver == nullptr) + return {}; + return receiver->GetProgress(); +} + MultiLinePlot JFJochServices::GetPlots(const PlotRequest &request) { if (receiver == nullptr) return {}; diff --git a/broker/JFJochServices.h b/broker/JFJochServices.h index 82d1448b..446c4f57 100644 --- a/broker/JFJochServices.h +++ b/broker/JFJochServices.h @@ -33,7 +33,8 @@ public: void LoadInternalGeneratorImage(const DiffractionExperiment &experiment, const std::vector &image, uint64_t image_number); - std::optional GetReceiverStatus(); + std::optional GetReceiverStatus() const; + std::optional GetReceiverProgress() const; MultiLinePlot GetPlots(const PlotRequest &request); void SetSpotFindingSettings(const SpotFindingSettings &settings); diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp index 9c02ada2..49b40a3f 100644 --- a/broker/JFJochStateMachine.cpp +++ b/broker/JFJochStateMachine.cpp @@ -54,7 +54,7 @@ void JFJochStateMachine::TakePedestalInternalAll(std::unique_lock &u for (int i = 0; i < gain_calibration.size(); i++) calibration->GainCalibration(i) = gain_calibration[i]; } - + cancel_sequence = false; logger.Info("Pedestal sequence started"); @@ -111,7 +111,6 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock &ul auto pedestal_output = services.Stop(); ul.lock(); - SetFullMeasurementOutput(pedestal_output); if (ImportPedestalG0(pedestal_output.receiver_output)) state = JFJochState::Idle; else @@ -150,7 +149,6 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock &ul auto pedestal_output = services.Stop(); ul.lock(); - SetFullMeasurementOutput(pedestal_output); if (ImportPedestalG1G2(pedestal_output.receiver_output, 1, storage_cell)) state = JFJochState::Idle; else @@ -189,7 +187,6 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock &ul auto pedestal_output = services.Stop(); ul.lock(); - SetFullMeasurementOutput(pedestal_output); if (ImportPedestalG1G2(pedestal_output.receiver_output, 2, storage_cell)) state = JFJochState::Idle; else @@ -211,7 +208,6 @@ void JFJochStateMachine::Initialize() { state = JFJochState::Busy; - ClearMeasurementStatistics(); measurement = std::async(std::launch::async, &JFJochStateMachine::InitializeThread, this, std::move(ul)); } @@ -256,8 +252,6 @@ void JFJochStateMachine::Start(const DatasetSettings& settings) { experiment.ImportDatasetSettings(settings); - ClearAndSetMeasurementStatistics(); - cancel_sequence = false; if (experiment.GetStorageCellNumber() == 1) experiment.StorageCellStart(15); @@ -283,7 +277,6 @@ void JFJochStateMachine::Start(const DatasetSettings& settings) { void JFJochStateMachine::MeasurementThread() { try { auto tmp_output = services.Stop(); - SetFullMeasurementOutput(tmp_output); { std::unique_lock ul(m); state = JFJochState::Idle; @@ -329,10 +322,8 @@ JFJochStateMachine::~JFJochStateMachine() { } catch (...) {} } -void JFJochStateMachine::SetFullMeasurementOutput(const JFJochServicesOutput &output) { - std::unique_lock ul(last_receiver_output_mutex); - - MeasurementStatistics tmp{}; // reset last measurement statistics +std::optional JFJochStateMachine::GetMeasurementStatistics() const { + MeasurementStatistics tmp{}; tmp.file_prefix = experiment.GetFilePrefix(); tmp.run_number = experiment.GetRunNumber(); @@ -344,59 +335,8 @@ void JFJochStateMachine::SetFullMeasurementOutput(const JFJochServicesOutput &ou tmp.images_expected = experiment.GetImageNum(); tmp.unit_cell = experiment.GetUnitCellString(); - - tmp.compression_ratio = output.receiver_output.status.compressed_ratio; - tmp.collection_efficiency = output.receiver_output.efficiency; - tmp.images_collected = output.receiver_output.status.images_collected; - tmp.images_sent = output.receiver_output.status.images_sent; - tmp.images_skipped = output.receiver_output.status.images_skipped; - tmp.cancelled = output.receiver_output.status.cancelled; - tmp.max_image_number_sent = output.receiver_output.status.max_image_number_sent; - tmp.max_receive_delay = output.receiver_output.status.max_receive_delay; - tmp.indexing_rate = output.receiver_output.status.indexing_rate; - tmp.bkg_estimate = output.receiver_output.status.bkg_estimate; - - measurement_statistics = tmp; -} - -void JFJochStateMachine::ClearAndSetMeasurementStatistics() { - std::unique_lock ul(last_receiver_output_mutex); - MeasurementStatistics tmp{}; - - tmp.file_prefix = experiment.GetFilePrefix(); - tmp.run_number = experiment.GetRunNumber(); - tmp.experiment_group = experiment.GetExperimentGroup(); - - tmp.detector_height = experiment.GetXPixelsNum(); - tmp.detector_width = experiment.GetYPixelsNum(); - tmp.detector_pixel_depth = experiment.GetByteDepthImage(); - tmp.images_expected = experiment.GetImageNum(); - tmp.unit_cell = experiment.GetUnitCellString(); - - measurement_statistics = tmp; -} - -void JFJochStateMachine::ClearMeasurementStatistics() { - std::unique_lock ul(last_receiver_output_mutex); - measurement_statistics.reset(); -} - -std::optional JFJochStateMachine::GetMeasurementStatistics() const { - auto rcv_status = services.GetReceiverStatus(); if (rcv_status) { - MeasurementStatistics tmp; - - tmp.file_prefix = experiment.GetFilePrefix(); - tmp.run_number = experiment.GetRunNumber(); - tmp.experiment_group = experiment.GetExperimentGroup(); - - tmp.detector_width = experiment.GetXPixelsNum(); - tmp.detector_height = experiment.GetYPixelsNum(); - tmp.detector_pixel_depth = experiment.GetByteDepthImage(); - tmp.images_expected = experiment.GetImageNum(); - tmp.unit_cell = experiment.GetUnitCellString(); - tmp.compression_ratio = rcv_status->compressed_ratio; tmp.images_collected = rcv_status->images_collected; tmp.images_sent = rcv_status->images_sent; @@ -406,11 +346,9 @@ std::optional JFJochStateMachine::GetMeasurementStatistic tmp.max_receive_delay = rcv_status->max_receive_delay; tmp.indexing_rate = rcv_status->indexing_rate; tmp.bkg_estimate = rcv_status->bkg_estimate; - return tmp; - } else { - std::unique_lock ul(last_receiver_output_mutex); - return measurement_statistics; + tmp.collection_efficiency = rcv_status->efficiency; } + return tmp; } std::vector JFJochStateMachine::GetCalibrationStatistics() const { @@ -454,16 +392,8 @@ DiffractionExperiment &JFJochStateMachine::NotThreadSafe_Experiment() { BrokerStatus JFJochStateMachine::GetStatus() const { BrokerStatus ret{}; - ret.broker_state = state; - try { - auto rcv_status = services.GetReceiverStatus(); - if (rcv_status) { - ret.progress = rcv_status.value().progress; - ret.indexing_rate = rcv_status.value().indexing_rate; - } - } catch (JFJochException &e) {} // ignore exception in getting receiver status (don't really care, e.g. if receiver is down) - + ret.progress = services.GetReceiverProgress(); return ret; } diff --git a/broker/JFJochStateMachine.h b/broker/JFJochStateMachine.h index b6a5a2a8..f7b29149 100644 --- a/broker/JFJochStateMachine.h +++ b/broker/JFJochStateMachine.h @@ -20,7 +20,6 @@ enum class JFJochState {Inactive, Idle, Measuring, Error, Busy, Pedestal}; struct BrokerStatus { JFJochState broker_state; std::optional progress; - std::optional indexing_rate; }; struct DetectorListElement { @@ -89,12 +88,6 @@ class JFJochStateMachine { mutable std::mutex calibration_statistics_mutex; std::vector calibration_statistics; - mutable std::mutex last_receiver_output_mutex; - std::optional measurement_statistics; - void SetFullMeasurementOutput(const JFJochServicesOutput &output); - void ClearMeasurementStatistics(); - void ClearAndSetMeasurementStatistics(); - mutable std::mutex data_processing_settings_mutex; SpotFindingSettings data_processing_settings; diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp index d5401fc4..11174f64 100644 --- a/broker/OpenAPIConvert.cpp +++ b/broker/OpenAPIConvert.cpp @@ -153,8 +153,6 @@ org::openapitools::server::model::Broker_status Convert(const BrokerStatus& inpu } if (input.progress.has_value()) ret.setProgress(input.progress.value()); - if (input.indexing_rate.has_value() && (input.indexing_rate >= 0.0)) - ret.setIndexingRate(input.indexing_rate.value()); return ret; } @@ -477,6 +475,7 @@ std::vector Convert(const s tmp.setHbmTempC(static_cast(d.hbm_0_temp_C)); tmp.setPowerUsageW(static_cast(d.fpga_pcie_12V_I_mA * d.fpga_pcie_12V_V_mV + d.fpga_pcie_3p3V_I_mA * d.fpga_pcie_3p3V_V_mV) / (1000.0f * 1000.0f)); + tmp.setIdle(d.idle); ret.emplace_back(std::move(tmp)); } return ret; diff --git a/broker/gen/api/ApiBase.h b/broker/gen/api/ApiBase.h index f4eb541e..2d548d8c 100644 --- a/broker/gen/api/ApiBase.h +++ b/broker/gen/api/ApiBase.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/api/DefaultApi.cpp b/broker/gen/api/DefaultApi.cpp index 2dfb2310..37a7dced 100644 --- a/broker/gen/api/DefaultApi.cpp +++ b/broker/gen/api/DefaultApi.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/api/DefaultApi.h b/broker/gen/api/DefaultApi.h index f9087e45..cfeff5ed 100644 --- a/broker/gen/api/DefaultApi.h +++ b/broker/gen/api/DefaultApi.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Azim_int_settings.cpp b/broker/gen/model/Azim_int_settings.cpp index 4112b86b..71907afe 100644 --- a/broker/gen/model/Azim_int_settings.cpp +++ b/broker/gen/model/Azim_int_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Azim_int_settings.h b/broker/gen/model/Azim_int_settings.h index 7f2c240b..3f764f30 100644 --- a/broker/gen/model/Azim_int_settings.h +++ b/broker/gen/model/Azim_int_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Broker_status.cpp b/broker/gen/model/Broker_status.cpp index c4a10804..2a3477c5 100644 --- a/broker/gen/model/Broker_status.cpp +++ b/broker/gen/model/Broker_status.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,8 +24,6 @@ Broker_status::Broker_status() m_State = ""; m_Progress = 0.0f; m_ProgressIsSet = false; - m_Indexing_rate = 0.0f; - m_Indexing_rateIsSet = false; } @@ -55,25 +53,6 @@ bool Broker_status::validate(std::stringstream& msg, const std::string& pathPref const std::string currentValuePath = _pathPrefix + ".progress"; - if (value < static_cast(0.0)) - { - success = false; - msg << currentValuePath << ": must be greater than or equal to 0.0;"; - } - if (value > static_cast(1.0)) - { - success = false; - msg << currentValuePath << ": must be less than or equal to 1.0;"; - } - - } - - if (indexingRateIsSet()) - { - const float& value = m_Indexing_rate; - const std::string currentValuePath = _pathPrefix + ".indexingRate"; - - if (value < static_cast(0.0)) { success = false; @@ -99,10 +78,7 @@ bool Broker_status::operator==(const Broker_status& rhs) const && - ((!progressIsSet() && !rhs.progressIsSet()) || (progressIsSet() && rhs.progressIsSet() && getProgress() == rhs.getProgress())) && - - - ((!indexingRateIsSet() && !rhs.indexingRateIsSet()) || (indexingRateIsSet() && rhs.indexingRateIsSet() && getIndexingRate() == rhs.getIndexingRate())) + ((!progressIsSet() && !rhs.progressIsSet()) || (progressIsSet() && rhs.progressIsSet() && getProgress() == rhs.getProgress())) ; } @@ -118,8 +94,6 @@ 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.indexingRateIsSet()) - j["indexing_rate"] = o.m_Indexing_rate; } @@ -131,11 +105,6 @@ 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("indexing_rate") != j.end()) - { - j.at("indexing_rate").get_to(o.m_Indexing_rate); - o.m_Indexing_rateIsSet = true; - } } @@ -164,23 +133,6 @@ void Broker_status::unsetProgress() { m_ProgressIsSet = false; } -float Broker_status::getIndexingRate() const -{ - return m_Indexing_rate; -} -void Broker_status::setIndexingRate(float const value) -{ - m_Indexing_rate = value; - m_Indexing_rateIsSet = true; -} -bool Broker_status::indexingRateIsSet() const -{ - return m_Indexing_rateIsSet; -} -void Broker_status::unsetIndexing_rate() -{ - m_Indexing_rateIsSet = false; -} } // namespace org::openapitools::server::model diff --git a/broker/gen/model/Broker_status.h b/broker/gen/model/Broker_status.h index bf182df9..178b21ee 100644 --- a/broker/gen/model/Broker_status.h +++ b/broker/gen/model/Broker_status.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -64,19 +64,12 @@ public: std::string getState() const; void setState(std::string const& value); /// - /// + /// Progress of data collection (only available if receiving is running) /// float getProgress() const; void setProgress(float const value); bool progressIsSet() const; void unsetProgress(); - /// - /// - /// - float getIndexingRate() const; - void setIndexingRate(float const value); - bool indexingRateIsSet() const; - void unsetIndexing_rate(); friend void to_json(nlohmann::json& j, const Broker_status& o); friend void from_json(const nlohmann::json& j, Broker_status& o); @@ -85,8 +78,6 @@ protected: float m_Progress; bool m_ProgressIsSet; - float m_Indexing_rate; - bool m_Indexing_rateIsSet; }; diff --git a/broker/gen/model/Calibration_statistics_inner.cpp b/broker/gen/model/Calibration_statistics_inner.cpp index 6dfec699..dcca7dea 100644 --- a/broker/gen/model/Calibration_statistics_inner.cpp +++ b/broker/gen/model/Calibration_statistics_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Calibration_statistics_inner.h b/broker/gen/model/Calibration_statistics_inner.h index 3502ef04..a38be993 100644 --- a/broker/gen/model/Calibration_statistics_inner.h +++ b/broker/gen/model/Calibration_statistics_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Dataset_settings.cpp b/broker/gen/model/Dataset_settings.cpp index 0e74b7e5..4b508a13 100644 --- a/broker/gen/model/Dataset_settings.cpp +++ b/broker/gen/model/Dataset_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Dataset_settings.h b/broker/gen/model/Dataset_settings.h index 4d0fe337..2ae87c59 100644 --- a/broker/gen/model/Dataset_settings.h +++ b/broker/gen/model/Dataset_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Dataset_settings_unit_cell.cpp b/broker/gen/model/Dataset_settings_unit_cell.cpp index 39ec5915..9ce89e33 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.cpp +++ b/broker/gen/model/Dataset_settings_unit_cell.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Dataset_settings_unit_cell.h b/broker/gen/model/Dataset_settings_unit_cell.h index cee03653..8c536768 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.h +++ b/broker/gen/model/Dataset_settings_unit_cell.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector.cpp b/broker/gen/model/Detector.cpp index cd8bfb76..68d8a472 100644 --- a/broker/gen/model/Detector.cpp +++ b/broker/gen/model/Detector.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector.h b/broker/gen/model/Detector.h index e5451131..e0d9e2c4 100644 --- a/broker/gen/model/Detector.h +++ b/broker/gen/model/Detector.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_list.cpp b/broker/gen/model/Detector_list.cpp index a8163653..3a3c29ff 100644 --- a/broker/gen/model/Detector_list.cpp +++ b/broker/gen/model/Detector_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_list.h b/broker/gen/model/Detector_list.h index 6d7adcfc..581d005a 100644 --- a/broker/gen/model/Detector_list.h +++ b/broker/gen/model/Detector_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_list_detectors_inner.cpp b/broker/gen/model/Detector_list_detectors_inner.cpp index 2619f34d..aa432fed 100644 --- a/broker/gen/model/Detector_list_detectors_inner.cpp +++ b/broker/gen/model/Detector_list_detectors_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_list_detectors_inner.h b/broker/gen/model/Detector_list_detectors_inner.h index 223c6411..c6768512 100644 --- a/broker/gen/model/Detector_list_detectors_inner.h +++ b/broker/gen/model/Detector_list_detectors_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_module.cpp b/broker/gen/model/Detector_module.cpp index 15a25872..45d72869 100644 --- a/broker/gen/model/Detector_module.cpp +++ b/broker/gen/model/Detector_module.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_module.h b/broker/gen/model/Detector_module.h index 8e7ccd38..44f72f34 100644 --- a/broker/gen/model/Detector_module.h +++ b/broker/gen/model/Detector_module.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_module_direction.cpp b/broker/gen/model/Detector_module_direction.cpp index 650bd64e..ef5dc225 100644 --- a/broker/gen/model/Detector_module_direction.cpp +++ b/broker/gen/model/Detector_module_direction.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_module_direction.h b/broker/gen/model/Detector_module_direction.h index c515eaa6..007f30ae 100644 --- a/broker/gen/model/Detector_module_direction.h +++ b/broker/gen/model/Detector_module_direction.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_selection.cpp b/broker/gen/model/Detector_selection.cpp index 6af1bbc5..02c49d7a 100644 --- a/broker/gen/model/Detector_selection.cpp +++ b/broker/gen/model/Detector_selection.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_selection.h b/broker/gen/model/Detector_selection.h index 16e9acf4..177e9f0e 100644 --- a/broker/gen/model/Detector_selection.h +++ b/broker/gen/model/Detector_selection.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_settings.cpp b/broker/gen/model/Detector_settings.cpp index 10cc57a7..a59284a0 100644 --- a/broker/gen/model/Detector_settings.cpp +++ b/broker/gen/model/Detector_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_settings.h b/broker/gen/model/Detector_settings.h index d34b1767..70a43655 100644 --- a/broker/gen/model/Detector_settings.h +++ b/broker/gen/model/Detector_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_status.cpp b/broker/gen/model/Detector_status.cpp index 4b40495d..7ff353d1 100644 --- a/broker/gen/model/Detector_status.cpp +++ b/broker/gen/model/Detector_status.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_status.h b/broker/gen/model/Detector_status.h index cf242bb5..66a707ab 100644 --- a/broker/gen/model/Detector_status.h +++ b/broker/gen/model/Detector_status.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_type.cpp b/broker/gen/model/Detector_type.cpp index 1d224480..07a6506a 100644 --- a/broker/gen/model/Detector_type.cpp +++ b/broker/gen/model/Detector_type.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector_type.h b/broker/gen/model/Detector_type.h index 243ca8e8..1bdcf927 100644 --- a/broker/gen/model/Detector_type.h +++ b/broker/gen/model/Detector_type.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Error_message.cpp b/broker/gen/model/Error_message.cpp index 59ad6c58..bc44ba01 100644 --- a/broker/gen/model/Error_message.cpp +++ b/broker/gen/model/Error_message.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Error_message.h b/broker/gen/model/Error_message.h index 0c3b09e5..31d12f21 100644 --- a/broker/gen/model/Error_message.h +++ b/broker/gen/model/Error_message.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Fpga_status_inner.cpp b/broker/gen/model/Fpga_status_inner.cpp index 79ea859e..b818a970 100644 --- a/broker/gen/model/Fpga_status_inner.cpp +++ b/broker/gen/model/Fpga_status_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -31,6 +31,7 @@ Fpga_status_inner::Fpga_status_inner() m_Hbm_temp_C = 0.0f; m_Packets_udp = 0L; m_Packets_sls = 0L; + m_Idle = false; } @@ -53,7 +54,7 @@ bool Fpga_status_inner::validate(std::stringstream& msg, const std::string& path bool success = true; const std::string _pathPrefix = pathPrefix.empty() ? "Fpga_status_inner" : pathPrefix; - + return success; } @@ -90,6 +91,9 @@ bool Fpga_status_inner::operator==(const Fpga_status_inner& rhs) const && (getPacketsSls() == rhs.getPacketsSls()) + && + + (isIdle() == rhs.isIdle()) ; @@ -113,6 +117,7 @@ void to_json(nlohmann::json& j, const Fpga_status_inner& o) j["hbm_temp_C"] = o.m_Hbm_temp_C; j["packets_udp"] = o.m_Packets_udp; j["packets_sls"] = o.m_Packets_sls; + j["idle"] = o.m_Idle; } @@ -128,6 +133,7 @@ void from_json(const nlohmann::json& j, Fpga_status_inner& o) j.at("hbm_temp_C").get_to(o.m_Hbm_temp_C); j.at("packets_udp").get_to(o.m_Packets_udp); j.at("packets_sls").get_to(o.m_Packets_sls); + j.at("idle").get_to(o.m_Idle); } @@ -211,6 +217,14 @@ void Fpga_status_inner::setPacketsSls(int64_t const value) { m_Packets_sls = value; } +bool Fpga_status_inner::isIdle() const +{ + return m_Idle; +} +void Fpga_status_inner::setIdle(bool const value) +{ + m_Idle = value; +} } // namespace org::openapitools::server::model diff --git a/broker/gen/model/Fpga_status_inner.h b/broker/gen/model/Fpga_status_inner.h index 22816d83..ae4cb1eb 100644 --- a/broker/gen/model/Fpga_status_inner.h +++ b/broker/gen/model/Fpga_status_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -108,6 +108,11 @@ public: /// int64_t getPacketsSls() const; void setPacketsSls(int64_t const value); + /// + /// + /// + bool isIdle() const; + void setIdle(bool const value); friend void to_json(nlohmann::json& j, const Fpga_status_inner& o); friend void from_json(const nlohmann::json& j, Fpga_status_inner& o); @@ -132,6 +137,8 @@ protected: int64_t m_Packets_sls; + bool m_Idle; + }; diff --git a/broker/gen/model/Helpers.cpp b/broker/gen/model/Helpers.cpp index bd60653b..23cd0169 100644 --- a/broker/gen/model/Helpers.cpp +++ b/broker/gen/model/Helpers.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Helpers.h b/broker/gen/model/Helpers.h index 8e856f65..d786805c 100644 --- a/broker/gen/model/Helpers.h +++ b/broker/gen/model/Helpers.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Image_format_settings.cpp b/broker/gen/model/Image_format_settings.cpp index 85973c3d..c3684c99 100644 --- a/broker/gen/model/Image_format_settings.cpp +++ b/broker/gen/model/Image_format_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Image_format_settings.h b/broker/gen/model/Image_format_settings.h index 88aacd5b..e4ffc921 100644 --- a/broker/gen/model/Image_format_settings.h +++ b/broker/gen/model/Image_format_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Image_pusher_type.cpp b/broker/gen/model/Image_pusher_type.cpp index 1180fa93..366b269e 100644 --- a/broker/gen/model/Image_pusher_type.cpp +++ b/broker/gen/model/Image_pusher_type.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Image_pusher_type.h b/broker/gen/model/Image_pusher_type.h index b02ab42c..72f1ac7a 100644 --- a/broker/gen/model/Image_pusher_type.h +++ b/broker/gen/model/Image_pusher_type.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Instrument_metadata.cpp b/broker/gen/model/Instrument_metadata.cpp index 192df0c9..036eb300 100644 --- a/broker/gen/model/Instrument_metadata.cpp +++ b/broker/gen/model/Instrument_metadata.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Instrument_metadata.h b/broker/gen/model/Instrument_metadata.h index 9a1d9b2f..f48c1c87 100644 --- a/broker/gen/model/Instrument_metadata.h +++ b/broker/gen/model/Instrument_metadata.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Jfjoch_settings.cpp b/broker/gen/model/Jfjoch_settings.cpp index d196bf90..853f26a4 100644 --- a/broker/gen/model/Jfjoch_settings.cpp +++ b/broker/gen/model/Jfjoch_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Jfjoch_settings.h b/broker/gen/model/Jfjoch_settings.h index 0df2c27f..12369aa3 100644 --- a/broker/gen/model/Jfjoch_settings.h +++ b/broker/gen/model/Jfjoch_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Measurement_statistics.cpp b/broker/gen/model/Measurement_statistics.cpp index 4e9b2660..701d1fbc 100644 --- a/broker/gen/model/Measurement_statistics.cpp +++ b/broker/gen/model/Measurement_statistics.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Measurement_statistics.h b/broker/gen/model/Measurement_statistics.h index 372e3336..90245a02 100644 --- a/broker/gen/model/Measurement_statistics.h +++ b/broker/gen/model/Measurement_statistics.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Pcie_devices_inner.cpp b/broker/gen/model/Pcie_devices_inner.cpp index 30d92de1..31768352 100644 --- a/broker/gen/model/Pcie_devices_inner.cpp +++ b/broker/gen/model/Pcie_devices_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Pcie_devices_inner.h b/broker/gen/model/Pcie_devices_inner.h index a08b5c07..625015ce 100644 --- a/broker/gen/model/Pcie_devices_inner.h +++ b/broker/gen/model/Pcie_devices_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Plot.cpp b/broker/gen/model/Plot.cpp index 96c0a8f1..fa87d328 100644 --- a/broker/gen/model/Plot.cpp +++ b/broker/gen/model/Plot.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Plot.h b/broker/gen/model/Plot.h index e4ead91b..6d64f121 100644 --- a/broker/gen/model/Plot.h +++ b/broker/gen/model/Plot.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Plots.cpp b/broker/gen/model/Plots.cpp index 9043466e..8579bb67 100644 --- a/broker/gen/model/Plots.cpp +++ b/broker/gen/model/Plots.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Plots.h b/broker/gen/model/Plots.h index e29fe2ab..334f45fc 100644 --- a/broker/gen/model/Plots.h +++ b/broker/gen/model/Plots.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Preview_settings.cpp b/broker/gen/model/Preview_settings.cpp index fa18b288..e4640d46 100644 --- a/broker/gen/model/Preview_settings.cpp +++ b/broker/gen/model/Preview_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Preview_settings.h b/broker/gen/model/Preview_settings.h index ca3f1d1b..02efb8d2 100644 --- a/broker/gen/model/Preview_settings.h +++ b/broker/gen/model/Preview_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_box.cpp b/broker/gen/model/Roi_box.cpp index e88c524d..98ddb7f0 100644 --- a/broker/gen/model/Roi_box.cpp +++ b/broker/gen/model/Roi_box.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_box.h b/broker/gen/model/Roi_box.h index b799946e..c804e20d 100644 --- a/broker/gen/model/Roi_box.h +++ b/broker/gen/model/Roi_box.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_box_list.cpp b/broker/gen/model/Roi_box_list.cpp index 88b2953c..0f5956b1 100644 --- a/broker/gen/model/Roi_box_list.cpp +++ b/broker/gen/model/Roi_box_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_box_list.h b/broker/gen/model/Roi_box_list.h index a8a7f820..25d134d4 100644 --- a/broker/gen/model/Roi_box_list.h +++ b/broker/gen/model/Roi_box_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_circle.cpp b/broker/gen/model/Roi_circle.cpp index e0075a27..ec2a3516 100644 --- a/broker/gen/model/Roi_circle.cpp +++ b/broker/gen/model/Roi_circle.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_circle.h b/broker/gen/model/Roi_circle.h index 9cd764a3..9d96b26e 100644 --- a/broker/gen/model/Roi_circle.h +++ b/broker/gen/model/Roi_circle.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_circle_list.cpp b/broker/gen/model/Roi_circle_list.cpp index 44168cf2..7ed42fb3 100644 --- a/broker/gen/model/Roi_circle_list.cpp +++ b/broker/gen/model/Roi_circle_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Roi_circle_list.h b/broker/gen/model/Roi_circle_list.h index eede9d69..41738388 100644 --- a/broker/gen/model/Roi_circle_list.h +++ b/broker/gen/model/Roi_circle_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Rotation_axis.cpp b/broker/gen/model/Rotation_axis.cpp index 0a8339b7..cb547903 100644 --- a/broker/gen/model/Rotation_axis.cpp +++ b/broker/gen/model/Rotation_axis.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Rotation_axis.h b/broker/gen/model/Rotation_axis.h index 33043ad1..ab4c1139 100644 --- a/broker/gen/model/Rotation_axis.h +++ b/broker/gen/model/Rotation_axis.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp index 85a6400c..58db80cd 100644 --- a/broker/gen/model/Spot_finding_settings.cpp +++ b/broker/gen/model/Spot_finding_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Spot_finding_settings.h b/broker/gen/model/Spot_finding_settings.h index ead3a44f..52091084 100644 --- a/broker/gen/model/Spot_finding_settings.h +++ b/broker/gen/model/Spot_finding_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Standard_detector_geometry.cpp b/broker/gen/model/Standard_detector_geometry.cpp index a7f0bcee..35b6eb49 100644 --- a/broker/gen/model/Standard_detector_geometry.cpp +++ b/broker/gen/model/Standard_detector_geometry.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Standard_detector_geometry.h b/broker/gen/model/Standard_detector_geometry.h index 67116d24..f870fc7b 100644 --- a/broker/gen/model/Standard_detector_geometry.h +++ b/broker/gen/model/Standard_detector_geometry.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Zeromq_settings.cpp b/broker/gen/model/Zeromq_settings.cpp index 4920f40b..ce84f7bd 100644 --- a/broker/gen/model/Zeromq_settings.cpp +++ b/broker/gen/model/Zeromq_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Zeromq_settings.h b/broker/gen/model/Zeromq_settings.h index 5b147b76..0f2299fd 100644 --- a/broker/gen/model/Zeromq_settings.h +++ b/broker/gen/model/Zeromq_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.0-rc.14 +* The version of the OpenAPI document: 1.0.0-rc.15 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 84c7e738..836dfd9c 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -2,7 +2,7 @@ openapi: 3.0.3 info: title: Jungfraujoch description: Jungfraujoch Broker Web API - version: 1.0.0-rc.14 + version: 1.0.0-rc.15 contact: email: filip.leonarski@psi.ch components: @@ -665,6 +665,7 @@ components: - hbm_temp_C - packets_sls - packets_udp + - idle properties: pci_dev_id: type: string @@ -693,11 +694,12 @@ components: packets_sls: type: integer format: int64 + idle: + type: boolean broker_status: type: object required: - state - - device properties: state: type: string @@ -705,15 +707,10 @@ components: progress: type: number format: float + description: Progress of data collection (only available if receiving is running) example: 1.0 minimum: 0.0 maximum: 1.0 - indexing_rate: - type: number - format: float - example: 0.10 - minimum: 0.0 - maximum: 1.0 plot: type: object required: diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 21321c54..30547e25 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -367,7 +367,7 @@ data-styled.g137[id="sc-kqGpvY"]{content:"bAFwPb,"}/*!sc*/ 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Jungfraujoch (1.0.0-rc.14)

Download OpenAPI specification:Download

E-mail: filip.leonarski@psi.ch

Jungfraujoch (1.0.0-rc.15)

Download OpenAPI specification:Download

E-mail: filip.leonarski@psi.ch

Jungfraujoch Broker Web API

Initialize detector and data acquisition

Status of the data acquisition

Responses

Response samples

Content type
application/json
{
  • "state": "Inactive",
  • "progress": 1,
  • "indexing_rate": 0.1
}

Get status of FPGA devices

Responses

Response samples

Content type
application/json
{
  • "state": "Inactive",
  • "progress": 1
}

Get status of FPGA devices

Responses

Response samples

Content type
application/json
[
  • {
    }
]

Return XFEL pulse IDs for the current data acquisition

Response samples

Content type
application/json
[
  • {
    }
]

Return XFEL pulse IDs for the current data acquisition

Return array of XFEL pulse IDs - (-1) if image not recorded

Responses