From 41a3e671f4bfa8b7f3898f11bb9baa542fe4548c Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Tue, 10 Jun 2025 18:14:04 +0200 Subject: [PATCH] v1.0.0-rc.41 --- VERSION | 2 +- broker/JFJochBrokerHttp.cpp | 18 +- broker/JFJochBrokerHttp.h | 3 +- broker/JFJochStateMachine.cpp | 5 +- broker/JFJochStateMachine.h | 4 + broker/OpenAPIConvert.cpp | 26 ++- broker/gen/api/ApiBase.h | 2 +- broker/gen/api/DefaultApi.cpp | 12 +- broker/gen/api/DefaultApi.h | 5 +- broker/gen/model/Azim_int_settings.cpp | 82 +++++--- broker/gen/model/Azim_int_settings.h | 23 ++- broker/gen/model/Broker_status.cpp | 64 +++++- broker/gen/model/Broker_status.h | 20 +- .../model/Calibration_statistics_inner.cpp | 2 +- .../gen/model/Calibration_statistics_inner.h | 2 +- broker/gen/model/Dataset_settings.cpp | 194 +++++++++++++++++- broker/gen/model/Dataset_settings.h | 38 +++- .../gen/model/Dataset_settings_unit_cell.cpp | 2 +- broker/gen/model/Dataset_settings_unit_cell.h | 2 +- broker/gen/model/Detector.cpp | 2 +- broker/gen/model/Detector.h | 2 +- broker/gen/model/Detector_list.cpp | 2 +- broker/gen/model/Detector_list.h | 2 +- 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_scan.cpp | 2 +- broker/gen/model/Grid_scan.h | 2 +- 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_unit_x.cpp | 8 +- broker/gen/model/Plot_unit_x.h | 3 +- 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/Spot_finding_settings.cpp | 18 +- broker/gen/model/Spot_finding_settings.h | 9 +- .../gen/model/Standard_detector_geometry.cpp | 2 +- broker/gen/model/Standard_detector_geometry.h | 2 +- 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 | 79 ++++++- broker/redoc-static.html | 44 ++-- common/AzimuthalIntegration.cpp | 81 +++++--- common/AzimuthalIntegration.h | 21 +- common/AzimuthalIntegrationProfile.cpp | 62 +++++- common/AzimuthalIntegrationProfile.h | 13 +- common/AzimuthalIntegrationSettings.cpp | 61 ++++-- common/AzimuthalIntegrationSettings.h | 15 +- common/CMakeLists.txt | 2 + common/Coord.cpp | 93 ++++++++- common/Coord.h | 13 ++ .../indexing => common}/CrystalLattice.cpp | 14 +- .../indexing => common}/CrystalLattice.h | 5 +- common/DatasetSettings.cpp | 47 +++++ common/DatasetSettings.h | 15 ++ common/DiffractionExperiment.cpp | 7 +- common/DiffractionGeometry.cpp | 103 ++++++++-- common/DiffractionGeometry.h | 16 +- common/JFJochMessages.h | 13 +- common/MultiLinePlot.h | 2 +- common/PixelMask.cpp | 16 ++ common/PixelMask.h | 2 + common/Plot.h | 21 +- common/Reflection.h | 12 +- docs/CBOR.md | 7 +- docs/CHANGELOG.md | 9 + docs/conf.py | 2 +- docs/python_client/README.md | 4 +- docs/python_client/docs/AzimIntSettings.md | 3 +- docs/python_client/docs/BrokerStatus.md | 2 + docs/python_client/docs/DatasetSettings.md | 4 + docs/python_client/docs/DefaultApi.md | 6 +- .../docs/DetectorListDetectorsInner.md | 3 + docs/python_client/docs/PlotUnitX.md | 2 + docs/python_client/docs/PreviewSettings.md | 2 +- .../python_client/docs/SpotFindingSettings.md | 1 + 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/jfjoch_fpga.h | 4 +- fpga/pcie_driver/postinstall.sh | 2 +- fpga/pcie_driver/preuninstall.sh | 2 +- frame_serialize/CBORStream2Deserializer.cpp | 22 +- frame_serialize/CBORStream2Serializer.cpp | 12 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- frontend/src/App.tsx | 4 +- frontend/src/components/AzIntSettings.tsx | 98 ++++----- .../src/components/DataProcessingPlot.tsx | 19 +- .../src/components/DataProcessingPlots.tsx | 31 ++- .../src/components/DataProcessingSettings.tsx | 15 +- frontend/src/components/IndexingSettings.tsx | 4 +- frontend/src/openapi/core/OpenAPI.ts | 2 +- frontend/src/openapi/index.ts | 1 + .../src/openapi/models/azim_int_settings.ts | 8 +- frontend/src/openapi/models/azint_unit.ts | 14 ++ frontend/src/openapi/models/broker_status.ts | 8 + .../src/openapi/models/dataset_settings.ts | 16 ++ frontend/src/openapi/models/plot_type.ts | 3 + frontend/src/openapi/models/plot_unit_x.ts | 1 + .../openapi/models/spot_finding_settings.ts | 5 + .../src/openapi/services/DefaultService.ts | 6 +- frontend/src/version.ts | 2 +- gitlab_upload_release.sh | 2 +- image_analysis/BraggPrediction.cpp | 66 ++++++ image_analysis/BraggPrediction.h | 28 +++ image_analysis/CMakeLists.txt | 5 +- image_analysis/ImageAnalysisCPU.cpp | 13 +- image_analysis/ImageAnalysisCPU.h | 3 +- image_analysis/IntegrationStats.cpp | 51 +++++ image_analysis/IntegrationStats.h | 29 +++ image_analysis/MXAnalyzer.cpp | 8 +- image_analysis/QuickIntegrate.cpp | 69 +++---- image_analysis/QuickIntegrate.h | 21 +- image_analysis/SpotFindingSettings.h | 3 +- image_analysis/indexing/FFBIDXIndexer.cpp | 40 +--- image_analysis/indexing/FFBIDXIndexer.h | 4 +- image_analysis/indexing/FFTIndexer.cpp | 5 +- image_analysis/indexing/FFTIndexer.h | 6 +- image_analysis/indexing/FFTIndexer_refine.cpp | 41 +--- image_analysis/indexing/Indexer.cpp | 71 +++++-- image_analysis/indexing/Indexer.h | 9 +- reader/JFJochHDF5Reader.cpp | 34 ++- reader/JFJochReader.cpp | 2 +- reader/JFJochReader.h | 1 - reader/JFJochReaderDataset.h | 7 +- reader/JFJochReaderImage.cpp | 8 +- reader/JFJochReaderImage.h | 2 + receiver/JFJochReceiver.cpp | 6 +- receiver/JFJochReceiverLite.cpp | 3 +- receiver/JFJochReceiverPlots.cpp | 52 +++-- receiver/JFJochReceiverPlots.h | 4 +- resonet/jfjoch_inference_server.py | 2 +- tests/AzimuthalIntegrationTest.cpp | 72 ++++++- tests/CBORTest.cpp | 35 +++- tests/CoordTest.cpp | 53 +++++ tests/DiffractionExperimentTest.cpp | 6 +- tests/DiffractionGeometryTest.cpp | 82 +++++++- tests/FFTIndexerTest.cpp | 2 +- tests/IndexingUnitTest.cpp | 6 +- tests/JFJochReaderTest.cpp | 4 +- tests/JFJochReceiverProcessingTest.cpp | 170 +++++++++++++++ tools/jfjoch_lite_perf_test.cpp | 8 +- viewer/CMakeLists.txt | 17 +- viewer/JFJochViewerMenu.cpp | 20 +- viewer/JFJochViewerMenu.h | 7 +- viewer/JFJochViewerSidePanel.cpp | 3 +- viewer/JFJochViewerToolbar.cpp | 41 +--- viewer/JFJochViewerToolbar.h | 11 +- viewer/JFJochViewerWindow.cpp | 23 ++- viewer/widgets/NumberLineEdit.cpp | 50 +++++ viewer/widgets/NumberLineEdit.h | 35 ++++ viewer/widgets/SliderPlusBox.cpp | 139 +++++++++++++ viewer/widgets/SliderPlusBox.h | 52 +++++ .../JFJochViewerImageListWindow.cpp | 0 .../JFJochViewerImageListWindow.h | 2 +- viewer/windows/JFJochViewerMetadataWindow.cpp | 156 ++++++++++++++ viewer/windows/JFJochViewerMetadataWindow.h | 52 +++++ .../windows/JFJochViewerProcessingWidget.cpp | 143 +++++++++++++ viewer/windows/JFJochViewerProcessingWidget.h | 56 +++++ writer/HDF5DataFile.cpp | 2 +- writer/HDF5DataFilePluginAzInt.cpp | 42 ++-- writer/HDF5DataFilePluginAzInt.h | 9 +- writer/HDF5DataFilePluginMX.cpp | 19 +- writer/HDF5DataFilePluginMX.h | 4 + writer/HDF5NXmx.cpp | 26 ++- 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 +- 244 files changed, 3064 insertions(+), 705 deletions(-) rename {image_analysis/indexing => common}/CrystalLattice.cpp (85%) rename {image_analysis/indexing => common}/CrystalLattice.h (90%) create mode 100644 frontend/src/openapi/models/azint_unit.ts create mode 100644 image_analysis/BraggPrediction.cpp create mode 100644 image_analysis/BraggPrediction.h create mode 100644 image_analysis/IntegrationStats.cpp create mode 100644 image_analysis/IntegrationStats.h create mode 100644 viewer/widgets/NumberLineEdit.cpp create mode 100644 viewer/widgets/NumberLineEdit.h create mode 100644 viewer/widgets/SliderPlusBox.cpp create mode 100644 viewer/widgets/SliderPlusBox.h rename viewer/{ => windows}/JFJochViewerImageListWindow.cpp (100%) rename viewer/{ => windows}/JFJochViewerImageListWindow.h (96%) create mode 100644 viewer/windows/JFJochViewerMetadataWindow.cpp create mode 100644 viewer/windows/JFJochViewerMetadataWindow.h create mode 100644 viewer/windows/JFJochViewerProcessingWidget.cpp create mode 100644 viewer/windows/JFJochViewerProcessingWidget.h diff --git a/VERSION b/VERSION index c1ff7b98..f883e750 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc.40 +1.0.0-rc.41 diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index daedcbee..abef6897 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -536,13 +536,25 @@ void JFJochBrokerHttp::config_file_writer_put( } void JFJochBrokerHttp::preview_plot_get(const std::optional &type, const std::optional &binning, - const std::optional &compression, const std::optional &experimentalCoord, - Pistache::Http::ResponseWriter &response) { + const std::optional &compression, const std::optional &experimentalCoord, + const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) { + PlotAzintUnit unit = PlotAzintUnit::Q_recipA; + if (azintUnit.has_value()) { + if (azintUnit == "Q_recipA" || azintUnit == "q_recipa") + unit = PlotAzintUnit::Q_recipA; + else if (azintUnit == "d_A" || azintUnit == "d_a") + unit = PlotAzintUnit::D_A; + else if (azintUnit == "two_theta_deg") + unit = PlotAzintUnit::TwoTheta_deg; + } + PlotRequest req{ .type = ConvertPlotType(type), .binning = 0, - .experimental_coord = experimentalCoord.value_or(false) + .experimental_coord = experimentalCoord.value_or(false), + .azint_unit = unit }; + if (binning) { if (binning.value() < 0) throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, diff --git a/broker/JFJochBrokerHttp.h b/broker/JFJochBrokerHttp.h index cfd5f345..94bf0970 100644 --- a/broker/JFJochBrokerHttp.h +++ b/broker/JFJochBrokerHttp.h @@ -162,10 +162,9 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi { void image_buffer_start_cbor_get(Pistache::Http::ResponseWriter &response) override; void image_buffer_status_get(Pistache::Http::ResponseWriter &response) override; - void preview_plot_get(const std::optional &type, const std::optional &binning, const std::optional &compression, const std::optional &experimentalCoord, - Pistache::Http::ResponseWriter &response) override; + const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) override; void config_indexing_get(Pistache::Http::ResponseWriter &response) override; diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp index 4a713ef1..2083bcb1 100644 --- a/broker/JFJochStateMachine.cpp +++ b/broker/JFJochStateMachine.cpp @@ -14,7 +14,8 @@ JFJochStateMachine::JFJochStateMachine(JFJochServices &in_services, Logger &in_l pixel_mask(experiment), current_detector_setup(0), data_processing_settings(DiffractionExperiment::DefaultDataProcessingSettings()), - pixel_mask_statistics({0, 0, 0}) { + pixel_mask_statistics({0, 0, 0}), + gpu_count(get_gpu_count()) { indexing_possible = (get_gpu_count() >= 0); if (!indexing_possible) @@ -482,6 +483,8 @@ BrokerStatus JFJochStateMachine::GetStatus() const { std::unique_lock ul(broker_status_mutex); BrokerStatus ret = broker_status; ret.progress = services.GetReceiverProgress(); + ret.gpu_count = gpu_count; + ret.ml_resolution_estimation = resolution_estimate_possible; return ret; } diff --git a/broker/JFJochStateMachine.h b/broker/JFJochStateMachine.h index a9b9d17e..25fcebdc 100644 --- a/broker/JFJochStateMachine.h +++ b/broker/JFJochStateMachine.h @@ -23,6 +23,8 @@ struct BrokerStatus { std::optional progress; std::optional message; enum class MessageSeverity {Error, Info, Warning, Success} message_severity = MessageSeverity::Error; + int64_t gpu_count; + bool ml_resolution_estimation; }; struct DetectorListElement { @@ -122,6 +124,8 @@ class JFJochStateMachine { bool indexing_possible; bool resolution_estimate_possible; + const int32_t gpu_count; + void UpdatePixelMaskStatistics(const PixelMaskStatistics &input); // Private functions assume that lock m is acquired diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp index 920b77d7..587d56cd 100644 --- a/broker/OpenAPIConvert.cpp +++ b/broker/OpenAPIConvert.cpp @@ -21,10 +21,12 @@ SpotFindingSettings Convert(const org::openapitools::server::model::Spot_finding ret.indexing = input.isIndexing(); ret.resolution_estimate = input.isResolutionEstimate(); ret.quick_integration = input.isQuickIntegration(); + ret.quick_integration_d_min_A = input.getQuickIntegrationHighResA(); if (input.filterPowderRingsIsSet()) ret.filter_spots_powder_ring = input.isFilterPowderRings(); if (input.minSpotCountPowderRingIsSet()) ret.min_spot_count_powder_ring = input.getMinSpotCountPowderRing(); + return ret; } @@ -42,6 +44,7 @@ org::openapitools::server::model::Spot_finding_settings Convert(const SpotFindin ret.setMinSpotCountPowderRing(input.min_spot_count_powder_ring); ret.setResolutionEstimate(input.resolution_estimate); ret.setQuickIntegration(input.quick_integration); + ret.setQuickIntegrationHighResA(input.quick_integration_d_min_A); return ret; } @@ -240,6 +243,8 @@ org::openapitools::server::model::Broker_status Convert(const BrokerStatus& inpu if (input.progress.has_value()) ret.setProgress(input.progress.value()); + ret.setMlResolutionEstimation(input.ml_resolution_estimation); + ret.setGpuCount(input.gpu_count); return ret; } @@ -405,6 +410,9 @@ org::openapitools::server::model::Plots Convert(const MultiLinePlot& input) { case MultiLinePlotUnits::ADU: unit.setValue(org::openapitools::server::model::Plot_unit_x::ePlot_unit_x::ADU); break; + case MultiLinePlotUnits::d_A: + unit.setValue(org::openapitools::server::model::Plot_unit_x::ePlot_unit_x::D_A); + break; case MultiLinePlotUnits::Grid_um: unit.setValue(org::openapitools::server::model::Plot_unit_x::ePlot_unit_x::GRID_UM); break; @@ -425,21 +433,21 @@ org::openapitools::server::model::Plots Convert(const MultiLinePlot& input) { AzimuthalIntegrationSettings Convert(const org::openapitools::server::model::Azim_int_settings& input) { AzimuthalIntegrationSettings ret{}; ret.SolidAngleCorrection(input.isSolidAngleCorr()); - if (input.polarizationFactorIsSet()) - ret.PolarizationFactor(input.getPolarizationFactor()); + ret.PolarizationCorrection(input.isPolarizationCorr()); ret.QSpacing_recipA(input.getQSpacing()); ret.QRange_recipA(input.getLowQRecipA(), input.getHighQRecipA()); + ret.AzimuthalBinCount(input.getAzimuthalBins()); return ret; } org::openapitools::server::model::Azim_int_settings Convert(const AzimuthalIntegrationSettings& settings) { org::openapitools::server::model::Azim_int_settings ret{}; ret.setSolidAngleCorr(settings.IsSolidAngleCorrection()); - if (settings.GetPolarizationFactor().has_value()) - ret.setPolarizationFactor(settings.GetPolarizationFactor().value()); + ret.setPolarizationCorr(settings.IsPolarizationCorrection()); ret.setHighQRecipA(settings.GetHighQ_recipA()); ret.setLowQRecipA(settings.GetLowQ_recipA()); ret.setQSpacing(settings.GetQSpacing_recipA()); + ret.setAzimuthalBins(settings.GetAzimuthalBinCount()); return ret; } @@ -643,6 +651,13 @@ DatasetSettings Convert(const org::openapitools::server::model::Dataset_settings ret.WriteNXmxHDF5Master(input.isWriteNxmxHdf5Master()); + if (input.polarizationFactorIsSet()) + ret.PolarizationFactor(input.getPolarizationFactor()); + + ret.PoniRot1_rad(input.getPoniRot1Rad()); + ret.PoniRot2_rad(input.getPoniRot2Rad()); + ret.PoniRot3_rad(input.getPoniRot3Rad()); + return ret; } @@ -788,9 +803,12 @@ PlotType ConvertPlotType(const std::optional& input) { "Plot type is compulsory paramater"); if (input == "bkg_estimate") return PlotType::BkgEstimate; if (input == "azint") return PlotType::AzInt; + if (input == "azint_1d") return PlotType::AzInt1D; if (input == "spot_count") return PlotType::SpotCount; if (input == "indexing_rate") return PlotType::IndexingRate; if (input == "indexing_unit_cell_length") return PlotType::IndexingUnitCellLength; + if (input == "mosaicity") return PlotType::IndexingMosaicity; + if (input == "b_factor") return PlotType::BFactor; if (input == "indexing_unit_cell_angle") return PlotType::IndexingUnitCellAngle; if (input == "error_pixels") return PlotType::ErrorPixels; if (input == "strong_pixels") return PlotType::StrongPixels; diff --git a/broker/gen/api/ApiBase.h b/broker/gen/api/ApiBase.h index 8c2b4922..59410b0f 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 c81087a2..080aa2e0 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -1248,9 +1248,17 @@ void DefaultApi::preview_plot_get_handler(const Pistache::Rest::Request &request experimentalCoord = valueQuery_instance; } } + auto azintUnitQuery = request.query().get("azint_unit"); + std::optional azintUnit; + if(azintUnitQuery.has_value()){ + std::string valueQuery_instance; + if(fromStringValue(azintUnitQuery.value(), valueQuery_instance)){ + azintUnit = valueQuery_instance; + } + } try { - this->preview_plot_get(type, binning, compression, experimentalCoord, response); + this->preview_plot_get(type, binning, compression, experimentalCoord, azintUnit, 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 7002eb4a..2f2c4fe6 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -501,7 +501,8 @@ private: /// Binning of frames for the plot (0 = default binning) (optional, default to 0) /// Enable DEFLATE compression of output data. (optional, default to false) /// If measurement has goniometer axis defined, plot X-axis will represent rotation angle If measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value For still measurement the number is ignored (optional, default to false) - virtual void preview_plot_get(const std::optional &type, const std::optional &binning, const std::optional &compression, const std::optional &experimentalCoord, Pistache::Http::ResponseWriter &response) = 0; + /// 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; /// /// Start detector /// diff --git a/broker/gen/model/Azim_int_settings.cpp b/broker/gen/model/Azim_int_settings.cpp index d8b464f7..f005e4aa 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,12 +21,13 @@ namespace org::openapitools::server::model Azim_int_settings::Azim_int_settings() { - m_Polarization_factor = 0.0f; - m_Polarization_factorIsSet = false; + m_Polarization_corr = true; m_Solid_angle_corr = true; m_High_q_recipA = 0.0f; m_Low_q_recipA = 0.0f; m_Q_spacing = 0.0f; + m_Azimuthal_bins = 1L; + m_Azimuthal_binsIsSet = false; } @@ -49,26 +50,26 @@ bool Azim_int_settings::validate(std::stringstream& msg, const std::string& path bool success = true; const std::string _pathPrefix = pathPrefix.empty() ? "Azim_int_settings" : pathPrefix; - - if (polarizationFactorIsSet()) + + if (azimuthalBinsIsSet()) { - const float& value = m_Polarization_factor; - const std::string currentValuePath = _pathPrefix + ".polarizationFactor"; + const int64_t& value = m_Azimuthal_bins; + const std::string currentValuePath = _pathPrefix + ".azimuthalBins"; - if (value < static_cast(-1.0)) + if (value < 1ll) { success = false; - msg << currentValuePath << ": must be greater than or equal to -1.0;"; + msg << currentValuePath << ": must be greater than or equal to 1;"; } - if (value > static_cast(1.0)) + if (value > 256ll) { success = false; - msg << currentValuePath << ": must be less than or equal to 1.0;"; + msg << currentValuePath << ": must be less than or equal to 256;"; } } - + return success; } @@ -77,8 +78,8 @@ bool Azim_int_settings::operator==(const Azim_int_settings& rhs) const return - - ((!polarizationFactorIsSet() && !rhs.polarizationFactorIsSet()) || (polarizationFactorIsSet() && rhs.polarizationFactorIsSet() && getPolarizationFactor() == rhs.getPolarizationFactor())) && + (isPolarizationCorr() == rhs.isPolarizationCorr()) + && (isSolidAngleCorr() == rhs.isSolidAngleCorr()) && @@ -90,8 +91,11 @@ bool Azim_int_settings::operator==(const Azim_int_settings& rhs) const && (getQSpacing() == rhs.getQSpacing()) + && + ((!azimuthalBinsIsSet() && !rhs.azimuthalBinsIsSet()) || (azimuthalBinsIsSet() && rhs.azimuthalBinsIsSet() && getAzimuthalBins() == rhs.getAzimuthalBins())) + ; } @@ -103,45 +107,38 @@ bool Azim_int_settings::operator!=(const Azim_int_settings& rhs) const void to_json(nlohmann::json& j, const Azim_int_settings& o) { j = nlohmann::json::object(); - if(o.polarizationFactorIsSet()) - j["polarization_factor"] = o.m_Polarization_factor; + j["polarization_corr"] = o.m_Polarization_corr; j["solid_angle_corr"] = o.m_Solid_angle_corr; j["high_q_recipA"] = o.m_High_q_recipA; j["low_q_recipA"] = o.m_Low_q_recipA; j["q_spacing"] = o.m_Q_spacing; + if(o.azimuthalBinsIsSet()) + j["azimuthal_bins"] = o.m_Azimuthal_bins; } void from_json(const nlohmann::json& j, Azim_int_settings& o) { - if(j.find("polarization_factor") != j.end()) - { - j.at("polarization_factor").get_to(o.m_Polarization_factor); - o.m_Polarization_factorIsSet = true; - } + j.at("polarization_corr").get_to(o.m_Polarization_corr); j.at("solid_angle_corr").get_to(o.m_Solid_angle_corr); j.at("high_q_recipA").get_to(o.m_High_q_recipA); j.at("low_q_recipA").get_to(o.m_Low_q_recipA); j.at("q_spacing").get_to(o.m_Q_spacing); + if(j.find("azimuthal_bins") != j.end()) + { + j.at("azimuthal_bins").get_to(o.m_Azimuthal_bins); + o.m_Azimuthal_binsIsSet = true; + } } -float Azim_int_settings::getPolarizationFactor() const +bool Azim_int_settings::isPolarizationCorr() const { - return m_Polarization_factor; + return m_Polarization_corr; } -void Azim_int_settings::setPolarizationFactor(float const value) +void Azim_int_settings::setPolarizationCorr(bool const value) { - m_Polarization_factor = value; - m_Polarization_factorIsSet = true; -} -bool Azim_int_settings::polarizationFactorIsSet() const -{ - return m_Polarization_factorIsSet; -} -void Azim_int_settings::unsetPolarization_factor() -{ - m_Polarization_factorIsSet = false; + m_Polarization_corr = value; } bool Azim_int_settings::isSolidAngleCorr() const { @@ -175,6 +172,23 @@ void Azim_int_settings::setQSpacing(float const value) { m_Q_spacing = value; } +int64_t Azim_int_settings::getAzimuthalBins() const +{ + return m_Azimuthal_bins; +} +void Azim_int_settings::setAzimuthalBins(int64_t const value) +{ + m_Azimuthal_bins = value; + m_Azimuthal_binsIsSet = true; +} +bool Azim_int_settings::azimuthalBinsIsSet() const +{ + return m_Azimuthal_binsIsSet; +} +void Azim_int_settings::unsetAzimuthal_bins() +{ + m_Azimuthal_binsIsSet = false; +} } // namespace org::openapitools::server::model diff --git a/broker/gen/model/Azim_int_settings.h b/broker/gen/model/Azim_int_settings.h index 1189a837..40ea513b 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -58,12 +58,10 @@ public: /// Azim_int_settings members /// - /// If polarization factor is provided, than polarization correction is enabled. + /// Apply polarization correction for radial integration (polarization factor must be configured in dataset settings) /// - float getPolarizationFactor() const; - void setPolarizationFactor(float const value); - bool polarizationFactorIsSet() const; - void unsetPolarization_factor(); + bool isPolarizationCorr() const; + void setPolarizationCorr(bool const value); /// /// Apply solid angle correction for radial integration /// @@ -84,12 +82,19 @@ public: /// float getQSpacing() const; void setQSpacing(float const value); + /// + /// Numer of azimuthal (phi) bins; 1 = standard 1D radial integration + /// + int64_t getAzimuthalBins() const; + void setAzimuthalBins(int64_t const value); + bool azimuthalBinsIsSet() const; + void unsetAzimuthal_bins(); friend void to_json(nlohmann::json& j, const Azim_int_settings& o); friend void from_json(const nlohmann::json& j, Azim_int_settings& o); protected: - float m_Polarization_factor; - bool m_Polarization_factorIsSet; + bool m_Polarization_corr; + bool m_Solid_angle_corr; float m_High_q_recipA; @@ -98,6 +103,8 @@ protected: float m_Q_spacing; + int64_t m_Azimuthal_bins; + bool m_Azimuthal_binsIsSet; }; diff --git a/broker/gen/model/Broker_status.cpp b/broker/gen/model/Broker_status.cpp index bf5d6e68..89147415 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,6 +28,10 @@ Broker_status::Broker_status() m_MessageIsSet = false; m_Message_severity = "error"; m_Message_severityIsSet = false; + m_Gpu_count = 0; + m_Gpu_countIsSet = false; + m_Ml_resolution_estimation = false; + m_Ml_resolution_estimationIsSet = false; } @@ -69,7 +73,7 @@ bool Broker_status::validate(std::stringstream& msg, const std::string& pathPref } } - + return success; } @@ -88,7 +92,13 @@ bool Broker_status::operator==(const Broker_status& rhs) const ((!messageIsSet() && !rhs.messageIsSet()) || (messageIsSet() && rhs.messageIsSet() && getMessage() == rhs.getMessage())) && - ((!messageSeverityIsSet() && !rhs.messageSeverityIsSet()) || (messageSeverityIsSet() && rhs.messageSeverityIsSet() && getMessageSeverity() == rhs.getMessageSeverity())) + ((!messageSeverityIsSet() && !rhs.messageSeverityIsSet()) || (messageSeverityIsSet() && rhs.messageSeverityIsSet() && getMessageSeverity() == rhs.getMessageSeverity())) && + + + ((!gpuCountIsSet() && !rhs.gpuCountIsSet()) || (gpuCountIsSet() && rhs.gpuCountIsSet() && getGpuCount() == rhs.getGpuCount())) && + + + ((!mlResolutionEstimationIsSet() && !rhs.mlResolutionEstimationIsSet()) || (mlResolutionEstimationIsSet() && rhs.mlResolutionEstimationIsSet() && isMlResolutionEstimation() == rhs.isMlResolutionEstimation())) ; } @@ -108,6 +118,10 @@ void to_json(nlohmann::json& j, const Broker_status& o) j["message"] = o.m_Message; if(o.messageSeverityIsSet()) j["message_severity"] = o.m_Message_severity; + if(o.gpuCountIsSet()) + j["gpu_count"] = o.m_Gpu_count; + if(o.mlResolutionEstimationIsSet()) + j["ml_resolution_estimation"] = o.m_Ml_resolution_estimation; } @@ -129,6 +143,16 @@ void from_json(const nlohmann::json& j, Broker_status& o) j.at("message_severity").get_to(o.m_Message_severity); o.m_Message_severityIsSet = true; } + if(j.find("gpu_count") != j.end()) + { + j.at("gpu_count").get_to(o.m_Gpu_count); + o.m_Gpu_countIsSet = true; + } + if(j.find("ml_resolution_estimation") != j.end()) + { + j.at("ml_resolution_estimation").get_to(o.m_Ml_resolution_estimation); + o.m_Ml_resolution_estimationIsSet = true; + } } @@ -191,6 +215,40 @@ void Broker_status::unsetMessage_severity() { m_Message_severityIsSet = false; } +int32_t Broker_status::getGpuCount() const +{ + return m_Gpu_count; +} +void Broker_status::setGpuCount(int32_t const value) +{ + m_Gpu_count = value; + m_Gpu_countIsSet = true; +} +bool Broker_status::gpuCountIsSet() const +{ + return m_Gpu_countIsSet; +} +void Broker_status::unsetGpu_count() +{ + m_Gpu_countIsSet = false; +} +bool Broker_status::isMlResolutionEstimation() const +{ + return m_Ml_resolution_estimation; +} +void Broker_status::setMlResolutionEstimation(bool const value) +{ + m_Ml_resolution_estimation = value; + m_Ml_resolution_estimationIsSet = true; +} +bool Broker_status::mlResolutionEstimationIsSet() const +{ + return m_Ml_resolution_estimationIsSet; +} +void Broker_status::unsetMl_resolution_estimation() +{ + m_Ml_resolution_estimationIsSet = false; +} } // namespace org::openapitools::server::model diff --git a/broker/gen/model/Broker_status.h b/broker/gen/model/Broker_status.h index 91d017c0..ff62a0dc 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -84,6 +84,20 @@ public: void setMessageSeverity(std::string const& value); bool messageSeverityIsSet() const; void unsetMessage_severity(); + /// + /// Number of installed GPUs + /// + int32_t getGpuCount() const; + void setGpuCount(int32_t const value); + bool gpuCountIsSet() const; + void unsetGpu_count(); + /// + /// ML resolution estimation available + /// + bool isMlResolutionEstimation() const; + void setMlResolutionEstimation(bool const value); + bool mlResolutionEstimationIsSet() const; + void unsetMl_resolution_estimation(); friend void to_json(nlohmann::json& j, const Broker_status& o); friend void from_json(const nlohmann::json& j, Broker_status& o); @@ -96,6 +110,10 @@ protected: bool m_MessageIsSet; std::string m_Message_severity; bool m_Message_severityIsSet; + int32_t m_Gpu_count; + bool m_Gpu_countIsSet; + bool m_Ml_resolution_estimation; + bool m_Ml_resolution_estimationIsSet; }; diff --git a/broker/gen/model/Calibration_statistics_inner.cpp b/broker/gen/model/Calibration_statistics_inner.cpp index 712bbfa1..14b3cef9 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 f1f4291f..9e87124a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 fdf80c3f..b3f830b4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -65,6 +65,14 @@ Dataset_settings::Dataset_settings() m_Write_nxmx_hdf5_masterIsSet = false; m_Save_calibration = false; m_Save_calibrationIsSet = false; + m_Polarization_factor = 0.0f; + m_Polarization_factorIsSet = false; + m_Poni_rot1_rad = 0.0f; + m_Poni_rot1_radIsSet = false; + m_Poni_rot2_rad = 0.0f; + m_Poni_rot2_radIsSet = false; + m_Poni_rot3_rad = 0.0f; + m_Poni_rot3_radIsSet = false; m_Unit_cellIsSet = false; } @@ -281,7 +289,83 @@ bool Dataset_settings::validate(std::stringstream& msg, const std::string& pathP } } + + if (polarizationFactorIsSet()) + { + const float& value = m_Polarization_factor; + const std::string currentValuePath = _pathPrefix + ".polarizationFactor"; + + if (value < static_cast(-1.0)) + { + success = false; + msg << currentValuePath << ": must be greater than or equal to -1.0;"; + } + if (value > static_cast(1.0)) + { + success = false; + msg << currentValuePath << ": must be less than or equal to 1.0;"; + } + + } + + if (poniRot1RadIsSet()) + { + const float& value = m_Poni_rot1_rad; + const std::string currentValuePath = _pathPrefix + ".poniRot1Rad"; + + + if (value < static_cast(-6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be greater than or equal to -6.28318530718;"; + } + if (value > static_cast(6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be less than or equal to 6.28318530718;"; + } + + } + + if (poniRot2RadIsSet()) + { + const float& value = m_Poni_rot2_rad; + const std::string currentValuePath = _pathPrefix + ".poniRot2Rad"; + + + if (value < static_cast(-6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be greater than or equal to -6.28318530718;"; + } + if (value > static_cast(6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be less than or equal to 6.28318530718;"; + } + + } + + if (poniRot3RadIsSet()) + { + const float& value = m_Poni_rot3_rad; + const std::string currentValuePath = _pathPrefix + ".poniRot3Rad"; + + + if (value < static_cast(-6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be greater than or equal to -6.28318530718;"; + } + if (value > static_cast(6.28318530718)) + { + success = false; + msg << currentValuePath << ": must be less than or equal to 6.28318530718;"; + } + + } + return success; } @@ -369,6 +453,18 @@ bool Dataset_settings::operator==(const Dataset_settings& rhs) const ((!saveCalibrationIsSet() && !rhs.saveCalibrationIsSet()) || (saveCalibrationIsSet() && rhs.saveCalibrationIsSet() && isSaveCalibration() == rhs.isSaveCalibration())) && + ((!polarizationFactorIsSet() && !rhs.polarizationFactorIsSet()) || (polarizationFactorIsSet() && rhs.polarizationFactorIsSet() && getPolarizationFactor() == rhs.getPolarizationFactor())) && + + + ((!poniRot1RadIsSet() && !rhs.poniRot1RadIsSet()) || (poniRot1RadIsSet() && rhs.poniRot1RadIsSet() && getPoniRot1Rad() == rhs.getPoniRot1Rad())) && + + + ((!poniRot2RadIsSet() && !rhs.poniRot2RadIsSet()) || (poniRot2RadIsSet() && rhs.poniRot2RadIsSet() && getPoniRot2Rad() == rhs.getPoniRot2Rad())) && + + + ((!poniRot3RadIsSet() && !rhs.poniRot3RadIsSet()) || (poniRot3RadIsSet() && rhs.poniRot3RadIsSet() && getPoniRot3Rad() == rhs.getPoniRot3Rad())) && + + ((!unitCellIsSet() && !rhs.unitCellIsSet()) || (unitCellIsSet() && rhs.unitCellIsSet() && getUnitCell() == rhs.getUnitCell())) ; @@ -430,6 +526,14 @@ void to_json(nlohmann::json& j, const Dataset_settings& o) j["write_nxmx_hdf5_master"] = o.m_Write_nxmx_hdf5_master; if(o.saveCalibrationIsSet()) j["save_calibration"] = o.m_Save_calibration; + if(o.polarizationFactorIsSet()) + j["polarization_factor"] = o.m_Polarization_factor; + if(o.poniRot1RadIsSet()) + j["poni_rot1_rad"] = o.m_Poni_rot1_rad; + if(o.poniRot2RadIsSet()) + j["poni_rot2_rad"] = o.m_Poni_rot2_rad; + if(o.poniRot3RadIsSet()) + j["poni_rot3_rad"] = o.m_Poni_rot3_rad; if(o.unitCellIsSet()) j["unit_cell"] = o.m_Unit_cell; @@ -551,6 +655,26 @@ void from_json(const nlohmann::json& j, Dataset_settings& o) j.at("save_calibration").get_to(o.m_Save_calibration); o.m_Save_calibrationIsSet = true; } + if(j.find("polarization_factor") != j.end()) + { + j.at("polarization_factor").get_to(o.m_Polarization_factor); + o.m_Polarization_factorIsSet = true; + } + if(j.find("poni_rot1_rad") != j.end()) + { + j.at("poni_rot1_rad").get_to(o.m_Poni_rot1_rad); + o.m_Poni_rot1_radIsSet = true; + } + if(j.find("poni_rot2_rad") != j.end()) + { + j.at("poni_rot2_rad").get_to(o.m_Poni_rot2_rad); + o.m_Poni_rot2_radIsSet = true; + } + if(j.find("poni_rot3_rad") != j.end()) + { + j.at("poni_rot3_rad").get_to(o.m_Poni_rot3_rad); + o.m_Poni_rot3_radIsSet = true; + } if(j.find("unit_cell") != j.end()) { j.at("unit_cell").get_to(o.m_Unit_cell); @@ -965,6 +1089,74 @@ void Dataset_settings::unsetSave_calibration() { m_Save_calibrationIsSet = false; } +float Dataset_settings::getPolarizationFactor() const +{ + return m_Polarization_factor; +} +void Dataset_settings::setPolarizationFactor(float const value) +{ + m_Polarization_factor = value; + m_Polarization_factorIsSet = true; +} +bool Dataset_settings::polarizationFactorIsSet() const +{ + return m_Polarization_factorIsSet; +} +void Dataset_settings::unsetPolarization_factor() +{ + m_Polarization_factorIsSet = false; +} +float Dataset_settings::getPoniRot1Rad() const +{ + return m_Poni_rot1_rad; +} +void Dataset_settings::setPoniRot1Rad(float const value) +{ + m_Poni_rot1_rad = value; + m_Poni_rot1_radIsSet = true; +} +bool Dataset_settings::poniRot1RadIsSet() const +{ + return m_Poni_rot1_radIsSet; +} +void Dataset_settings::unsetPoni_rot1_rad() +{ + m_Poni_rot1_radIsSet = false; +} +float Dataset_settings::getPoniRot2Rad() const +{ + return m_Poni_rot2_rad; +} +void Dataset_settings::setPoniRot2Rad(float const value) +{ + m_Poni_rot2_rad = value; + m_Poni_rot2_radIsSet = true; +} +bool Dataset_settings::poniRot2RadIsSet() const +{ + return m_Poni_rot2_radIsSet; +} +void Dataset_settings::unsetPoni_rot2_rad() +{ + m_Poni_rot2_radIsSet = false; +} +float Dataset_settings::getPoniRot3Rad() const +{ + return m_Poni_rot3_rad; +} +void Dataset_settings::setPoniRot3Rad(float const value) +{ + m_Poni_rot3_rad = value; + m_Poni_rot3_radIsSet = true; +} +bool Dataset_settings::poniRot3RadIsSet() const +{ + return m_Poni_rot3_radIsSet; +} +void Dataset_settings::unsetPoni_rot3_rad() +{ + m_Poni_rot3_radIsSet = false; +} org::openapitools::server::model::Dataset_settings_unit_cell Dataset_settings::getUnitCell() const { return m_Unit_cell; diff --git a/broker/gen/model/Dataset_settings.h b/broker/gen/model/Dataset_settings.h index 5d0f9d85..7ef12436 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -237,6 +237,34 @@ public: bool saveCalibrationIsSet() const; void unsetSave_calibration(); /// + /// Polarization factor for integration; 1.0 is horizontal polarization; -1.0 is vertical polarization + /// + float getPolarizationFactor() const; + void setPolarizationFactor(float const value); + bool polarizationFactorIsSet() const; + void unsetPolarization_factor(); + /// + /// PONI angle rot1 (see PyFAI documentation for details) in radians + /// + float getPoniRot1Rad() const; + void setPoniRot1Rad(float const value); + bool poniRot1RadIsSet() const; + void unsetPoni_rot1_rad(); + /// + /// PONI angle rot2 (see PyFAI documentation for details) in radians + /// + float getPoniRot2Rad() const; + void setPoniRot2Rad(float const value); + bool poniRot2RadIsSet() const; + void unsetPoni_rot2_rad(); + /// + /// PONI angle rot3 (see PyFAI documentation for details) in radians + /// + float getPoniRot3Rad() const; + void setPoniRot3Rad(float const value); + bool poniRot3RadIsSet() const; + void unsetPoni_rot3_rad(); + /// /// /// org::openapitools::server::model::Dataset_settings_unit_cell getUnitCell() const; @@ -299,6 +327,14 @@ protected: bool m_Write_nxmx_hdf5_masterIsSet; bool m_Save_calibration; bool m_Save_calibrationIsSet; + float m_Polarization_factor; + bool m_Polarization_factorIsSet; + float m_Poni_rot1_rad; + bool m_Poni_rot1_radIsSet; + float m_Poni_rot2_rad; + 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; bool m_Unit_cellIsSet; diff --git a/broker/gen/model/Dataset_settings_unit_cell.cpp b/broker/gen/model/Dataset_settings_unit_cell.cpp index b886e220..92135e6d 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.cpp +++ b/broker/gen/model/Dataset_settings_unit_cell.cpp @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Dataset_settings_unit_cell.h b/broker/gen/model/Dataset_settings_unit_cell.h index 2d8f96a0..c71ead03 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.h +++ b/broker/gen/model/Dataset_settings_unit_cell.h @@ -2,7 +2,7 @@ * Jungfraujoch * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. * -* The version of the OpenAPI document: 1.0.0-rc.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Detector.cpp b/broker/gen/model/Detector.cpp index 4d73c6c5..196da926 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 f2efb734..6876712c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 37f36929..d4ca3620 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d44eaed6..a54e9d5c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 7468cca4..584e3743 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 7ef2c5ad..e499c073 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 f34bf256..6b94dae9 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 9459184d..2eab9dcc 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 a2264ae6..f9114d64 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 0dfd1a96..7c5e3622 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 460159b7..4d86c8d7 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 86b14293..744ba544 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 408a1358..2d3b329d 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 e14a815c..f15b0dae 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 4ae061eb..fd5f6e1c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b52ed84d..dcdf0d43 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 488e9606..b23f489c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 27273f9e..7aaf5e2a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 259fbd8a..686ee7bd 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 7efee583..d7bbd876 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b1ec8de5..45d28567 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 4fdd4c9e..cdfbb426 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 0b5c1060..29998ce4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 a95d4abd..be1cd3ee 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 2d87c9b4..f3d74287 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 a45d0209..643e365f 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 9e6691fb..694e8c17 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 9a3e51e5..8c64aea0 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 733e61ef..dc7183fb 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 4ddb96b7..aa3b232c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 cc14221d..6ffb46d0 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 7f4e63e5..2150a864 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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.cpp b/broker/gen/model/Grid_scan.cpp index 85742102..5aea7992 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 5248f506..19635964 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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.cpp b/broker/gen/model/Helpers.cpp index 9e097fbd..7b2b6e9a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d502b264..98deb639 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 ee8766f0..f98ce98a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 a012fb30..5fedfcd4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d3ccb748..cdc366df 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 cbb7b559..7d848576 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 14aefecf..35604593 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 f4f9adac..a283a4d1 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 ea7ad633..ead87682 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b1c91abf..c57ad352 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 301d83d3..fddd8e9a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 0c057858..ffb800ab 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 a4ebaeea..8f4f2793 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 2ff2afe9..810035c0 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 0525b496..bd4ad5a4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 1c1caa21..1833b7ae 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d20efd11..f5ab09af 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 8f35ca1e..621f34ea 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 239a6db7..8e24cf13 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 6efee7cd..a4dece90 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 28dd62e4..2f6ce9af 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 721d2849..19679b09 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d8c8e7a8..5d170172 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 76cf85fa..7d9e0b28 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 9a071fca..57aee8aa 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 8343995b..1fccfcda 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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.cpp b/broker/gen/model/Plot_unit_x.cpp index 6fccc6ad..a3700cf6 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -81,6 +81,9 @@ void to_json(nlohmann::json& j, const Plot_unit_x& o) case Plot_unit_x::ePlot_unit_x::Q_RECIPA: j = "q_recipA"; break; + case Plot_unit_x::ePlot_unit_x::D_A: + j = "d_A"; + break; case Plot_unit_x::ePlot_unit_x::ANGLE_DEG: j = "angle_deg"; break; @@ -103,6 +106,9 @@ void from_json(const nlohmann::json& j, Plot_unit_x& o) else if (s == "q_recipA") { o.setValue(Plot_unit_x::ePlot_unit_x::Q_RECIPA); } + else if (s == "d_A") { + o.setValue(Plot_unit_x::ePlot_unit_x::D_A); + } else if (s == "angle_deg") { o.setValue(Plot_unit_x::ePlot_unit_x::ANGLE_DEG); } diff --git a/broker/gen/model/Plot_unit_x.h b/broker/gen/model/Plot_unit_x.h index d6515b8d..6642f01f 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -40,6 +40,7 @@ public: INVALID_VALUE_OPENAPI_GENERATED = 0, IMAGE_NUMBER, Q_RECIPA, + D_A, ANGLE_DEG, ADU, GRID_UM diff --git a/broker/gen/model/Plots.cpp b/broker/gen/model/Plots.cpp index 41dc71ee..5f85850c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 2245add4..8e32b819 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 eeb05f25..ee46e40e 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 49d6ed9e..f5633ef4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 e06f833c..16eb97c5 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b5092ed1..be84a157 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 8d8e1eb1..e21b2cf3 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 e3aa8eda..7d9f3e9a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 8dc489f6..6c1f286c 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 3668f57d..06c3ad7b 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d13cb8ac..578bea1a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 fc0ae714..3c41534a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 355f8f54..19a9c7bd 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 1f217ff7..91089dbf 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 d64621a2..423438db 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 46613423..87b5afb5 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 00529d3d..e001d7a9 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 5fba6f6d..195ec3f4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp index aeae689b..130c1bdf 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -36,6 +36,7 @@ Spot_finding_settings::Spot_finding_settings() m_Resolution_estimate = true; m_Resolution_estimateIsSet = false; m_Quick_integration = false; + m_Quick_integration_high_res_A = 1.5f; } @@ -128,7 +129,7 @@ bool Spot_finding_settings::validate(std::stringstream& msg, const std::string& } } - + return success; } @@ -171,6 +172,9 @@ bool Spot_finding_settings::operator==(const Spot_finding_settings& rhs) const ((!resolutionEstimateIsSet() && !rhs.resolutionEstimateIsSet()) || (resolutionEstimateIsSet() && rhs.resolutionEstimateIsSet() && isResolutionEstimate() == rhs.isResolutionEstimate())) && (isQuickIntegration() == rhs.isQuickIntegration()) + && + + (getQuickIntegrationHighResA() == rhs.getQuickIntegrationHighResA()) ; @@ -199,6 +203,7 @@ void to_json(nlohmann::json& j, const Spot_finding_settings& o) if(o.resolutionEstimateIsSet()) j["resolution_estimate"] = o.m_Resolution_estimate; j["quick_integration"] = o.m_Quick_integration; + j["quick_integration_high_res_A"] = o.m_Quick_integration_high_res_A; } @@ -228,6 +233,7 @@ void from_json(const nlohmann::json& j, Spot_finding_settings& o) o.m_Resolution_estimateIsSet = true; } j.at("quick_integration").get_to(o.m_Quick_integration); + j.at("quick_integration_high_res_A").get_to(o.m_Quick_integration_high_res_A); } @@ -354,6 +360,14 @@ void Spot_finding_settings::setQuickIntegration(bool const value) { m_Quick_integration = value; } +float Spot_finding_settings::getQuickIntegrationHighResA() const +{ + return m_Quick_integration_high_res_A; +} +void Spot_finding_settings::setQuickIntegrationHighResA(float const value) +{ + m_Quick_integration_high_res_A = value; +} } // namespace org::openapitools::server::model diff --git a/broker/gen/model/Spot_finding_settings.h b/broker/gen/model/Spot_finding_settings.h index ea36f645..93b6953f 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -123,6 +123,11 @@ public: /// bool isQuickIntegration() const; void setQuickIntegration(bool const value); + /// + /// Quick integration limit for high resolution [A] + /// + float getQuickIntegrationHighResA() const; + void setQuickIntegrationHighResA(float const value); friend void to_json(nlohmann::json& j, const Spot_finding_settings& o); friend void from_json(const nlohmann::json& j, Spot_finding_settings& o); @@ -151,6 +156,8 @@ protected: bool m_Resolution_estimateIsSet; bool m_Quick_integration; + float m_Quick_integration_high_res_A; + }; diff --git a/broker/gen/model/Standard_detector_geometry.cpp b/broker/gen/model/Standard_detector_geometry.cpp index 539d2dd4..e2a859f4 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b11ea0b4..8a297d4f 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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.cpp b/broker/gen/model/Zeromq_metadata_settings.cpp index 3f66eb86..65fcec13 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 544ab631..52247a10 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 849d19ea..b0acfa29 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 fb5de5c9..6af30248 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 ac7c154d..f7a89a5a 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 c7a922c3..3bc2f338 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.40 +* The version of the OpenAPI document: 1.0.0-rc.41 * 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 b57d8581..f948c0c0 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.40 + version: 1.0.0-rc.41 contact: name: Filip Leonarski (Paul Scherrer Institute) email: filip.leonarski@psi.ch @@ -43,6 +43,19 @@ components: If measurement has goniometer axis defined, plot X-axis will represent rotation angle If measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value For still measurement the number is ignored + azint_unit: + in: query + name: azint_unit + required: false + schema: + type: string + enum: + - "Q_recipA" + - "d_A" + - "two_theta_deg" + default: "Q_recipA" + description: | + Unit used for azim int. fill_value: in: query name: fill @@ -63,11 +76,14 @@ components: enum: - bkg_estimate - azint + - azint_1d - spot_count - indexing_rate - indexing_time - indexing_unit_cell_length - indexing_unit_cell_angle + - mosaicity + - b_factor - error_pixels - saturated_pixels - image_collection_efficiency @@ -451,6 +467,33 @@ components: description: | Forward image calibration (at the moment pedestal and pedestal RMS for JUNGFRAU) using the ZeroMQ stream to writer. If parameter is not provided calibration will be saved only if more than 4 images are recorded. + polarization_factor: + type: number + description: Polarization factor for integration; 1.0 is horizontal polarization; -1.0 is vertical polarization + format: float + minimum: -1.0 + maximum: 1.0 + poni_rot1_rad: + type: number + description: PONI angle rot1 (see PyFAI documentation for details) in radians + format: float + minimum: -6.28318530718 + maximum: 6.28318530718 + default: 0.0 + poni_rot2_rad: + type: number + description: PONI angle rot2 (see PyFAI documentation for details) in radians + format: float + minimum: -6.28318530718 + maximum: 6.28318530718 + default: 0.0 + poni_rot3_rad: + type: number + description: PONI angle rot3 (see PyFAI documentation for details) in radians + format: float + minimum: -6.28318530718 + maximum: 6.28318530718 + default: 0.0 unit_cell: type: object description: Unit cell parameters. Necessary to run indexing. Units of angstrom and degree @@ -796,6 +839,7 @@ components: - low_resolution_limit - resolution_estimation - quick_integration + - quick_integration_high_res_A properties: enable: type: boolean @@ -854,20 +898,25 @@ components: Quick integration of collected diffraction images. If enabled it will likely reduce performance of Jungfraujoch for datasets with a very high indexing rate. (experimental feature) + quick_integration_high_res_A: + type: number + format: float + default: 1.5 + description: | + Quick integration limit for high resolution [A] azim_int_settings: type: object required: - solid_angle_corr + - polarization_corr - high_q_recipA - low_q_recipA - q_spacing properties: - polarization_factor: - type: number - description: If polarization factor is provided, than polarization correction is enabled. - format: float - minimum: -1.0 - maximum: 1.0 + polarization_corr: + type: boolean + description: Apply polarization correction for radial integration (polarization factor must be configured in dataset settings) + default: true solid_angle_corr: type: boolean description: Apply solid angle correction for radial integration @@ -881,6 +930,13 @@ components: q_spacing: type: number format: float + azimuthal_bins: + type: integer + format: int64 + minimum: 1 + maximum: 256 + default: 1 + description: Numer of azimuthal (phi) bins; 1 = standard 1D radial integration detector_list_element: type: object required: @@ -1135,6 +1191,13 @@ components: enum: ["success", "info", "warning", "error"] default: "error" description: Level of the message to display + gpu_count: + type: integer + format: int32 + description: Number of installed GPUs + ml_resolution_estimation: + type: boolean + description: ML resolution estimation available plot: type: object required: @@ -1166,6 +1229,7 @@ components: enum: - "image_number" - "q_recipA" + - "d_A" - "angle_deg" - "ADU" - "grid_um" @@ -2695,6 +2759,7 @@ paths: - $ref: "#/components/parameters/compression" - $ref: "#/components/parameters/plot_type" - $ref: "#/components/parameters/experimental_coord" + - $ref: "#/components/parameters/azint_unit" responses: "200": description: Everything OK. diff --git a/broker/redoc-static.html b/broker/redoc-static.html index dcd0a079..58cb06fe 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -395,7 +395,7 @@ Get user mask of the detector (TIFF) 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Jungfraujoch (1.0.0-rc.40)

Download OpenAPI specification:

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

Jungfraujoch (1.0.0-rc.41)

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). @@ -563,6 +563,14 @@ and to turn off for other experiments.

If parameter is not provided calibration will be saved only if more than 4 images are recorded.</p> " class="sc-dTUlgT sc-fhPBcz gAHTYt iCKFAv">

Forward image calibration (at the moment pedestal and pedestal RMS for JUNGFRAU) using the ZeroMQ stream to writer. If parameter is not provided calibration will be saved only if more than 4 images are recorded.

+
polarization_factor
number <float> [ -1 .. 1 ]

Polarization factor for integration; 1.0 is horizontal polarization; -1.0 is vertical polarization

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

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

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

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

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

Responses

Request samples

Content type
application/json
{
  • "images_per_trigger": 1,
  • "ntrigger": 1,
  • "image_time_us": 0,
  • "beam_x_pxl": 0.1,
  • "beam_y_pxl": 0.1,
  • "detector_distance_mm": 0.1,
  • "incident_energy_keV": 0.001,
  • "file_prefix": "",
  • "images_per_file": 1000,
  • "space_group_number": 0,
  • "sample_name": "",
  • "compression": "bslz4",
  • "total_flux": 0.1,
  • "transmission": 1,
  • "goniometer": {
    },
  • "grid_scan": {
    },
  • "header_appendix": null,
  • "image_appendix": null,
  • "data_reduction_factor_serialmx": 1,
  • "pixel_value_low_threshold": 0,
  • "run_number": 0,
  • "run_name": "string",
  • "experiment_group": "string",
  • "poisson_compression": 16,
  • "write_nxmx_hdf5_master": true,
  • "save_calibration": true,
  • "unit_cell": {
    }
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Wait for acquisition done

http://localhost:5232/start

Request samples

Content type
application/json
{
  • "images_per_trigger": 1,
  • "ntrigger": 1,
  • "image_time_us": 0,
  • "beam_x_pxl": 0.1,
  • "beam_y_pxl": 0.1,
  • "detector_distance_mm": 0.1,
  • "incident_energy_keV": 0.001,
  • "file_prefix": "",
  • "images_per_file": 1000,
  • "space_group_number": 0,
  • "sample_name": "",
  • "compression": "bslz4",
  • "total_flux": 0.1,
  • "transmission": 1,
  • "goniometer": {
    },
  • "grid_scan": {
    },
  • "header_appendix": null,
  • "image_appendix": null,
  • "data_reduction_factor_serialmx": 1,
  • "pixel_value_low_threshold": 0,
  • "run_number": 0,
  • "run_name": "string",
  • "experiment_group": "string",
  • "poisson_compression": 16,
  • "write_nxmx_hdf5_master": true,
  • "save_calibration": true,
  • "polarization_factor": -1,
  • "poni_rot1_rad": 0,
  • "poni_rot2_rad": 0,
  • "poni_rot3_rad": 0,
  • "unit_cell": {
    }
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Wait for acquisition done

quick_integration
required
boolean
Default: false
quick_integration
required
boolean
Default: false

Quick integration of collected diffraction images. If enabled it will likely reduce performance of Jungfraujoch for datasets with a very high indexing rate. (experimental feature)

+
quick_integration_high_res_A
required
number <float>
Default: 1.5

Quick integration limit for high resolution [A]

Responses

Request samples

Content type
application/json
{
  • "enable": true,
  • "indexing": true,
  • "filter_powder_rings": false,
  • "min_spot_count_powder_ring": 5,
  • "signal_to_noise_threshold": 0.1,
  • "photon_count_threshold": 0,
  • "min_pix_per_spot": 1,
  • "max_pix_per_spot": 1,
  • "high_resolution_limit": 0.1,
  • "low_resolution_limit": 0.1,
  • "resolution_estimate": true,
  • "quick_integration": false
}

Get data processing configuration

http://localhost:5232/config/spot_finding

Request samples

Content type
application/json
{
  • "enable": true,
  • "indexing": true,
  • "filter_powder_rings": false,
  • "min_spot_count_powder_ring": 5,
  • "signal_to_noise_threshold": 0.1,
  • "photon_count_threshold": 0,
  • "min_pix_per_spot": 1,
  • "max_pix_per_spot": 1,
  • "high_resolution_limit": 0.1,
  • "low_resolution_limit": 0.1,
  • "resolution_estimate": true,
  • "quick_integration": false,
  • "quick_integration_high_res_A": 1.5
}

Get data processing configuration

Can be done anytime

Responses

Response samples

Content type
application/json
{
  • "enable": true,
  • "indexing": true,
  • "filter_powder_rings": false,
  • "min_spot_count_powder_ring": 5,
  • "signal_to_noise_threshold": 0.1,
  • "photon_count_threshold": 0,
  • "min_pix_per_spot": 1,
  • "max_pix_per_spot": 1,
  • "high_resolution_limit": 0.1,
  • "low_resolution_limit": 0.1,
  • "resolution_estimate": true,
  • "quick_integration": false
}

Configure radial integration

http://localhost:5232/config/spot_finding

Response samples

Content type
application/json
{
  • "enable": true,
  • "indexing": true,
  • "filter_powder_rings": false,
  • "min_spot_count_powder_ring": 5,
  • "signal_to_noise_threshold": 0.1,
  • "photon_count_threshold": 0,
  • "min_pix_per_spot": 1,
  • "max_pix_per_spot": 1,
  • "high_resolution_limit": 0.1,
  • "low_resolution_limit": 0.1,
  • "resolution_estimate": true,
  • "quick_integration": false,
  • "quick_integration_high_res_A": 1.5
}

Configure radial integration

Can be done when detector is Inactive or Idle

-
Request Body schema: application/json
polarization_factor
number <float> [ -1 .. 1 ]

If polarization factor is provided, than polarization correction is enabled.

+
Request Body schema: application/json
polarization_corr
required
boolean
Default: true

Apply polarization correction for radial integration (polarization factor must be configured in dataset settings)

solid_angle_corr
required
boolean
Default: true

Apply solid angle correction for radial integration

-
high_q_recipA
required
number <float>
low_q_recipA
required
number <float>
q_spacing
required
number <float>

Responses

high_q_recipA
required
number <float>
low_q_recipA
required
number <float>
q_spacing
required
number <float>
azimuthal_bins
integer <int64> [ 1 .. 256 ]
Default: 1

Numer of azimuthal (phi) bins; 1 = standard 1D radial integration

+

Responses

Request samples

Content type
application/json
{
  • "polarization_factor": -1,
  • "solid_angle_corr": true,
  • "high_q_recipA": 0.1,
  • "low_q_recipA": 0.1,
  • "q_spacing": 0.1
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Get radial integration configuration

http://localhost:5232/config/azim_int

Request samples

Content type
application/json
{
  • "polarization_corr": true,
  • "solid_angle_corr": true,
  • "high_q_recipA": 0.1,
  • "low_q_recipA": 0.1,
  • "q_spacing": 0.1,
  • "azimuthal_bins": 1
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Get radial integration configuration

Can be done anytime

Responses

Response samples

Content type
application/json
{
  • "polarization_factor": -1,
  • "solid_angle_corr": true,
  • "high_q_recipA": 0.1,
  • "low_q_recipA": 0.1,
  • "q_spacing": 0.1
}

Load binary image for internal FPGA generator

http://localhost:5232/config/azim_int

Response samples

Content type
application/json
{
  • "polarization_corr": true,
  • "solid_angle_corr": true,
  • "high_q_recipA": 0.1,
  • "low_q_recipA": 0.1,
  • "q_spacing": 0.1,
  • "azimuthal_bins": 1
}

Load binary image for internal FPGA generator

Load image for internal FPGA generator. This can only happen in Idle state of the detector. @@ -1031,7 +1043,7 @@ Address follows ZeroMQ convention for sockets - in practice ipc:// " class="sc-dTUlgT sc-fhPBcz sc-dNpohg gAHTYt hNgelr kfJzSr">

Everything OK

Response samples

Content type
application/json
{
  • "state": "Inactive",
  • "progress": 1,
  • "message": "string",
  • "message_severity": "success"
}

Get status of FPGA devices

Responses

Response samples

Content type
application/json
{
  • "state": "Inactive",
  • "progress": 1,
  • "message": "string",
  • "message_severity": "success",
  • "gpu_count": 0,
  • "ml_resolution_estimation": true
}

Get status of FPGA devices

Responses

Response samples

Content type
application/json
{
  • "detector": {
    },
  • "detector_list": {
    },
  • "detector_settings": {
    },
  • "image_format_settings": {
    },
  • "instrument_metadata": {
    },
  • "file_writer_settings": {
    },
  • "data_processing_settings": {
    },
  • "measurement": {
    },
  • "broker": {
    },
  • "fpga": [
    ],
  • "calibration": [
    ],
  • "zeromq_preview": {
    },
  • "zeromq_metadata": {
    },
  • "pixel_mask": {
    },
  • "roi": {
    },
  • "az_int": {
    },
  • "buffer": {
    },
  • "indexing": {
    }
}

Get data collection statistics

http://localhost:5232/statistics

Response samples

Content type
application/json
{
  • "detector": {
    },
  • "detector_list": {
    },
  • "detector_settings": {
    },
  • "image_format_settings": {
    },
  • "instrument_metadata": {
    },
  • "file_writer_settings": {
    },
  • "data_processing_settings": {
    },
  • "measurement": {
    },
  • "broker": {
    },
  • "fpga": [
    ],
  • "calibration": [
    ],
  • "zeromq_preview": {
    },
  • "zeromq_metadata": {
    },
  • "pixel_mask": {
    },
  • "roi": {
    },
  • "az_int": {
    },
  • "buffer": {
    },
  • "indexing": {
    }
}

Get data collection statistics

Results of the last data collection

Responses

compression
boolean
Default: false

Enable DEFLATE compression of output data.

-
type
required
string
Enum: "bkg_estimate" "azint" "spot_count" "indexing_rate" "indexing_time" "indexing_unit_cell_length" "indexing_unit_cell_angle" "error_pixels" "saturated_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"
type
required
string
Enum: "bkg_estimate" "azint" "azint_1d" "spot_count" "indexing_rate" "indexing_time" "indexing_unit_cell_length" "indexing_unit_cell_angle" "mosaicity" "b_factor" "error_pixels" "saturated_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"

Type of requested plot

-
experimental_coord
boolean
Default: false
experimental_coord
boolean
Default: false

If measurement has goniometer axis defined, plot X-axis will represent rotation angle If measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value For still measurement the number is ignored

+
azint_unit
string
Default: "Q_recipA"
Enum: "Q_recipA" "d_A" "two_theta_deg"

Unit used for azim int.

Responses