From b59a03ff02b5a28e2c272d1f74886067746d9eb7 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Sun, 15 Jun 2025 17:46:46 +0200 Subject: [PATCH] v1.0.0-rc.44 --- VERSION | 2 +- broker/JFJochBrokerHttp.cpp | 4 +- broker/JFJochBrokerHttp.h | 3 +- broker/JFJochStateMachine.cpp | 19 +- broker/JFJochStateMachine.h | 8 +- broker/OpenAPIConvert.cpp | 54 ++- broker/OpenAPIConvert.h | 9 +- broker/gen/api/ApiBase.h | 2 +- broker/gen/api/DefaultApi.cpp | 8 +- broker/gen/api/DefaultApi.h | 10 +- broker/gen/model/Azim_int_settings.cpp | 2 +- broker/gen/model/Azim_int_settings.h | 2 +- broker/gen/model/Broker_status.cpp | 2 +- broker/gen/model/Broker_status.h | 2 +- .../model/Calibration_statistics_inner.cpp | 2 +- .../gen/model/Calibration_statistics_inner.h | 2 +- broker/gen/model/Dataset_settings.cpp | 6 +- broker/gen/model/Dataset_settings.h | 10 +- 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 +- broker/gen/model/Detector_list_element.cpp | 2 +- broker/gen/model/Detector_list_element.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_power_state.cpp | 2 +- broker/gen/model/Detector_power_state.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_state.cpp | 2 +- broker/gen/model/Detector_state.h | 2 +- broker/gen/model/Detector_status.cpp | 2 +- broker/gen/model/Detector_status.h | 2 +- broker/gen/model/Detector_timing.cpp | 2 +- broker/gen/model/Detector_timing.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/File_writer_format.cpp | 2 +- broker/gen/model/File_writer_format.h | 2 +- broker/gen/model/File_writer_settings.cpp | 2 +- broker/gen/model/File_writer_settings.h | 2 +- broker/gen/model/Fpga_status_inner.cpp | 2 +- broker/gen/model/Fpga_status_inner.h | 2 +- broker/gen/model/Grid_plot.cpp | 139 ------ broker/gen/model/Grid_plots.cpp | 139 ------ broker/gen/model/Grid_plots.h | 85 ---- broker/gen/model/Grid_scan.cpp | 2 +- broker/gen/model/Grid_scan.h | 2 +- broker/gen/model/Grid_scan_result.cpp | 281 ------------ broker/gen/model/Grid_scan_result.h | 112 ----- broker/gen/model/Helpers.cpp | 2 +- broker/gen/model/Helpers.h | 2 +- broker/gen/model/Image_buffer_status.cpp | 2 +- broker/gen/model/Image_buffer_status.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/Indexing_algorithm.cpp | 2 +- broker/gen/model/Indexing_algorithm.h | 2 +- broker/gen/model/Indexing_settings.cpp | 2 +- broker/gen/model/Indexing_settings.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/Jfjoch_statistics.cpp | 2 +- broker/gen/model/Jfjoch_statistics.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/Pixel_mask_statistics.cpp | 2 +- broker/gen/model/Pixel_mask_statistics.h | 2 +- broker/gen/model/Plot.cpp | 2 +- broker/gen/model/Plot.h | 2 +- broker/gen/model/Plot_type_enum.cpp | 224 ---------- broker/gen/model/Plot_type_enum.h | 97 ---- broker/gen/model/Plot_unit_x.cpp | 2 +- broker/gen/model/Plot_unit_x.h | 2 +- broker/gen/model/Plots.cpp | 2 +- broker/gen/model/Plots.h | 2 +- broker/gen/model/Roi_azim_list.cpp | 2 +- broker/gen/model/Roi_azim_list.h | 2 +- broker/gen/model/Roi_azimuthal.cpp | 2 +- broker/gen/model/Roi_azimuthal.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/Roi_definitions.cpp | 2 +- broker/gen/model/Roi_definitions.h | 2 +- broker/gen/model/Rotation_axis.cpp | 2 +- broker/gen/model/Rotation_axis.h | 2 +- broker/gen/model/Scan_result.cpp | 140 ++++++ .../gen/model/{Grid_plot.h => Scan_result.h} | 48 +- broker/gen/model/Scan_result_images_inner.cpp | 423 ++++++++++++++++++ broker/gen/model/Scan_result_images_inner.h | 183 ++++++++ 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 +- ...t_settings_unit_cell.cpp => Unit_cell.cpp} | 46 +- ...taset_settings_unit_cell.h => Unit_cell.h} | 26 +- broker/gen/model/Zeromq_metadata_settings.cpp | 2 +- broker/gen/model/Zeromq_metadata_settings.h | 2 +- broker/gen/model/Zeromq_preview_settings.cpp | 2 +- broker/gen/model/Zeromq_preview_settings.h | 2 +- broker/gen/model/Zeromq_settings.cpp | 2 +- broker/gen/model/Zeromq_settings.h | 2 +- broker/jfjoch_api.yaml | 197 ++++---- broker/redoc-static.html | 16 +- common/CMakeLists.txt | 8 +- common/GridPlot.cpp | 85 ---- common/GridPlot.h | 41 -- common/GridScanResult.h | 22 - common/GridScanSettings.cpp | 20 +- common/GridScanSettings.h | 1 + common/{GridScanResult.cpp => ScanResult.cpp} | 2 +- common/ScanResult.h | 37 ++ common/ScanResultGenerator.cpp | 45 ++ common/ScanResultGenerator.h | 29 ++ docs/CHANGELOG.md | 9 + docs/conf.py | 2 +- docs/python_client/README.md | 11 +- docs/python_client/docs/DatasetSettings.md | 2 +- docs/python_client/docs/DefaultApi.md | 21 +- .../docs/DetectorListDetectorsInner.md | 3 + docs/python_client/docs/GridScanResult.md | 10 +- .../docs/GridScanResultImagesInner.md | 36 ++ docs/python_client/docs/PlotTypeEnum.md | 48 -- docs/python_client/docs/PreviewSettings.md | 2 +- docs/python_client/docs/ScanResult.md | 31 ++ .../docs/ScanResultImagesInner.md | 41 ++ docs/python_client/docs/UnitCell.md | 35 ++ fpga/hdl/action_config.v | 2 +- fpga/pcie_driver/dkms.conf | 2 +- fpga/pcie_driver/install_dkms.sh | 2 +- fpga/pcie_driver/jfjoch_drv.c | 2 +- fpga/pcie_driver/postinstall.sh | 2 +- fpga/pcie_driver/preuninstall.sh | 2 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- frontend/src/openapi/core/OpenAPI.ts | 2 +- frontend/src/openapi/index.ts | 3 +- .../src/openapi/models/dataset_settings.ts | 13 +- .../src/openapi/models/grid_scan_result.ts | 20 - frontend/src/openapi/models/scan_result.ts | 62 +++ frontend/src/openapi/models/unit_cell.ts | 17 + .../src/openapi/services/DefaultService.ts | 11 +- frontend/src/version.ts | 2 +- receiver/JFJochReceiver.cpp | 5 +- receiver/JFJochReceiver.h | 3 + receiver/JFJochReceiverFPGA.cpp | 1 + receiver/JFJochReceiverLite.cpp | 1 + receiver/JFJochReceiverOutput.h | 4 +- receiver/JFJochReceiverPlots.cpp | 22 - receiver/JFJochReceiverPlots.h | 5 +- resonet/jfjoch_inference_server.py | 2 +- tests/GridScanSettingsTest.cpp | 72 --- tests/JFJochReceiverProcessingTest.cpp | 7 +- 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 +- 180 files changed, 1531 insertions(+), 1779 deletions(-) delete mode 100644 broker/gen/model/Grid_plot.cpp delete mode 100644 broker/gen/model/Grid_plots.cpp delete mode 100644 broker/gen/model/Grid_plots.h delete mode 100644 broker/gen/model/Grid_scan_result.cpp delete mode 100644 broker/gen/model/Grid_scan_result.h delete mode 100644 broker/gen/model/Plot_type_enum.cpp delete mode 100644 broker/gen/model/Plot_type_enum.h create mode 100644 broker/gen/model/Scan_result.cpp rename broker/gen/model/{Grid_plot.h => Scan_result.h} (57%) create mode 100644 broker/gen/model/Scan_result_images_inner.cpp create mode 100644 broker/gen/model/Scan_result_images_inner.h rename broker/gen/model/{Dataset_settings_unit_cell.cpp => Unit_cell.cpp} (75%) rename broker/gen/model/{Dataset_settings_unit_cell.h => Unit_cell.h} (77%) delete mode 100644 common/GridPlot.cpp delete mode 100644 common/GridPlot.h delete mode 100644 common/GridScanResult.h rename common/{GridScanResult.cpp => ScanResult.cpp} (83%) create mode 100644 common/ScanResult.h create mode 100644 common/ScanResultGenerator.cpp create mode 100644 common/ScanResultGenerator.h create mode 100644 docs/python_client/docs/GridScanResultImagesInner.md delete mode 100644 docs/python_client/docs/PlotTypeEnum.md create mode 100644 docs/python_client/docs/ScanResult.md create mode 100644 docs/python_client/docs/ScanResultImagesInner.md create mode 100644 docs/python_client/docs/UnitCell.md delete mode 100644 frontend/src/openapi/models/grid_scan_result.ts create mode 100644 frontend/src/openapi/models/scan_result.ts create mode 100644 frontend/src/openapi/models/unit_cell.ts diff --git a/VERSION b/VERSION index 7db764af..3cbb1882 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc.43 +1.0.0-rc.44 diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index 61271d9a..b5a3e041 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -575,8 +575,8 @@ void JFJochBrokerHttp::config_indexing_put(const org::openapitools::server::mode response.send(Pistache::Http::Code::Ok); } -void JFJochBrokerHttp::result_grid_scan_get(Pistache::Http::ResponseWriter &response) { - auto ret = state_machine.GetGridScanResult(); +void JFJochBrokerHttp::result_scan_get(Pistache::Http::ResponseWriter &response) { + auto ret = state_machine.GetScanResult(); if (ret.has_value()) ProcessOutput(Convert(ret.value()), response, true); else diff --git a/broker/JFJochBrokerHttp.h b/broker/JFJochBrokerHttp.h index 3db8b0a7..3ce53ec1 100644 --- a/broker/JFJochBrokerHttp.h +++ b/broker/JFJochBrokerHttp.h @@ -171,8 +171,7 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi { void config_indexing_put(const org::openapitools::server::model::Indexing_settings &indexingSettings, Pistache::Http::ResponseWriter &response) override; - void result_grid_scan_get(Pistache::Http::ResponseWriter &response) override; - + void result_scan_get(Pistache::Http::ResponseWriter &response) override; public: JFJochBrokerHttp(const DiffractionExperiment& experiment, std::shared_ptr &rtr); void AddDetectorSetup(const DetectorSetup &setup); diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp index 4f28f311..5fa273f2 100644 --- a/broker/JFJochStateMachine.cpp +++ b/broker/JFJochStateMachine.cpp @@ -252,6 +252,8 @@ void JFJochStateMachine::Initialize() { SetState(JFJochState::Busy, "Configuring detector", BrokerStatus::MessageSeverity::Info); + scan_result = {}; // Clear scan result + measurement = std::async(std::launch::async, &JFJochStateMachine::InitializeThread, this, std::move(ul)); } @@ -337,8 +339,7 @@ void JFJochStateMachine::MeasurementThread() { auto tmp_output = services.Stop(); { std::unique_lock ul(m); - - SetGridScanResult(tmp_output.receiver_output.grid_scan_result); + scan_result = tmp_output.receiver_output.scan_result; if (tmp_output.receiver_output.writer_queue_full_warning) SetState(JFJochState::Idle, @@ -918,12 +919,10 @@ void JFJochStateMachine::SetIndexingSettings(const IndexingSettings &input) { } } -void JFJochStateMachine::SetGridScanResult(const std::optional &input) { - std::unique_lock ul(grid_scan_result_mutex); - grid_scan_result = input; -} +std::optional JFJochStateMachine::GetScanResult() const { + std::unique_lock ul(m); + if (IsRunning()) + throw WrongDAQStateException("Cannot check scan result, when running"); -std::optional JFJochStateMachine::GetGridScanResult() const { - std::unique_lock ul(grid_scan_result_mutex); - return grid_scan_result; -} + return scan_result; +} \ No newline at end of file diff --git a/broker/JFJochStateMachine.h b/broker/JFJochStateMachine.h index d703aaaf..4424ccce 100644 --- a/broker/JFJochStateMachine.h +++ b/broker/JFJochStateMachine.h @@ -105,6 +105,7 @@ class JFJochStateMachine { std::unique_ptr calibration; PixelMask pixel_mask; int64_t current_detector_setup; // Lock only on change + std::optional scan_result; mutable std::mutex calibration_statistics_mutex; std::vector calibration_statistics; @@ -121,9 +122,6 @@ class JFJochStateMachine { mutable std::mutex roi_mutex; ROIDefinition roi; - mutable std::mutex grid_scan_result_mutex; - std::optional grid_scan_result; - bool indexing_possible; bool resolution_estimate_possible; @@ -148,8 +146,6 @@ class JFJochStateMachine { void TakePedestalInternalG2(std::unique_lock &ul, int32_t storage_cell = 0); void ImportDetectorSettings(const DetectorSettings& input); void UpdateROIDefinition(); - - void SetGridScanResult(const std::optional& input); public: JFJochStateMachine(JFJochServices &in_services, Logger &logger); ~JFJochStateMachine(); @@ -243,7 +239,7 @@ public: void ClearImageBuffer() const; void AddDetectorSetup(const DetectorSetup& setup); // Not thread safe, only during setup - std::optional GetGridScanResult() const; + std::optional GetScanResult() const; }; diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp index b95552af..adec6acc 100644 --- a/broker/OpenAPIConvert.cpp +++ b/broker/OpenAPIConvert.cpp @@ -847,13 +847,6 @@ ColorScaleEnum ConvertColorScale(const std::optional& input) { "Color scale unknown"); } -org::openapitools::server::model::Grid_plot Convert(const GridPlot& input) { - org::openapitools::server::model::Grid_plot ret; - ret.setWidth(input.GetWidth()); - ret.setData(input.GetPlot()); - return ret; -} - IndexingSettings Convert(const org::openapitools::server::model::Indexing_settings &input) { IndexingSettings ret; switch (input.getAlgorithm().getValue()) { @@ -903,13 +896,44 @@ org::openapitools::server::model::Indexing_settings Convert(const IndexingSettin return ret; } -org::openapitools::server::model::Grid_scan_result Convert(const GridScanResult& input) { - org::openapitools::server::model::Grid_scan_result ret; - ret.setBFactor(input.b_factor); - ret.setMosaicity(input.mosaicity); - ret.setDetImg(input.det_img); - ret.setBkgEstimate(input.bkg); - ret.setIndexedLattices(input.indexing_solution); - ret.setSpotCount(input.spots); +org::openapitools::server::model::Scan_result Convert(const ScanResult& input) { + org::openapitools::server::model::Scan_result ret; + ret.setFilePrefix(input.file_prefix); + std::vector v; + for (const auto &i : input.images) { + org::openapitools::server::model::Scan_result_images_inner tmp; + tmp.setEfficiency(i.collection_efficiency); + tmp.setNumber(i.number); + if (i.bkg.has_value()) + tmp.setBkg(i.bkg.value()); + + std::optional pixel_sum; + if (i.pixel_sum.has_value()) + tmp.setPixelSum(i.pixel_sum.value()); + if (i.max_viable_pixel.has_value()) + tmp.setMax(i.max_viable_pixel.value()); + if (i.sat_pixels.has_value()) + tmp.setSat(i.sat_pixels.value()); + tmp.setSpots(i.spot_count); + if (i.indexing_solution.has_value()) + tmp.setIndex(i.indexing_solution.value()); + if (i.mosaicity.has_value()) + tmp.setMos(i.mosaicity.value()); + if (i.b_factor.has_value()) + tmp.setB(i.b_factor.value()); + if (i.uc.has_value()) { + org::openapitools::server::model::Unit_cell uc; + uc.setA(i.uc->a); + uc.setB(i.uc->b); + uc.setC(i.uc->c); + uc.setAlpha(i.uc->alpha); + uc.setBeta(i.uc->beta); + uc.setGamma(i.uc->gamma); + } + if (i.xfel_pulse_id.has_value()) + tmp.setXfelPulseid(i.xfel_pulse_id.value()); + v.emplace_back(std::move(tmp)); + } + ret.setImages(v); return ret; } \ No newline at end of file diff --git a/broker/OpenAPIConvert.h b/broker/OpenAPIConvert.h index e61d46e0..d9c45cf1 100644 --- a/broker/OpenAPIConvert.h +++ b/broker/OpenAPIConvert.h @@ -27,7 +27,7 @@ #include "gen/model/Rotation_axis.h" #include "gen/model/Grid_scan.h" #include "gen/model/Indexing_settings.h" -#include "gen/model/Grid_scan_result.h" +#include "gen/model/Scan_result.h" #include "../common/JFJochMessages.h" #include "../common/DatasetSettings.h" @@ -37,8 +37,7 @@ #include "../common/DetectorSettings.h" #include "../jungfrau/JFCalibration.h" #include "../common/InstrumentMetadata.h" -#include "Grid_plots.h" -#include "../common/GridScanResult.h" +#include "../common/ScanResult.h" SpotFindingSettings Convert(const org::openapitools::server::model::Spot_finding_settings &input); org::openapitools::server::model::Spot_finding_settings Convert(const SpotFindingSettings &input); @@ -84,11 +83,9 @@ ZMQMetadataSettings Convert(const org::openapitools::server::model::Zeromq_metad org::openapitools::server::model::File_writer_format Convert(FileWriterFormat input); FileWriterFormat Convert(const org::openapitools::server::model::File_writer_format& input); -org::openapitools::server::model::Grid_plot Convert(const GridPlot& input); - PlotType ConvertPlotType(const std::optional& input); ColorScaleEnum ConvertColorScale(const std::optional& input); -org::openapitools::server::model::Grid_scan_result Convert(const GridScanResult& input); +org::openapitools::server::model::Scan_result Convert(const ScanResult& input); #endif //JFJOCH_OPENAPICONVERT_H diff --git a/broker/gen/api/ApiBase.h b/broker/gen/api/ApiBase.h index 8d6945ff..56be46da 100644 --- a/broker/gen/api/ApiBase.h +++ b/broker/gen/api/ApiBase.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 fad7c79b..9279d471 100644 --- a/broker/gen/api/DefaultApi.cpp +++ b/broker/gen/api/DefaultApi.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -79,7 +79,7 @@ void DefaultApi::setupRoutes() { Routes::Post(*router, base + "/pedestal", Routes::bind(&DefaultApi::pedestal_post_handler, this)); Routes::Get(*router, base + "/preview/pedestal.tiff", Routes::bind(&DefaultApi::preview_pedestal_tiff_get_handler, this)); Routes::Get(*router, base + "/preview/plot", Routes::bind(&DefaultApi::preview_plot_get_handler, this)); - Routes::Get(*router, base + "/result/grid_scan", Routes::bind(&DefaultApi::result_grid_scan_get_handler, this)); + Routes::Get(*router, base + "/result/scan", Routes::bind(&DefaultApi::result_scan_get_handler, this)); Routes::Post(*router, base + "/start", Routes::bind(&DefaultApi::start_post_handler, this)); Routes::Get(*router, base + "/statistics/calibration", Routes::bind(&DefaultApi::statistics_calibration_get_handler, this)); Routes::Get(*router, base + "/statistics/data_collection", Routes::bind(&DefaultApi::statistics_data_collection_get_handler, this)); @@ -1273,12 +1273,12 @@ void DefaultApi::preview_plot_get_handler(const Pistache::Rest::Request &request } } -void DefaultApi::result_grid_scan_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) { +void DefaultApi::result_scan_get_handler(const Pistache::Rest::Request &, Pistache::Http::ResponseWriter response) { try { try { - this->result_grid_scan_get(response); + this->result_scan_get(response); } catch (Pistache::Http::HttpError &e) { response.send(static_cast(e.code()), e.what()); return; diff --git a/broker/gen/api/DefaultApi.h b/broker/gen/api/DefaultApi.h index 6dc5f9c3..8d7731fe 100644 --- a/broker/gen/api/DefaultApi.h +++ b/broker/gen/api/DefaultApi.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -39,7 +39,6 @@ #include "Error_message.h" #include "File_writer_settings.h" #include "Fpga_status_inner.h" -#include "Grid_scan_result.h" #include "Image_buffer_status.h" #include "Image_format_settings.h" #include "Indexing_settings.h" @@ -48,6 +47,7 @@ #include "Measurement_statistics.h" #include "Plots.h" #include "Roi_definitions.h" +#include "Scan_result.h" #include "Spot_finding_settings.h" #include "Zeromq_metadata_settings.h" #include "Zeromq_preview_settings.h" @@ -114,7 +114,7 @@ private: void pedestal_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void preview_pedestal_tiff_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void preview_plot_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); - void result_grid_scan_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); + void result_scan_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void start_post_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void statistics_calibration_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void statistics_data_collection_get_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); @@ -506,12 +506,12 @@ private: /// Unit used for azim int. (optional, default to "Q_recipA") virtual void preview_plot_get(const std::optional &type, const std::optional &binning, const std::optional &compression, const std::optional &experimentalCoord, const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) = 0; /// - /// Get grid scan result + /// Get full scan result /// /// /// /// - virtual void result_grid_scan_get(Pistache::Http::ResponseWriter &response) = 0; + virtual void result_scan_get(Pistache::Http::ResponseWriter &response) = 0; /// /// Start detector /// diff --git a/broker/gen/model/Azim_int_settings.cpp b/broker/gen/model/Azim_int_settings.cpp index d9d4b080..747382b9 100644 --- a/broker/gen/model/Azim_int_settings.cpp +++ b/broker/gen/model/Azim_int_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 d2cab7b5..91313fe8 100644 --- a/broker/gen/model/Azim_int_settings.h +++ b/broker/gen/model/Azim_int_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 5c3bd552..d59423f8 100644 --- a/broker/gen/model/Broker_status.cpp +++ b/broker/gen/model/Broker_status.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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.h b/broker/gen/model/Broker_status.h index e2dabcce..90647dee 100644 --- a/broker/gen/model/Broker_status.h +++ b/broker/gen/model/Broker_status.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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.cpp b/broker/gen/model/Calibration_statistics_inner.cpp index 32d1549a..52f86f20 100644 --- a/broker/gen/model/Calibration_statistics_inner.cpp +++ b/broker/gen/model/Calibration_statistics_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 70b744bf..9338dd1d 100644 --- a/broker/gen/model/Calibration_statistics_inner.h +++ b/broker/gen/model/Calibration_statistics_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 c47f9745..8934d388 100644 --- a/broker/gen/model/Dataset_settings.cpp +++ b/broker/gen/model/Dataset_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -1157,11 +1157,11 @@ void Dataset_settings::unsetPoni_rot3_rad() { m_Poni_rot3_radIsSet = false; } -org::openapitools::server::model::Dataset_settings_unit_cell Dataset_settings::getUnitCell() const +org::openapitools::server::model::Unit_cell Dataset_settings::getUnitCell() const { return m_Unit_cell; } -void Dataset_settings::setUnitCell(org::openapitools::server::model::Dataset_settings_unit_cell const& value) +void Dataset_settings::setUnitCell(org::openapitools::server::model::Unit_cell const& value) { m_Unit_cell = value; m_Unit_cellIsSet = true; diff --git a/broker/gen/model/Dataset_settings.h b/broker/gen/model/Dataset_settings.h index 16104bbc..8efc4b9b 100644 --- a/broker/gen/model/Dataset_settings.h +++ b/broker/gen/model/Dataset_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ #include "Grid_scan.h" #include #include "Rotation_axis.h" +#include "Unit_cell.h" #include -#include "Dataset_settings_unit_cell.h" #include namespace org::openapitools::server::model @@ -267,8 +267,8 @@ public: /// /// /// - org::openapitools::server::model::Dataset_settings_unit_cell getUnitCell() const; - void setUnitCell(org::openapitools::server::model::Dataset_settings_unit_cell const& value); + org::openapitools::server::model::Unit_cell getUnitCell() const; + void setUnitCell(org::openapitools::server::model::Unit_cell const& value); bool unitCellIsSet() const; void unsetUnit_cell(); @@ -335,7 +335,7 @@ protected: bool m_Poni_rot2_radIsSet; float m_Poni_rot3_rad; bool m_Poni_rot3_radIsSet; - org::openapitools::server::model::Dataset_settings_unit_cell m_Unit_cell; + org::openapitools::server::model::Unit_cell m_Unit_cell; bool m_Unit_cellIsSet; }; diff --git a/broker/gen/model/Detector.cpp b/broker/gen/model/Detector.cpp index a7c13572..9ebaf7ec 100644 --- a/broker/gen/model/Detector.cpp +++ b/broker/gen/model/Detector.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 918b7217..8126aa09 100644 --- a/broker/gen/model/Detector.h +++ b/broker/gen/model/Detector.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 84bbbe01..d7ebc4a2 100644 --- a/broker/gen/model/Detector_list.cpp +++ b/broker/gen/model/Detector_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 b1d14575..55b7564d 100644 --- a/broker/gen/model/Detector_list.h +++ b/broker/gen/model/Detector_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_element.cpp b/broker/gen/model/Detector_list_element.cpp index ba9f69a6..41d5412f 100644 --- a/broker/gen/model/Detector_list_element.cpp +++ b/broker/gen/model/Detector_list_element.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_element.h b/broker/gen/model/Detector_list_element.h index 0a764b34..4a0c9b07 100644 --- a/broker/gen/model/Detector_list_element.h +++ b/broker/gen/model/Detector_list_element.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 28bcc997..ecef93d5 100644 --- a/broker/gen/model/Detector_module.cpp +++ b/broker/gen/model/Detector_module.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 fdc9ac38..5159d5a6 100644 --- a/broker/gen/model/Detector_module.h +++ b/broker/gen/model/Detector_module.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 7ead0582..b9013aed 100644 --- a/broker/gen/model/Detector_module_direction.cpp +++ b/broker/gen/model/Detector_module_direction.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 9cfb7d8c..a9b9c437 100644 --- a/broker/gen/model/Detector_module_direction.h +++ b/broker/gen/model/Detector_module_direction.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_power_state.cpp b/broker/gen/model/Detector_power_state.cpp index 0181d54a..1ea36c9d 100644 --- a/broker/gen/model/Detector_power_state.cpp +++ b/broker/gen/model/Detector_power_state.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_power_state.h b/broker/gen/model/Detector_power_state.h index 59d1ad54..3bcbe693 100644 --- a/broker/gen/model/Detector_power_state.h +++ b/broker/gen/model/Detector_power_state.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 10ba4ddb..de823553 100644 --- a/broker/gen/model/Detector_selection.cpp +++ b/broker/gen/model/Detector_selection.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 9cdde7bb..7b0e62fe 100644 --- a/broker/gen/model/Detector_selection.h +++ b/broker/gen/model/Detector_selection.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 bcae1709..034d2d47 100644 --- a/broker/gen/model/Detector_settings.cpp +++ b/broker/gen/model/Detector_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 a80b0297..5e8b9571 100644 --- a/broker/gen/model/Detector_settings.h +++ b/broker/gen/model/Detector_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_state.cpp b/broker/gen/model/Detector_state.cpp index 9acf96d3..3bd32d73 100644 --- a/broker/gen/model/Detector_state.cpp +++ b/broker/gen/model/Detector_state.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_state.h b/broker/gen/model/Detector_state.h index 89433829..2c7a57db 100644 --- a/broker/gen/model/Detector_state.h +++ b/broker/gen/model/Detector_state.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 03660c6a..018758a4 100644 --- a/broker/gen/model/Detector_status.cpp +++ b/broker/gen/model/Detector_status.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 028373f9..41b90cbc 100644 --- a/broker/gen/model/Detector_status.h +++ b/broker/gen/model/Detector_status.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_timing.cpp b/broker/gen/model/Detector_timing.cpp index 47b6680f..71ef93e4 100644 --- a/broker/gen/model/Detector_timing.cpp +++ b/broker/gen/model/Detector_timing.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_timing.h b/broker/gen/model/Detector_timing.h index b0bf6f8a..6e604ea4 100644 --- a/broker/gen/model/Detector_timing.h +++ b/broker/gen/model/Detector_timing.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 167a8428..8b9ce60b 100644 --- a/broker/gen/model/Detector_type.cpp +++ b/broker/gen/model/Detector_type.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 623a619d..6c8a7576 100644 --- a/broker/gen/model/Detector_type.h +++ b/broker/gen/model/Detector_type.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 f33e3763..67fdfcae 100644 --- a/broker/gen/model/Error_message.cpp +++ b/broker/gen/model/Error_message.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 21587f2a..1ee7904d 100644 --- a/broker/gen/model/Error_message.h +++ b/broker/gen/model/Error_message.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/File_writer_format.cpp b/broker/gen/model/File_writer_format.cpp index aae0a259..74b2cbda 100644 --- a/broker/gen/model/File_writer_format.cpp +++ b/broker/gen/model/File_writer_format.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/File_writer_format.h b/broker/gen/model/File_writer_format.h index 0028c097..0b374c17 100644 --- a/broker/gen/model/File_writer_format.h +++ b/broker/gen/model/File_writer_format.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/File_writer_settings.cpp b/broker/gen/model/File_writer_settings.cpp index 2705ece4..c24066b4 100644 --- a/broker/gen/model/File_writer_settings.cpp +++ b/broker/gen/model/File_writer_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/File_writer_settings.h b/broker/gen/model/File_writer_settings.h index 6abe4741..f6ff9d61 100644 --- a/broker/gen/model/File_writer_settings.h +++ b/broker/gen/model/File_writer_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 ab6fed65..b64d1f5a 100644 --- a/broker/gen/model/Fpga_status_inner.cpp +++ b/broker/gen/model/Fpga_status_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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.h b/broker/gen/model/Fpga_status_inner.h index 6ba321b3..980db0e8 100644 --- a/broker/gen/model/Fpga_status_inner.h +++ b/broker/gen/model/Fpga_status_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Grid_plot.cpp b/broker/gen/model/Grid_plot.cpp deleted file mode 100644 index 6942ba81..00000000 --- a/broker/gen/model/Grid_plot.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.40 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Grid_plot.h" -#include "Helpers.h" - -#include - -namespace org::openapitools::server::model -{ - -Grid_plot::Grid_plot() -{ - m_Width = 0L; - -} - -void Grid_plot::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Grid_plot::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Grid_plot::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Grid_plot" : pathPrefix; - - - - /* Data */ { - const std::vector& value = m_Data; - const std::string currentValuePath = _pathPrefix + ".data"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const float& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* Width */ { - const int64_t& value = m_Width; - const std::string currentValuePath = _pathPrefix + ".width"; - - - if (value < 1ll) - { - success = false; - msg << currentValuePath << ": must be greater than or equal to 1;"; - } - - } - - return success; -} - -bool Grid_plot::operator==(const Grid_plot& rhs) const -{ - return - - - (getData() == rhs.getData()) - && - - (getWidth() == rhs.getWidth()) - - - ; -} - -bool Grid_plot::operator!=(const Grid_plot& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Grid_plot& o) -{ - j = nlohmann::json::object(); - j["data"] = o.m_Data; - j["width"] = o.m_Width; - -} - -void from_json(const nlohmann::json& j, Grid_plot& o) -{ - j.at("data").get_to(o.m_Data); - j.at("width").get_to(o.m_Width); - -} - -std::vector Grid_plot::getData() const -{ - return m_Data; -} -void Grid_plot::setData(std::vector const value) -{ - m_Data = value; -} -int64_t Grid_plot::getWidth() const -{ - return m_Width; -} -void Grid_plot::setWidth(int64_t const value) -{ - m_Width = value; -} - - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Grid_plots.cpp b/broker/gen/model/Grid_plots.cpp deleted file mode 100644 index 2d7fc7d1..00000000 --- a/broker/gen/model/Grid_plots.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.40 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Grid_plots.h" -#include "Helpers.h" - -#include - -namespace org::openapitools::server::model -{ - -Grid_plots::Grid_plots() -{ - m_Width = 0L; - -} - -void Grid_plots::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Grid_plots::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Grid_plots::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Grid_plots" : pathPrefix; - - - - /* Plots */ { - const std::vector& value = m_Plots; - const std::string currentValuePath = _pathPrefix + ".plots"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const org::openapitools::server::model::Grid_plot& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - success = value.validate(msg, currentValuePath + ".plots") && success; - - i++; - } - } - - } - - - /* Width */ { - const int64_t& value = m_Width; - const std::string currentValuePath = _pathPrefix + ".width"; - - - if (value < 1ll) - { - success = false; - msg << currentValuePath << ": must be greater than or equal to 1;"; - } - - } - - return success; -} - -bool Grid_plots::operator==(const Grid_plots& rhs) const -{ - return - - - (getPlots() == rhs.getPlots()) - && - - (getWidth() == rhs.getWidth()) - - - ; -} - -bool Grid_plots::operator!=(const Grid_plots& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Grid_plots& o) -{ - j = nlohmann::json::object(); - j["plots"] = o.m_Plots; - j["width"] = o.m_Width; - -} - -void from_json(const nlohmann::json& j, Grid_plots& o) -{ - j.at("plots").get_to(o.m_Plots); - j.at("width").get_to(o.m_Width); - -} - -std::vector Grid_plots::getPlots() const -{ - return m_Plots; -} -void Grid_plots::setPlots(std::vector const& value) -{ - m_Plots = value; -} -int64_t Grid_plots::getWidth() const -{ - return m_Width; -} -void Grid_plots::setWidth(int64_t const value) -{ - m_Width = value; -} - - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Grid_plots.h b/broker/gen/model/Grid_plots.h deleted file mode 100644 index 60e0a0fe..00000000 --- a/broker/gen/model/Grid_plots.h +++ /dev/null @@ -1,85 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.40 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -/* - * Grid_plots.h - * - * - */ - -#ifndef Grid_plots_H_ -#define Grid_plots_H_ - - -#include -#include "Grid_plot.h" -#include - -namespace org::openapitools::server::model -{ - -/// -/// -/// -class Grid_plots -{ -public: - Grid_plots(); - virtual ~Grid_plots() = default; - - - /// - /// Validate the current data in the model. Throws a ValidationException on failure. - /// - void validate() const; - - /// - /// Validate the current data in the model. Returns false on error and writes an error - /// message into the given stringstream. - /// - bool validate(std::stringstream& msg) const; - - /// - /// Helper overload for validate. Used when one model stores another model and calls it's validate. - /// Not meant to be called outside that case. - /// - bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - - bool operator==(const Grid_plots& rhs) const; - bool operator!=(const Grid_plots& rhs) const; - - ///////////////////////////////////////////// - /// Grid_plots members - - /// - /// - /// - std::vector getPlots() const; - void setPlots(std::vector const& value); - /// - /// - /// - int64_t getWidth() const; - void setWidth(int64_t const value); - - friend void to_json(nlohmann::json& j, const Grid_plots& o); - friend void from_json(const nlohmann::json& j, Grid_plots& o); -protected: - std::vector m_Plots; - - int64_t m_Width; - - -}; - -} // namespace org::openapitools::server::model - -#endif /* Grid_plots_H_ */ diff --git a/broker/gen/model/Grid_scan.cpp b/broker/gen/model/Grid_scan.cpp index 788acdf3..9a5f1223 100644 --- a/broker/gen/model/Grid_scan.cpp +++ b/broker/gen/model/Grid_scan.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Grid_scan.h b/broker/gen/model/Grid_scan.h index deb4b40d..370b65c4 100644 --- a/broker/gen/model/Grid_scan.h +++ b/broker/gen/model/Grid_scan.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Grid_scan_result.cpp b/broker/gen/model/Grid_scan_result.cpp deleted file mode 100644 index 679ee4e1..00000000 --- a/broker/gen/model/Grid_scan_result.cpp +++ /dev/null @@ -1,281 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.43 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Grid_scan_result.h" -#include "Helpers.h" - -#include - -namespace org::openapitools::server::model -{ - -Grid_scan_result::Grid_scan_result() -{ - -} - -void Grid_scan_result::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Grid_scan_result::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Grid_scan_result::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Grid_scan_result" : pathPrefix; - - - - /* Det_img */ { - const std::vector& value = m_Det_img; - const std::string currentValuePath = _pathPrefix + ".detImg"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const int64_t& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* Bkg_estimate */ { - const std::vector& value = m_Bkg_estimate; - const std::string currentValuePath = _pathPrefix + ".bkgEstimate"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const float& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* Spot_count */ { - const std::vector& value = m_Spot_count; - const std::string currentValuePath = _pathPrefix + ".spotCount"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const int64_t& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* Indexed_lattices */ { - const std::vector& value = m_Indexed_lattices; - const std::string currentValuePath = _pathPrefix + ".indexedLattices"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const int64_t& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* Mosaicity */ { - const std::vector& value = m_Mosaicity; - const std::string currentValuePath = _pathPrefix + ".mosaicity"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const float& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - - /* B_factor */ { - const std::vector& value = m_B_factor; - const std::string currentValuePath = _pathPrefix + ".bFactor"; - - - { // Recursive validation of array elements - const std::string oldValuePath = currentValuePath; - int i = 0; - for (const float& value : value) - { - const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; - - - - i++; - } - } - - } - - return success; -} - -bool Grid_scan_result::operator==(const Grid_scan_result& rhs) const -{ - return - - - (getDetImg() == rhs.getDetImg()) - && - - (getBkgEstimate() == rhs.getBkgEstimate()) - && - - (getSpotCount() == rhs.getSpotCount()) - && - - (getIndexedLattices() == rhs.getIndexedLattices()) - && - - (getMosaicity() == rhs.getMosaicity()) - && - - (getBFactor() == rhs.getBFactor()) - - - ; -} - -bool Grid_scan_result::operator!=(const Grid_scan_result& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Grid_scan_result& o) -{ - j = nlohmann::json::object(); - j["det_img"] = o.m_Det_img; - j["bkg_estimate"] = o.m_Bkg_estimate; - j["spot_count"] = o.m_Spot_count; - j["indexed_lattices"] = o.m_Indexed_lattices; - j["mosaicity"] = o.m_Mosaicity; - j["b_factor"] = o.m_B_factor; - -} - -void from_json(const nlohmann::json& j, Grid_scan_result& o) -{ - j.at("det_img").get_to(o.m_Det_img); - j.at("bkg_estimate").get_to(o.m_Bkg_estimate); - j.at("spot_count").get_to(o.m_Spot_count); - j.at("indexed_lattices").get_to(o.m_Indexed_lattices); - j.at("mosaicity").get_to(o.m_Mosaicity); - j.at("b_factor").get_to(o.m_B_factor); - -} - -std::vector Grid_scan_result::getDetImg() const -{ - return m_Det_img; -} -void Grid_scan_result::setDetImg(std::vector const value) -{ - m_Det_img = value; -} -std::vector Grid_scan_result::getBkgEstimate() const -{ - return m_Bkg_estimate; -} -void Grid_scan_result::setBkgEstimate(std::vector const value) -{ - m_Bkg_estimate = value; -} -std::vector Grid_scan_result::getSpotCount() const -{ - return m_Spot_count; -} -void Grid_scan_result::setSpotCount(std::vector const value) -{ - m_Spot_count = value; -} -std::vector Grid_scan_result::getIndexedLattices() const -{ - return m_Indexed_lattices; -} -void Grid_scan_result::setIndexedLattices(std::vector const value) -{ - m_Indexed_lattices = value; -} -std::vector Grid_scan_result::getMosaicity() const -{ - return m_Mosaicity; -} -void Grid_scan_result::setMosaicity(std::vector const value) -{ - m_Mosaicity = value; -} -std::vector Grid_scan_result::getBFactor() const -{ - return m_B_factor; -} -void Grid_scan_result::setBFactor(std::vector const value) -{ - m_B_factor = value; -} - - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Grid_scan_result.h b/broker/gen/model/Grid_scan_result.h deleted file mode 100644 index c2a5d6dd..00000000 --- a/broker/gen/model/Grid_scan_result.h +++ /dev/null @@ -1,112 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.43 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -/* - * Grid_scan_result.h - * - * Results of a grid scan - */ - -#ifndef Grid_scan_result_H_ -#define Grid_scan_result_H_ - - -#include -#include - -namespace org::openapitools::server::model -{ - -/// -/// Results of a grid scan -/// -class Grid_scan_result -{ -public: - Grid_scan_result(); - virtual ~Grid_scan_result() = default; - - - /// - /// Validate the current data in the model. Throws a ValidationException on failure. - /// - void validate() const; - - /// - /// Validate the current data in the model. Returns false on error and writes an error - /// message into the given stringstream. - /// - bool validate(std::stringstream& msg) const; - - /// - /// Helper overload for validate. Used when one model stores another model and calls it's validate. - /// Not meant to be called outside that case. - /// - bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - - bool operator==(const Grid_scan_result& rhs) const; - bool operator!=(const Grid_scan_result& rhs) const; - - ///////////////////////////////////////////// - /// Grid_scan_result members - - /// - /// Detector image number for a given cell - /// - std::vector getDetImg() const; - void setDetImg(std::vector const value); - /// - /// - /// - std::vector getBkgEstimate() const; - void setBkgEstimate(std::vector const value); - /// - /// - /// - std::vector getSpotCount() const; - void setSpotCount(std::vector const value); - /// - /// - /// - std::vector getIndexedLattices() const; - void setIndexedLattices(std::vector const value); - /// - /// - /// - std::vector getMosaicity() const; - void setMosaicity(std::vector const value); - /// - /// - /// - std::vector getBFactor() const; - void setBFactor(std::vector const value); - - friend void to_json(nlohmann::json& j, const Grid_scan_result& o); - friend void from_json(const nlohmann::json& j, Grid_scan_result& o); -protected: - std::vector m_Det_img; - - std::vector m_Bkg_estimate; - - std::vector m_Spot_count; - - std::vector m_Indexed_lattices; - - std::vector m_Mosaicity; - - std::vector m_B_factor; - - -}; - -} // namespace org::openapitools::server::model - -#endif /* Grid_scan_result_H_ */ diff --git a/broker/gen/model/Helpers.cpp b/broker/gen/model/Helpers.cpp index 404c856e..5c248c22 100644 --- a/broker/gen/model/Helpers.cpp +++ b/broker/gen/model/Helpers.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 a10bfde1..e3e1c0cf 100644 --- a/broker/gen/model/Helpers.h +++ b/broker/gen/model/Helpers.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_buffer_status.cpp b/broker/gen/model/Image_buffer_status.cpp index 96ef7ad1..38519a6b 100644 --- a/broker/gen/model/Image_buffer_status.cpp +++ b/broker/gen/model/Image_buffer_status.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_buffer_status.h b/broker/gen/model/Image_buffer_status.h index 67003519..016feaeb 100644 --- a/broker/gen/model/Image_buffer_status.h +++ b/broker/gen/model/Image_buffer_status.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 5f83185d..605ca563 100644 --- a/broker/gen/model/Image_format_settings.cpp +++ b/broker/gen/model/Image_format_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 5fb7923e..92b2fed7 100644 --- a/broker/gen/model/Image_format_settings.h +++ b/broker/gen/model/Image_format_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 e8114e18..d577c6bd 100644 --- a/broker/gen/model/Image_pusher_type.cpp +++ b/broker/gen/model/Image_pusher_type.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 9d6d2688..6ee0d02b 100644 --- a/broker/gen/model/Image_pusher_type.h +++ b/broker/gen/model/Image_pusher_type.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Indexing_algorithm.cpp b/broker/gen/model/Indexing_algorithm.cpp index 3506dbea..c802cbfe 100644 --- a/broker/gen/model/Indexing_algorithm.cpp +++ b/broker/gen/model/Indexing_algorithm.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Indexing_algorithm.h b/broker/gen/model/Indexing_algorithm.h index c78c1dfd..80991da6 100644 --- a/broker/gen/model/Indexing_algorithm.h +++ b/broker/gen/model/Indexing_algorithm.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Indexing_settings.cpp b/broker/gen/model/Indexing_settings.cpp index f08e9323..5f2c9bc1 100644 --- a/broker/gen/model/Indexing_settings.cpp +++ b/broker/gen/model/Indexing_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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Indexing_settings.h b/broker/gen/model/Indexing_settings.h index d9731da2..9191ebe2 100644 --- a/broker/gen/model/Indexing_settings.h +++ b/broker/gen/model/Indexing_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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 667bbb45..37cae698 100644 --- a/broker/gen/model/Instrument_metadata.cpp +++ b/broker/gen/model/Instrument_metadata.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 37078dc1..4bc876d7 100644 --- a/broker/gen/model/Instrument_metadata.h +++ b/broker/gen/model/Instrument_metadata.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 3ebaf8c1..9bbd2bac 100644 --- a/broker/gen/model/Jfjoch_settings.cpp +++ b/broker/gen/model/Jfjoch_settings.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 5e5a98d8..77069241 100644 --- a/broker/gen/model/Jfjoch_settings.h +++ b/broker/gen/model/Jfjoch_settings.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_statistics.cpp b/broker/gen/model/Jfjoch_statistics.cpp index a55a548b..89d9b181 100644 --- a/broker/gen/model/Jfjoch_statistics.cpp +++ b/broker/gen/model/Jfjoch_statistics.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_statistics.h b/broker/gen/model/Jfjoch_statistics.h index 5d99684d..3a575579 100644 --- a/broker/gen/model/Jfjoch_statistics.h +++ b/broker/gen/model/Jfjoch_statistics.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 7bb1148c..44b52d3a 100644 --- a/broker/gen/model/Measurement_statistics.cpp +++ b/broker/gen/model/Measurement_statistics.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 cfca697e..bcc33ee0 100644 --- a/broker/gen/model/Measurement_statistics.h +++ b/broker/gen/model/Measurement_statistics.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 696f47e3..82a66597 100644 --- a/broker/gen/model/Pcie_devices_inner.cpp +++ b/broker/gen/model/Pcie_devices_inner.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 e876a7b1..dd17ec17 100644 --- a/broker/gen/model/Pcie_devices_inner.h +++ b/broker/gen/model/Pcie_devices_inner.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Pixel_mask_statistics.cpp b/broker/gen/model/Pixel_mask_statistics.cpp index 052e8f06..2b5b9117 100644 --- a/broker/gen/model/Pixel_mask_statistics.cpp +++ b/broker/gen/model/Pixel_mask_statistics.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Pixel_mask_statistics.h b/broker/gen/model/Pixel_mask_statistics.h index cae98632..18f472fb 100644 --- a/broker/gen/model/Pixel_mask_statistics.h +++ b/broker/gen/model/Pixel_mask_statistics.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 5f4b3f53..86e08ddb 100644 --- a/broker/gen/model/Plot.cpp +++ b/broker/gen/model/Plot.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 9ffe2876..33a4182e 100644 --- a/broker/gen/model/Plot.h +++ b/broker/gen/model/Plot.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_type_enum.cpp b/broker/gen/model/Plot_type_enum.cpp deleted file mode 100644 index c9b2f018..00000000 --- a/broker/gen/model/Plot_type_enum.cpp +++ /dev/null @@ -1,224 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.40 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Plot_type_enum.h" -#include "Helpers.h" -#include -#include - -namespace org::openapitools::server::model -{ - -Plot_type_enum::Plot_type_enum() -{ - -} - -void Plot_type_enum::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Plot_type_enum::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Plot_type_enum::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Plot_type_enum" : pathPrefix; - - - if (m_value == Plot_type_enum::ePlot_type_enum::INVALID_VALUE_OPENAPI_GENERATED) - { - success = false; - msg << _pathPrefix << ": has no value;"; - } - - return success; -} - -bool Plot_type_enum::operator==(const Plot_type_enum& rhs) const -{ - return - getValue() == rhs.getValue() - - ; -} - -bool Plot_type_enum::operator!=(const Plot_type_enum& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Plot_type_enum& o) -{ - j = nlohmann::json::object(); - - switch (o.getValue()) - { - case Plot_type_enum::ePlot_type_enum::INVALID_VALUE_OPENAPI_GENERATED: - j = "INVALID_VALUE_OPENAPI_GENERATED"; - break; - case Plot_type_enum::ePlot_type_enum::BKG_ESTIMATE: - j = "bkg_estimate"; - break; - case Plot_type_enum::ePlot_type_enum::AZINT: - j = "azint"; - break; - case Plot_type_enum::ePlot_type_enum::SPOT_COUNT: - j = "spot_count"; - break; - case Plot_type_enum::ePlot_type_enum::INDEXING_RATE: - j = "indexing_rate"; - break; - case Plot_type_enum::ePlot_type_enum::INDEXING_UNIT_CELL_LENGTH: - j = "indexing_unit_cell_length"; - break; - case Plot_type_enum::ePlot_type_enum::INDEXING_UNIT_CELL_ANGLE: - j = "indexing_unit_cell_angle"; - break; - case Plot_type_enum::ePlot_type_enum::ERROR_PIXELS: - j = "error_pixels"; - break; - case Plot_type_enum::ePlot_type_enum::IMAGE_COLLECTION_EFFICIENCY: - j = "image_collection_efficiency"; - break; - case Plot_type_enum::ePlot_type_enum::RECEIVER_DELAY: - j = "receiver_delay"; - break; - case Plot_type_enum::ePlot_type_enum::RECEIVER_FREE_SEND_BUF: - j = "receiver_free_send_buf"; - break; - case Plot_type_enum::ePlot_type_enum::STRONG_PIXELS: - j = "strong_pixels"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_SUM: - j = "roi_sum"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_MEAN: - j = "roi_mean"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_MAX_COUNT: - j = "roi_max_count"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_PIXELS: - j = "roi_pixels"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_WEIGHTED_X: - j = "roi_weighted_x"; - break; - case Plot_type_enum::ePlot_type_enum::ROI_WEIGHTED_Y: - j = "roi_weighted_y"; - break; - case Plot_type_enum::ePlot_type_enum::PACKETS_RECEIVED: - j = "packets_received"; - break; - case Plot_type_enum::ePlot_type_enum::MAX_PIXEL_VALUE: - j = "max_pixel_value"; - break; - case Plot_type_enum::ePlot_type_enum::RESOLUTION_ESTIMATE: - j = "resolution_estimate"; - break; - } -} - -void from_json(const nlohmann::json& j, Plot_type_enum& o) -{ - - auto s = j.get(); - if (s == "bkg_estimate") { - o.setValue(Plot_type_enum::ePlot_type_enum::BKG_ESTIMATE); - } - else if (s == "azint") { - o.setValue(Plot_type_enum::ePlot_type_enum::AZINT); - } - else if (s == "spot_count") { - o.setValue(Plot_type_enum::ePlot_type_enum::SPOT_COUNT); - } - else if (s == "indexing_rate") { - o.setValue(Plot_type_enum::ePlot_type_enum::INDEXING_RATE); - } - else if (s == "indexing_unit_cell_length") { - o.setValue(Plot_type_enum::ePlot_type_enum::INDEXING_UNIT_CELL_LENGTH); - } - else if (s == "indexing_unit_cell_angle") { - o.setValue(Plot_type_enum::ePlot_type_enum::INDEXING_UNIT_CELL_ANGLE); - } - else if (s == "error_pixels") { - o.setValue(Plot_type_enum::ePlot_type_enum::ERROR_PIXELS); - } - else if (s == "image_collection_efficiency") { - o.setValue(Plot_type_enum::ePlot_type_enum::IMAGE_COLLECTION_EFFICIENCY); - } - else if (s == "receiver_delay") { - o.setValue(Plot_type_enum::ePlot_type_enum::RECEIVER_DELAY); - } - else if (s == "receiver_free_send_buf") { - o.setValue(Plot_type_enum::ePlot_type_enum::RECEIVER_FREE_SEND_BUF); - } - else if (s == "strong_pixels") { - o.setValue(Plot_type_enum::ePlot_type_enum::STRONG_PIXELS); - } - else if (s == "roi_sum") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_SUM); - } - else if (s == "roi_mean") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_MEAN); - } - else if (s == "roi_max_count") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_MAX_COUNT); - } - else if (s == "roi_pixels") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_PIXELS); - } - else if (s == "roi_weighted_x") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_WEIGHTED_X); - } - else if (s == "roi_weighted_y") { - o.setValue(Plot_type_enum::ePlot_type_enum::ROI_WEIGHTED_Y); - } - else if (s == "packets_received") { - o.setValue(Plot_type_enum::ePlot_type_enum::PACKETS_RECEIVED); - } - else if (s == "max_pixel_value") { - o.setValue(Plot_type_enum::ePlot_type_enum::MAX_PIXEL_VALUE); - } - else if (s == "resolution_estimate") { - o.setValue(Plot_type_enum::ePlot_type_enum::RESOLUTION_ESTIMATE); - } else { - std::stringstream ss; - ss << "Unexpected value " << s << " in json" - << " cannot be converted to enum of type" - << " Plot_type_enum::ePlot_type_enum"; - throw std::invalid_argument(ss.str()); - } - -} - -Plot_type_enum::ePlot_type_enum Plot_type_enum::getValue() const -{ - return m_value; -} -void Plot_type_enum::setValue(Plot_type_enum::ePlot_type_enum value) -{ - m_value = value; -} - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Plot_type_enum.h b/broker/gen/model/Plot_type_enum.h deleted file mode 100644 index 93bf683e..00000000 --- a/broker/gen/model/Plot_type_enum.h +++ /dev/null @@ -1,97 +0,0 @@ -/** -* Jungfraujoch -* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. -* -* The version of the OpenAPI document: 1.0.0-rc.40 -* Contact: filip.leonarski@psi.ch -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -/* - * Plot_type_enum.h - * - * - */ - -#ifndef Plot_type_enum_H_ -#define Plot_type_enum_H_ - - -#include - -namespace org::openapitools::server::model -{ - -/// -/// -/// -class Plot_type_enum -{ -public: - Plot_type_enum(); - virtual ~Plot_type_enum() = default; - - enum class ePlot_type_enum { - // To have a valid default value. - // Avoiding name clashes with user defined - // enum values - INVALID_VALUE_OPENAPI_GENERATED = 0, - BKG_ESTIMATE, - AZINT, - SPOT_COUNT, - INDEXING_RATE, - INDEXING_UNIT_CELL_LENGTH, - INDEXING_UNIT_CELL_ANGLE, - ERROR_PIXELS, - IMAGE_COLLECTION_EFFICIENCY, - RECEIVER_DELAY, - RECEIVER_FREE_SEND_BUF, - STRONG_PIXELS, - ROI_SUM, - ROI_MEAN, - ROI_MAX_COUNT, - ROI_PIXELS, - ROI_WEIGHTED_X, - ROI_WEIGHTED_Y, - PACKETS_RECEIVED, - MAX_PIXEL_VALUE, - RESOLUTION_ESTIMATE - }; - - /// - /// Validate the current data in the model. Throws a ValidationException on failure. - /// - void validate() const; - - /// - /// Validate the current data in the model. Returns false on error and writes an error - /// message into the given stringstream. - /// - bool validate(std::stringstream& msg) const; - - /// - /// Helper overload for validate. Used when one model stores another model and calls it's validate. - /// Not meant to be called outside that case. - /// - bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - - bool operator==(const Plot_type_enum& rhs) const; - bool operator!=(const Plot_type_enum& rhs) const; - - ///////////////////////////////////////////// - /// Plot_type_enum members - - Plot_type_enum::ePlot_type_enum getValue() const; - void setValue(Plot_type_enum::ePlot_type_enum value); - - friend void to_json(nlohmann::json& j, const Plot_type_enum& o); - friend void from_json(const nlohmann::json& j, Plot_type_enum& o); -protected: - Plot_type_enum::ePlot_type_enum m_value = Plot_type_enum::ePlot_type_enum::INVALID_VALUE_OPENAPI_GENERATED; -}; - -} // namespace org::openapitools::server::model - -#endif /* Plot_type_enum_H_ */ diff --git a/broker/gen/model/Plot_unit_x.cpp b/broker/gen/model/Plot_unit_x.cpp index f507fca6..d4ebfcac 100644 --- a/broker/gen/model/Plot_unit_x.cpp +++ b/broker/gen/model/Plot_unit_x.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_unit_x.h b/broker/gen/model/Plot_unit_x.h index 1b3f708b..fb519ea1 100644 --- a/broker/gen/model/Plot_unit_x.h +++ b/broker/gen/model/Plot_unit_x.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 1cd225b7..7738088d 100644 --- a/broker/gen/model/Plots.cpp +++ b/broker/gen/model/Plots.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 f4cce6c6..4a5110d8 100644 --- a/broker/gen/model/Plots.h +++ b/broker/gen/model/Plots.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_azim_list.cpp b/broker/gen/model/Roi_azim_list.cpp index e69bd3e9..7e7a89a6 100644 --- a/broker/gen/model/Roi_azim_list.cpp +++ b/broker/gen/model/Roi_azim_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_azim_list.h b/broker/gen/model/Roi_azim_list.h index eeea1f75..b70ddf6a 100644 --- a/broker/gen/model/Roi_azim_list.h +++ b/broker/gen/model/Roi_azim_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_azimuthal.cpp b/broker/gen/model/Roi_azimuthal.cpp index b6f64462..5ebda1fb 100644 --- a/broker/gen/model/Roi_azimuthal.cpp +++ b/broker/gen/model/Roi_azimuthal.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_azimuthal.h b/broker/gen/model/Roi_azimuthal.h index 1bccd9cc..d04228bf 100644 --- a/broker/gen/model/Roi_azimuthal.h +++ b/broker/gen/model/Roi_azimuthal.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 0d9d3428..76b6c60f 100644 --- a/broker/gen/model/Roi_box.cpp +++ b/broker/gen/model/Roi_box.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 ed16f33c..527c9130 100644 --- a/broker/gen/model/Roi_box.h +++ b/broker/gen/model/Roi_box.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 d8be8276..5dc6c040 100644 --- a/broker/gen/model/Roi_box_list.cpp +++ b/broker/gen/model/Roi_box_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 254245cf..91603bf3 100644 --- a/broker/gen/model/Roi_box_list.h +++ b/broker/gen/model/Roi_box_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 6fe39993..ef7400a5 100644 --- a/broker/gen/model/Roi_circle.cpp +++ b/broker/gen/model/Roi_circle.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 b399d488..8f474918 100644 --- a/broker/gen/model/Roi_circle.h +++ b/broker/gen/model/Roi_circle.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 95859a67..b4eb5d65 100644 --- a/broker/gen/model/Roi_circle_list.cpp +++ b/broker/gen/model/Roi_circle_list.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 f9772fa9..31516170 100644 --- a/broker/gen/model/Roi_circle_list.h +++ b/broker/gen/model/Roi_circle_list.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_definitions.cpp b/broker/gen/model/Roi_definitions.cpp index b08e5d86..560e85af 100644 --- a/broker/gen/model/Roi_definitions.cpp +++ b/broker/gen/model/Roi_definitions.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_definitions.h b/broker/gen/model/Roi_definitions.h index 8fb23685..5892842a 100644 --- a/broker/gen/model/Roi_definitions.h +++ b/broker/gen/model/Roi_definitions.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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 3e45e255..2e11d1aa 100644 --- a/broker/gen/model/Rotation_axis.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 7725d7cc..025a1f4b 100644 --- a/broker/gen/model/Rotation_axis.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Scan_result.cpp b/broker/gen/model/Scan_result.cpp new file mode 100644 index 00000000..293b6fe3 --- /dev/null +++ b/broker/gen/model/Scan_result.cpp @@ -0,0 +1,140 @@ +/** +* Jungfraujoch +* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is 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.44 +* Contact: filip.leonarski@psi.ch +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ + + +#include "Scan_result.h" +#include "Helpers.h" + +#include + +namespace org::openapitools::server::model +{ + +Scan_result::Scan_result() +{ + m_File_prefix = ""; + m_File_prefixIsSet = false; + +} + +void Scan_result::validate() const +{ + std::stringstream msg; + if (!validate(msg)) + { + throw org::openapitools::server::helpers::ValidationException(msg.str()); + } +} + +bool Scan_result::validate(std::stringstream& msg) const +{ + return validate(msg, ""); +} + +bool Scan_result::validate(std::stringstream& msg, const std::string& pathPrefix) const +{ + bool success = true; + const std::string _pathPrefix = pathPrefix.empty() ? "Scan_result" : pathPrefix; + + + + /* Images */ { + const std::vector& value = m_Images; + const std::string currentValuePath = _pathPrefix + ".images"; + + + { // Recursive validation of array elements + const std::string oldValuePath = currentValuePath; + int i = 0; + for (const org::openapitools::server::model::Scan_result_images_inner& value : value) + { + const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]"; + + success = value.validate(msg, currentValuePath + ".images") && success; + + i++; + } + } + + } + + return success; +} + +bool Scan_result::operator==(const Scan_result& rhs) const +{ + return + + + + ((!filePrefixIsSet() && !rhs.filePrefixIsSet()) || (filePrefixIsSet() && rhs.filePrefixIsSet() && getFilePrefix() == rhs.getFilePrefix())) && + + (getImages() == rhs.getImages()) + + + ; +} + +bool Scan_result::operator!=(const Scan_result& rhs) const +{ + return !(*this == rhs); +} + +void to_json(nlohmann::json& j, const Scan_result& o) +{ + j = nlohmann::json::object(); + if(o.filePrefixIsSet()) + j["file_prefix"] = o.m_File_prefix; + j["images"] = o.m_Images; + +} + +void from_json(const nlohmann::json& j, Scan_result& o) +{ + if(j.find("file_prefix") != j.end()) + { + j.at("file_prefix").get_to(o.m_File_prefix); + o.m_File_prefixIsSet = true; + } + j.at("images").get_to(o.m_Images); + +} + +std::string Scan_result::getFilePrefix() const +{ + return m_File_prefix; +} +void Scan_result::setFilePrefix(std::string const& value) +{ + m_File_prefix = value; + m_File_prefixIsSet = true; +} +bool Scan_result::filePrefixIsSet() const +{ + return m_File_prefixIsSet; +} +void Scan_result::unsetFile_prefix() +{ + m_File_prefixIsSet = false; +} +std::vector Scan_result::getImages() const +{ + return m_Images; +} +void Scan_result::setImages(std::vector const& value) +{ + m_Images = value; +} + + +} // namespace org::openapitools::server::model + diff --git a/broker/gen/model/Grid_plot.h b/broker/gen/model/Scan_result.h similarity index 57% rename from broker/gen/model/Grid_plot.h rename to broker/gen/model/Scan_result.h index 49583bed..62a9a6a3 100644 --- a/broker/gen/model/Grid_plot.h +++ b/broker/gen/model/Scan_result.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.40 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -10,15 +10,17 @@ * Do not edit the class manually. */ /* - * Grid_plot.h + * Scan_result.h * - * + * Results of a grid scan */ -#ifndef Grid_plot_H_ -#define Grid_plot_H_ +#ifndef Scan_result_H_ +#define Scan_result_H_ +#include "Scan_result_images_inner.h" +#include #include #include @@ -26,13 +28,13 @@ namespace org::openapitools::server::model { /// -/// +/// Results of a grid scan /// -class Grid_plot +class Scan_result { public: - Grid_plot(); - virtual ~Grid_plot() = default; + Scan_result(); + virtual ~Scan_result() = default; /// @@ -52,33 +54,35 @@ public: /// bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - bool operator==(const Grid_plot& rhs) const; - bool operator!=(const Grid_plot& rhs) const; + bool operator==(const Scan_result& rhs) const; + bool operator!=(const Scan_result& rhs) const; ///////////////////////////////////////////// - /// Grid_plot members + /// Scan_result members /// /// /// - std::vector getData() const; - void setData(std::vector const value); + std::string getFilePrefix() const; + void setFilePrefix(std::string const& value); + bool filePrefixIsSet() const; + void unsetFile_prefix(); /// /// /// - int64_t getWidth() const; - void setWidth(int64_t const value); + std::vector getImages() const; + void setImages(std::vector const& value); - friend void to_json(nlohmann::json& j, const Grid_plot& o); - friend void from_json(const nlohmann::json& j, Grid_plot& o); + friend void to_json(nlohmann::json& j, const Scan_result& o); + friend void from_json(const nlohmann::json& j, Scan_result& o); protected: - std::vector m_Data; - - int64_t m_Width; + std::string m_File_prefix; + bool m_File_prefixIsSet; + std::vector m_Images; }; } // namespace org::openapitools::server::model -#endif /* Grid_plot_H_ */ +#endif /* Scan_result_H_ */ diff --git a/broker/gen/model/Scan_result_images_inner.cpp b/broker/gen/model/Scan_result_images_inner.cpp new file mode 100644 index 00000000..374e772d --- /dev/null +++ b/broker/gen/model/Scan_result_images_inner.cpp @@ -0,0 +1,423 @@ +/** +* Jungfraujoch +* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is 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.44 +* Contact: filip.leonarski@psi.ch +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ + + +#include "Scan_result_images_inner.h" +#include "Helpers.h" + +#include + +namespace org::openapitools::server::model +{ + +Scan_result_images_inner::Scan_result_images_inner() +{ + m_Efficiency = 0.0f; + m_number = 0L; + m_Bkg = 0.0f; + m_BkgIsSet = false; + m_Spots = 0L; + m_SpotsIsSet = false; + m_Index = 0L; + m_IndexIsSet = false; + m_Mos = 0.0f; + m_MosIsSet = false; + m_b = 0.0f; + m_bIsSet = false; + m_UcIsSet = false; + m_Xfel_pulseid = 0L; + m_Xfel_pulseidIsSet = false; + m_Pixel_sum = 0L; + m_Pixel_sumIsSet = false; + m_Max = 0L; + m_MaxIsSet = false; + m_Sat = 0L; + m_SatIsSet = false; + m_Err = 0L; + m_ErrIsSet = false; + +} + +void Scan_result_images_inner::validate() const +{ + std::stringstream msg; + if (!validate(msg)) + { + throw org::openapitools::server::helpers::ValidationException(msg.str()); + } +} + +bool Scan_result_images_inner::validate(std::stringstream& msg) const +{ + return validate(msg, ""); +} + +bool Scan_result_images_inner::validate(std::stringstream& msg, const std::string& pathPrefix) const +{ + bool success = true; + const std::string _pathPrefix = pathPrefix.empty() ? "Scan_result_images_inner" : pathPrefix; + + + return success; +} + +bool Scan_result_images_inner::operator==(const Scan_result_images_inner& rhs) const +{ + return + + + (getEfficiency() == rhs.getEfficiency()) + && + + (getNumber() == rhs.getNumber()) + && + + + ((!bkgIsSet() && !rhs.bkgIsSet()) || (bkgIsSet() && rhs.bkgIsSet() && getBkg() == rhs.getBkg())) && + + + ((!spotsIsSet() && !rhs.spotsIsSet()) || (spotsIsSet() && rhs.spotsIsSet() && getSpots() == rhs.getSpots())) && + + + ((!indexIsSet() && !rhs.indexIsSet()) || (indexIsSet() && rhs.indexIsSet() && getIndex() == rhs.getIndex())) && + + + ((!mosIsSet() && !rhs.mosIsSet()) || (mosIsSet() && rhs.mosIsSet() && getMos() == rhs.getMos())) && + + + ((!BIsSet() && !rhs.BIsSet()) || (BIsSet() && rhs.BIsSet() && getB() == rhs.getB())) && + + + ((!ucIsSet() && !rhs.ucIsSet()) || (ucIsSet() && rhs.ucIsSet() && getUc() == rhs.getUc())) && + + + ((!xfelPulseidIsSet() && !rhs.xfelPulseidIsSet()) || (xfelPulseidIsSet() && rhs.xfelPulseidIsSet() && getXfelPulseid() == rhs.getXfelPulseid())) && + + + ((!pixelSumIsSet() && !rhs.pixelSumIsSet()) || (pixelSumIsSet() && rhs.pixelSumIsSet() && getPixelSum() == rhs.getPixelSum())) && + + + ((!maxIsSet() && !rhs.maxIsSet()) || (maxIsSet() && rhs.maxIsSet() && getMax() == rhs.getMax())) && + + + ((!satIsSet() && !rhs.satIsSet()) || (satIsSet() && rhs.satIsSet() && getSat() == rhs.getSat())) && + + + ((!errIsSet() && !rhs.errIsSet()) || (errIsSet() && rhs.errIsSet() && getErr() == rhs.getErr())) + + ; +} + +bool Scan_result_images_inner::operator!=(const Scan_result_images_inner& rhs) const +{ + return !(*this == rhs); +} + +void to_json(nlohmann::json& j, const Scan_result_images_inner& o) +{ + j = nlohmann::json::object(); + j["efficiency"] = o.m_Efficiency; + j["number"] = o.m_number; + if(o.bkgIsSet()) + j["bkg"] = o.m_Bkg; + if(o.spotsIsSet()) + j["spots"] = o.m_Spots; + if(o.indexIsSet()) + j["index"] = o.m_Index; + if(o.mosIsSet()) + j["mos"] = o.m_Mos; + if(o.BIsSet()) + j["b"] = o.m_b; + if(o.ucIsSet()) + j["uc"] = o.m_Uc; + if(o.xfelPulseidIsSet()) + j["xfel_pulseid"] = o.m_Xfel_pulseid; + if(o.pixelSumIsSet()) + j["pixel_sum"] = o.m_Pixel_sum; + if(o.maxIsSet()) + j["max"] = o.m_Max; + if(o.satIsSet()) + j["sat"] = o.m_Sat; + if(o.errIsSet()) + j["err"] = o.m_Err; + +} + +void from_json(const nlohmann::json& j, Scan_result_images_inner& o) +{ + j.at("efficiency").get_to(o.m_Efficiency); + j.at("number").get_to(o.m_number); + if(j.find("bkg") != j.end()) + { + j.at("bkg").get_to(o.m_Bkg); + o.m_BkgIsSet = true; + } + if(j.find("spots") != j.end()) + { + j.at("spots").get_to(o.m_Spots); + o.m_SpotsIsSet = true; + } + if(j.find("index") != j.end()) + { + j.at("index").get_to(o.m_Index); + o.m_IndexIsSet = true; + } + if(j.find("mos") != j.end()) + { + j.at("mos").get_to(o.m_Mos); + o.m_MosIsSet = true; + } + if(j.find("b") != j.end()) + { + j.at("b").get_to(o.m_b); + o.m_bIsSet = true; + } + if(j.find("uc") != j.end()) + { + j.at("uc").get_to(o.m_Uc); + o.m_UcIsSet = true; + } + if(j.find("xfel_pulseid") != j.end()) + { + j.at("xfel_pulseid").get_to(o.m_Xfel_pulseid); + o.m_Xfel_pulseidIsSet = true; + } + if(j.find("pixel_sum") != j.end()) + { + j.at("pixel_sum").get_to(o.m_Pixel_sum); + o.m_Pixel_sumIsSet = true; + } + if(j.find("max") != j.end()) + { + j.at("max").get_to(o.m_Max); + o.m_MaxIsSet = true; + } + if(j.find("sat") != j.end()) + { + j.at("sat").get_to(o.m_Sat); + o.m_SatIsSet = true; + } + if(j.find("err") != j.end()) + { + j.at("err").get_to(o.m_Err); + o.m_ErrIsSet = true; + } + +} + +float Scan_result_images_inner::getEfficiency() const +{ + return m_Efficiency; +} +void Scan_result_images_inner::setEfficiency(float const value) +{ + m_Efficiency = value; +} +int64_t Scan_result_images_inner::getNumber() const +{ + return m_number; +} +void Scan_result_images_inner::setNumber(int64_t const value) +{ + m_number = value; +} +float Scan_result_images_inner::getBkg() const +{ + return m_Bkg; +} +void Scan_result_images_inner::setBkg(float const value) +{ + m_Bkg = value; + m_BkgIsSet = true; +} +bool Scan_result_images_inner::bkgIsSet() const +{ + return m_BkgIsSet; +} +void Scan_result_images_inner::unsetBkg() +{ + m_BkgIsSet = false; +} +int64_t Scan_result_images_inner::getSpots() const +{ + return m_Spots; +} +void Scan_result_images_inner::setSpots(int64_t const value) +{ + m_Spots = value; + m_SpotsIsSet = true; +} +bool Scan_result_images_inner::spotsIsSet() const +{ + return m_SpotsIsSet; +} +void Scan_result_images_inner::unsetSpots() +{ + m_SpotsIsSet = false; +} +int64_t Scan_result_images_inner::getIndex() const +{ + return m_Index; +} +void Scan_result_images_inner::setIndex(int64_t const value) +{ + m_Index = value; + m_IndexIsSet = true; +} +bool Scan_result_images_inner::indexIsSet() const +{ + return m_IndexIsSet; +} +void Scan_result_images_inner::unsetIndex() +{ + m_IndexIsSet = false; +} +float Scan_result_images_inner::getMos() const +{ + return m_Mos; +} +void Scan_result_images_inner::setMos(float const value) +{ + m_Mos = value; + m_MosIsSet = true; +} +bool Scan_result_images_inner::mosIsSet() const +{ + return m_MosIsSet; +} +void Scan_result_images_inner::unsetMos() +{ + m_MosIsSet = false; +} +float Scan_result_images_inner::getB() const +{ + return m_b; +} +void Scan_result_images_inner::setB(float const value) +{ + m_b = value; + m_bIsSet = true; +} +bool Scan_result_images_inner::BIsSet() const +{ + return m_bIsSet; +} +void Scan_result_images_inner::unsetb() +{ + m_bIsSet = false; +} +org::openapitools::server::model::Unit_cell Scan_result_images_inner::getUc() const +{ + return m_Uc; +} +void Scan_result_images_inner::setUc(org::openapitools::server::model::Unit_cell const& value) +{ + m_Uc = value; + m_UcIsSet = true; +} +bool Scan_result_images_inner::ucIsSet() const +{ + return m_UcIsSet; +} +void Scan_result_images_inner::unsetUc() +{ + m_UcIsSet = false; +} +int64_t Scan_result_images_inner::getXfelPulseid() const +{ + return m_Xfel_pulseid; +} +void Scan_result_images_inner::setXfelPulseid(int64_t const value) +{ + m_Xfel_pulseid = value; + m_Xfel_pulseidIsSet = true; +} +bool Scan_result_images_inner::xfelPulseidIsSet() const +{ + return m_Xfel_pulseidIsSet; +} +void Scan_result_images_inner::unsetXfel_pulseid() +{ + m_Xfel_pulseidIsSet = false; +} +int64_t Scan_result_images_inner::getPixelSum() const +{ + return m_Pixel_sum; +} +void Scan_result_images_inner::setPixelSum(int64_t const value) +{ + m_Pixel_sum = value; + m_Pixel_sumIsSet = true; +} +bool Scan_result_images_inner::pixelSumIsSet() const +{ + return m_Pixel_sumIsSet; +} +void Scan_result_images_inner::unsetPixel_sum() +{ + m_Pixel_sumIsSet = false; +} +int64_t Scan_result_images_inner::getMax() const +{ + return m_Max; +} +void Scan_result_images_inner::setMax(int64_t const value) +{ + m_Max = value; + m_MaxIsSet = true; +} +bool Scan_result_images_inner::maxIsSet() const +{ + return m_MaxIsSet; +} +void Scan_result_images_inner::unsetMax() +{ + m_MaxIsSet = false; +} +int64_t Scan_result_images_inner::getSat() const +{ + return m_Sat; +} +void Scan_result_images_inner::setSat(int64_t const value) +{ + m_Sat = value; + m_SatIsSet = true; +} +bool Scan_result_images_inner::satIsSet() const +{ + return m_SatIsSet; +} +void Scan_result_images_inner::unsetSat() +{ + m_SatIsSet = false; +} +int64_t Scan_result_images_inner::getErr() const +{ + return m_Err; +} +void Scan_result_images_inner::setErr(int64_t const value) +{ + m_Err = value; + m_ErrIsSet = true; +} +bool Scan_result_images_inner::errIsSet() const +{ + return m_ErrIsSet; +} +void Scan_result_images_inner::unsetErr() +{ + m_ErrIsSet = false; +} + + +} // namespace org::openapitools::server::model + diff --git a/broker/gen/model/Scan_result_images_inner.h b/broker/gen/model/Scan_result_images_inner.h new file mode 100644 index 00000000..f8cb9b70 --- /dev/null +++ b/broker/gen/model/Scan_result_images_inner.h @@ -0,0 +1,183 @@ +/** +* Jungfraujoch +* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is 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.44 +* Contact: filip.leonarski@psi.ch +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +/* + * Scan_result_images_inner.h + * + * + */ + +#ifndef Scan_result_images_inner_H_ +#define Scan_result_images_inner_H_ + + +#include "Unit_cell.h" +#include + +namespace org::openapitools::server::model +{ + +/// +/// +/// +class Scan_result_images_inner +{ +public: + Scan_result_images_inner(); + virtual ~Scan_result_images_inner() = default; + + + /// + /// Validate the current data in the model. Throws a ValidationException on failure. + /// + void validate() const; + + /// + /// Validate the current data in the model. Returns false on error and writes an error + /// message into the given stringstream. + /// + bool validate(std::stringstream& msg) const; + + /// + /// Helper overload for validate. Used when one model stores another model and calls it's validate. + /// Not meant to be called outside that case. + /// + bool validate(std::stringstream& msg, const std::string& pathPrefix) const; + + bool operator==(const Scan_result_images_inner& rhs) const; + bool operator!=(const Scan_result_images_inner& rhs) const; + + ///////////////////////////////////////////// + /// Scan_result_images_inner members + + /// + /// + /// + float getEfficiency() const; + void setEfficiency(float const value); + /// + /// Detector image number for a given cell + /// + int64_t getNumber() const; + void setNumber(int64_t const value); + /// + /// Background estimate + /// + float getBkg() const; + void setBkg(float const value); + bool bkgIsSet() const; + void unsetBkg(); + /// + /// Spot count + /// + int64_t getSpots() const; + void setSpots(int64_t const value); + bool spotsIsSet() const; + void unsetSpots(); + /// + /// Indexing solution + /// + int64_t getIndex() const; + void setIndex(int64_t const value); + bool indexIsSet() const; + void unsetIndex(); + /// + /// Mosaicity estimate + /// + float getMos() const; + void setMos(float const value); + bool mosIsSet() const; + void unsetMos(); + /// + /// B-Factor estimate + /// + float getB() const; + void setB(float const value); + bool BIsSet() const; + void unsetb(); + /// + /// + /// + org::openapitools::server::model::Unit_cell getUc() const; + void setUc(org::openapitools::server::model::Unit_cell const& value); + bool ucIsSet() const; + void unsetUc(); + /// + /// XFEL pulse ID + /// + int64_t getXfelPulseid() const; + void setXfelPulseid(int64_t const value); + bool xfelPulseidIsSet() const; + void unsetXfel_pulseid(); + /// + /// Total sum of all pixels + /// + int64_t getPixelSum() const; + void setPixelSum(int64_t const value); + bool pixelSumIsSet() const; + void unsetPixel_sum(); + /// + /// Max viable pixel + /// + int64_t getMax() const; + void setMax(int64_t const value); + bool maxIsSet() const; + void unsetMax(); + /// + /// Number of saturated pixels + /// + int64_t getSat() const; + void setSat(int64_t const value); + bool satIsSet() const; + void unsetSat(); + /// + /// Number of error pixels + /// + int64_t getErr() const; + void setErr(int64_t const value); + bool errIsSet() const; + void unsetErr(); + + friend void to_json(nlohmann::json& j, const Scan_result_images_inner& o); + friend void from_json(const nlohmann::json& j, Scan_result_images_inner& o); +protected: + float m_Efficiency; + + int64_t m_number; + + float m_Bkg; + bool m_BkgIsSet; + int64_t m_Spots; + bool m_SpotsIsSet; + int64_t m_Index; + bool m_IndexIsSet; + float m_Mos; + bool m_MosIsSet; + float m_b; + bool m_bIsSet; + org::openapitools::server::model::Unit_cell m_Uc; + bool m_UcIsSet; + int64_t m_Xfel_pulseid; + bool m_Xfel_pulseidIsSet; + int64_t m_Pixel_sum; + bool m_Pixel_sumIsSet; + int64_t m_Max; + bool m_MaxIsSet; + int64_t m_Sat; + bool m_SatIsSet; + int64_t m_Err; + bool m_ErrIsSet; + +}; + +} // namespace org::openapitools::server::model + +#endif /* Scan_result_images_inner_H_ */ diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp index 7640730a..a9303396 100644 --- a/broker/gen/model/Spot_finding_settings.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 ea8cc2eb..a2aa4207 100644 --- a/broker/gen/model/Spot_finding_settings.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 41c3b639..6164e094 100644 --- a/broker/gen/model/Standard_detector_geometry.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 4bd2280c..fbda4f2f 100644 --- a/broker/gen/model/Standard_detector_geometry.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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/Unit_cell.cpp similarity index 75% rename from broker/gen/model/Dataset_settings_unit_cell.cpp rename to broker/gen/model/Unit_cell.cpp index 216f24f6..d457841e 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.cpp +++ b/broker/gen/model/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ */ -#include "Dataset_settings_unit_cell.h" +#include "Unit_cell.h" #include "Helpers.h" #include @@ -19,7 +19,7 @@ namespace org::openapitools::server::model { -Dataset_settings_unit_cell::Dataset_settings_unit_cell() +Unit_cell::Unit_cell() { m_a = 0.0f; m_b = 0.0f; @@ -30,7 +30,7 @@ Dataset_settings_unit_cell::Dataset_settings_unit_cell() } -void Dataset_settings_unit_cell::validate() const +void Unit_cell::validate() const { std::stringstream msg; if (!validate(msg)) @@ -39,15 +39,15 @@ void Dataset_settings_unit_cell::validate() const } } -bool Dataset_settings_unit_cell::validate(std::stringstream& msg) const +bool Unit_cell::validate(std::stringstream& msg) const { return validate(msg, ""); } -bool Dataset_settings_unit_cell::validate(std::stringstream& msg, const std::string& pathPrefix) const +bool Unit_cell::validate(std::stringstream& msg, const std::string& pathPrefix) const { bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Dataset_settings_unit_cell" : pathPrefix; + const std::string _pathPrefix = pathPrefix.empty() ? "Unit_cell" : pathPrefix; @@ -152,7 +152,7 @@ bool Dataset_settings_unit_cell::validate(std::stringstream& msg, const std::str return success; } -bool Dataset_settings_unit_cell::operator==(const Dataset_settings_unit_cell& rhs) const +bool Unit_cell::operator==(const Unit_cell& rhs) const { return @@ -178,12 +178,12 @@ bool Dataset_settings_unit_cell::operator==(const Dataset_settings_unit_cell& rh ; } -bool Dataset_settings_unit_cell::operator!=(const Dataset_settings_unit_cell& rhs) const +bool Unit_cell::operator!=(const Unit_cell& rhs) const { return !(*this == rhs); } -void to_json(nlohmann::json& j, const Dataset_settings_unit_cell& o) +void to_json(nlohmann::json& j, const Unit_cell& o) { j = nlohmann::json::object(); j["a"] = o.m_a; @@ -195,7 +195,7 @@ void to_json(nlohmann::json& j, const Dataset_settings_unit_cell& o) } -void from_json(const nlohmann::json& j, Dataset_settings_unit_cell& o) +void from_json(const nlohmann::json& j, Unit_cell& o) { j.at("a").get_to(o.m_a); j.at("b").get_to(o.m_b); @@ -206,51 +206,51 @@ void from_json(const nlohmann::json& j, Dataset_settings_unit_cell& o) } -float Dataset_settings_unit_cell::getA() const +float Unit_cell::getA() const { return m_a; } -void Dataset_settings_unit_cell::setA(float const value) +void Unit_cell::setA(float const value) { m_a = value; } -float Dataset_settings_unit_cell::getB() const +float Unit_cell::getB() const { return m_b; } -void Dataset_settings_unit_cell::setB(float const value) +void Unit_cell::setB(float const value) { m_b = value; } -float Dataset_settings_unit_cell::getC() const +float Unit_cell::getC() const { return m_c; } -void Dataset_settings_unit_cell::setC(float const value) +void Unit_cell::setC(float const value) { m_c = value; } -float Dataset_settings_unit_cell::getAlpha() const +float Unit_cell::getAlpha() const { return m_Alpha; } -void Dataset_settings_unit_cell::setAlpha(float const value) +void Unit_cell::setAlpha(float const value) { m_Alpha = value; } -float Dataset_settings_unit_cell::getBeta() const +float Unit_cell::getBeta() const { return m_Beta; } -void Dataset_settings_unit_cell::setBeta(float const value) +void Unit_cell::setBeta(float const value) { m_Beta = value; } -float Dataset_settings_unit_cell::getGamma() const +float Unit_cell::getGamma() const { return m_Gamma; } -void Dataset_settings_unit_cell::setGamma(float const value) +void Unit_cell::setGamma(float const value) { m_Gamma = value; } diff --git a/broker/gen/model/Dataset_settings_unit_cell.h b/broker/gen/model/Unit_cell.h similarity index 77% rename from broker/gen/model/Dataset_settings_unit_cell.h rename to broker/gen/model/Unit_cell.h index 40a0cc6a..72fa0581 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.h +++ b/broker/gen/model/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -10,13 +10,13 @@ * Do not edit the class manually. */ /* - * Dataset_settings_unit_cell.h + * Unit_cell.h * * Unit cell parameters. Necessary to run indexing. Units of angstrom and degree */ -#ifndef Dataset_settings_unit_cell_H_ -#define Dataset_settings_unit_cell_H_ +#ifndef Unit_cell_H_ +#define Unit_cell_H_ #include @@ -27,11 +27,11 @@ namespace org::openapitools::server::model /// /// Unit cell parameters. Necessary to run indexing. Units of angstrom and degree /// -class Dataset_settings_unit_cell +class Unit_cell { public: - Dataset_settings_unit_cell(); - virtual ~Dataset_settings_unit_cell() = default; + Unit_cell(); + virtual ~Unit_cell() = default; /// @@ -51,11 +51,11 @@ public: /// bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - bool operator==(const Dataset_settings_unit_cell& rhs) const; - bool operator!=(const Dataset_settings_unit_cell& rhs) const; + bool operator==(const Unit_cell& rhs) const; + bool operator!=(const Unit_cell& rhs) const; ///////////////////////////////////////////// - /// Dataset_settings_unit_cell members + /// Unit_cell members /// /// @@ -88,8 +88,8 @@ public: float getGamma() const; void setGamma(float const value); - friend void to_json(nlohmann::json& j, const Dataset_settings_unit_cell& o); - friend void from_json(const nlohmann::json& j, Dataset_settings_unit_cell& o); + friend void to_json(nlohmann::json& j, const Unit_cell& o); + friend void from_json(const nlohmann::json& j, Unit_cell& o); protected: float m_a; @@ -108,4 +108,4 @@ protected: } // namespace org::openapitools::server::model -#endif /* Dataset_settings_unit_cell_H_ */ +#endif /* Unit_cell_H_ */ diff --git a/broker/gen/model/Zeromq_metadata_settings.cpp b/broker/gen/model/Zeromq_metadata_settings.cpp index 08d1f25e..97967582 100644 --- a/broker/gen/model/Zeromq_metadata_settings.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_metadata_settings.h b/broker/gen/model/Zeromq_metadata_settings.h index e28902b7..139d64d7 100644 --- a/broker/gen/model/Zeromq_metadata_settings.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_preview_settings.cpp b/broker/gen/model/Zeromq_preview_settings.cpp index 19e13e83..88022e9e 100644 --- a/broker/gen/model/Zeromq_preview_settings.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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_preview_settings.h b/broker/gen/model/Zeromq_preview_settings.h index 5288d98d..af411526 100644 --- a/broker/gen/model/Zeromq_preview_settings.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 eb76905b..94402fc7 100644 --- a/broker/gen/model/Zeromq_settings.cpp +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 244974b4..8227889d 100644 --- a/broker/gen/model/Zeromq_settings.h +++ b/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.43 +* The version of the OpenAPI document: 1.0.0-rc.44 * 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 2f05b19e..807dcc06 100644 --- a/broker/jfjoch_api.yaml +++ b/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.43 + version: 1.0.0-rc.44 contact: name: Filip Leonarski (Paul Scherrer Institute) email: filip.leonarski@psi.ch @@ -496,49 +496,51 @@ components: maximum: 6.28318530718 default: 0.0 unit_cell: - type: object - description: Unit cell parameters. Necessary to run indexing. Units of angstrom and degree - required: - - a - - b - - c - - alpha - - beta - - gamma - properties: - a: - type: number - format: float - example: 37 - minimum: 0 - b: - type: number - format: float - example: 37 - minimum: 0 - c: - type: number - format: float - example: 78 - minimum: 0 - alpha: - type: number - format: float - example: 90 - minimum: 0 - maximum: 360 - beta: - type: number - format: float - example: 90 - minimum: 0 - maximum: 360 - gamma: - type: number - format: float - example: 90 - minimum: 0 - maximum: 360 + $ref: '#/components/schemas/unit_cell' + unit_cell: + type: object + description: Unit cell parameters. Necessary to run indexing. Units of angstrom and degree + required: + - a + - b + - c + - alpha + - beta + - gamma + properties: + a: + type: number + format: float + example: 37 + minimum: 0 + b: + type: number + format: float + example: 37 + minimum: 0 + c: + type: number + format: float + example: 78 + minimum: 0 + alpha: + type: number + format: float + example: 90 + minimum: 0 + maximum: 360 + beta: + type: number + format: float + example: 90 + minimum: 0 + maximum: 360 + gamma: + type: number + format: float + example: 90 + minimum: 0 + maximum: 360 file_writer_format: type: string enum: @@ -1257,48 +1259,71 @@ components: type: array items: $ref: '#/components/schemas/plot' - grid_scan_result: + scan_result: type: object description: Results of a grid scan required: - - det_img - - bkg_estimate - - spot_count - - indexed_lattices - - mosaicity - - b_factor + - images properties: - det_img: + file_prefix: + type: string + images: type: array items: - type: integer - format: int64 - description: Detector image number for a given cell - bkg_estimate: - type: array - items: - type: number - format: float - spot_count: - type: array - items: - type: integer - format: int64 - indexed_lattices: - type: array - items: - type: integer - format: int64 - mosaicity: - type: array - items: - type: number - format: float - b_factor: - type: array - items: - type: number - format: float + type: object + required: + - efficiency + - number + properties: + efficiency: + type: number + format: float + number: + type: integer + format: int64 + description: Detector image number for a given cell + bkg: + type: number + format: float + description: Background estimate + spots: + type: integer + format: int64 + description: Spot count + index: + type: integer + format: int64 + description: Indexing solution + mos: + type: number + format: float + description: Mosaicity estimate + b: + type: number + format: float + description: B-Factor estimate + uc: + $ref: '#/components/schemas/unit_cell' + xfel_pulseid: + type: integer + format: int64 + description: XFEL pulse ID + pixel_sum: + type: integer + format: int64 + description: Total sum of all pixels + max: + type: integer + format: int64 + description: Max viable pixel + sat: + type: integer + format: int64 + description: Number of saturated pixels + err: + type: integer + format: int64 + description: Number of error pixels calibration_statistics: type: array items: @@ -2817,18 +2842,24 @@ paths: schema: type: string description: Exception error - /result/grid_scan: + /result/scan: get: - summary: Get grid scan result + summary: Get full scan result responses: "200": description: Everything OK. content: application/json: schema: - $ref: '#/components/schemas/grid_scan_result' + $ref: '#/components/schemas/scan_result' "404": description: No grid scan recorded + "500": + description: Error within Jungfraujoch code - see output message. + content: + application/json: + schema: + $ref: '#/components/schemas/error_message' /image_buffer/start.cbor: get: summary: Get Start message in CBOR format diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 9cf36336..d8156344 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -377,7 +377,7 @@ data-styled.g138[id="sc-edfAab"]{content:"jutLom,"}/*!sc*/ Get user mask of the detector (binary)
API docs by Redocly
putUpload user mask of the detector
API docs by Redocly

Jungfraujoch (1.0.0-rc.43)

Download OpenAPI specification:

Filip Leonarski (Paul Scherrer Institute): filip.leonarski@psi.ch License: GPL-3.0

Jungfraujoch (1.0.0-rc.44)

Download OpenAPI specification:

Filip Leonarski (Paul Scherrer Institute): filip.leonarski@psi.ch License: GPL-3.0

API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). @@ -571,7 +571,7 @@ If parameter is not provided calibration will be saved only if more than 4 image " class="sc-dTUlgT sc-fhPBcz gAHTYt iCKFAv">

PONI angle rot2 (see PyFAI documentation for details) in radians

poni_rot3_rad
number <float> [ -6.28318530718 .. 6.28318530718 ]
Default: 0

PONI angle rot3 (see PyFAI documentation for details) in radians

-
object
object (unit_cell)

Unit cell parameters. Necessary to run indexing. Units of angstrom and degree

Responses

Response samples

Content type
application/json
{
  • "title": "string",
  • "unit_x": "image_number",
  • "size_x": 0.1,
  • "size_y": 0.1,
  • "plot": [
    ]
}

Get grid scan result

Responses

Response samples

Content type
application/json
{
  • "title": "string",
  • "unit_x": "image_number",
  • "size_x": 0.1,
  • "size_y": 0.1,
  • "plot": [
    ]
}

Get full scan result

Responses

Response samples

Content type
application/json
{
  • "det_img": [
    ],
  • "bkg_estimate": [
    ],
  • "spot_count": [
    ],
  • "indexed_lattices": [
    ],
  • "mosaicity": [
    ],
  • "b_factor": [
    ]
}

Get Start message in CBOR format

http://localhost:5232/result/scan

Response samples

Content type
application/json
{
  • "file_prefix": "string",
  • "images": [
    ]
}

Get Start message in CBOR format

Contains metadata for a dataset (e.g., experimental geometry)

Responses