diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index 858511d1..b3213833 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -548,7 +548,7 @@ 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 &fill, + const std::optional &compression, const std::optional &experimentalCoord, const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) { PlotAzintUnit unit = PlotAzintUnit::Q_recipA; @@ -565,8 +565,7 @@ void JFJochBrokerHttp::preview_plot_get(const std::optional &type, .type = ConvertPlotType(type), .binning = 1, .experimental_coord = experimentalCoord.value_or(false), - .azint_unit = unit, - .fill_value = fill + .azint_unit = unit }; if (binning) { @@ -597,8 +596,7 @@ void JFJochBrokerHttp::preview_plot_bin_get(const std::optional &ty .type = ConvertPlotType(type), .binning = 1, .experimental_coord = false, - .azint_unit = unit, - .fill_value = NAN + .azint_unit = unit }; if (binning) { diff --git a/broker/JFJochBrokerHttp.h b/broker/JFJochBrokerHttp.h index 6c6ad0fe..5e2b305f 100644 --- a/broker/JFJochBrokerHttp.h +++ b/broker/JFJochBrokerHttp.h @@ -166,7 +166,7 @@ class JFJochBrokerHttp : public org::openapitools::server::api::DefaultApi { 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 &fill, + const std::optional &compression, const std::optional &experimentalCoord, const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) override; void preview_plot_bin_get(const std::optional &type, const std::optional &azintUnit, diff --git a/broker/gen/api/DefaultApi.cpp b/broker/gen/api/DefaultApi.cpp index 7b31572f..e46a9676 100644 --- a/broker/gen/api/DefaultApi.cpp +++ b/broker/gen/api/DefaultApi.cpp @@ -1355,14 +1355,6 @@ void DefaultApi::preview_plot_get_handler(const Pistache::Rest::Request &request type = valueQuery_instance; } } - auto fillQuery = request.query().get("fill"); - std::optional fill; - if(fillQuery.has_value()){ - float valueQuery_instance; - if(fromStringValue(fillQuery.value(), valueQuery_instance)){ - fill = valueQuery_instance; - } - } auto experimentalCoordQuery = request.query().get("experimental_coord"); std::optional experimentalCoord; if(experimentalCoordQuery.has_value()){ @@ -1381,7 +1373,7 @@ void DefaultApi::preview_plot_get_handler(const Pistache::Rest::Request &request } try { - this->preview_plot_get(type, binning, compression, fill, experimentalCoord, azintUnit, 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 fabb84a5..ab271822 100644 --- a/broker/gen/api/DefaultApi.h +++ b/broker/gen/api/DefaultApi.h @@ -533,10 +533,9 @@ private: /// Type of requested plot /// Binning of frames for the plot (0 = default binning) (optional, default to 1) /// Enable DEFLATE compression of output data. (optional, default to false) - /// Fill value for elements that were missed during data collection (optional, default to 0.0f) /// 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) /// 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 &fill, const std::optional &experimentalCoord, const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) = 0; + virtual void preview_plot_get(const std::optional &type, const std::optional &binning, const std::optional &compression, const std::optional &experimentalCoord, const std::optional &azintUnit, Pistache::Http::ResponseWriter &response) = 0; /// /// Get full scan result /// diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 55943dc4..e9c05d4d 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -74,15 +74,6 @@ components: default: "Q_recipA" description: | Unit used for azim int. - fill_value: - in: query - name: fill - required: false - schema: - type: number - format: float - description: | - Fill value for elements that were missed during data collection plot_type: in: query name: type @@ -3122,7 +3113,6 @@ paths: - $ref: "#/components/parameters/binning" - $ref: "#/components/parameters/compression" - $ref: "#/components/parameters/plot_type" - - $ref: "#/components/parameters/fill_value" - $ref: "#/components/parameters/experimental_coord" - $ref: "#/components/parameters/azint_unit" responses: diff --git a/broker/redoc-static.html b/broker/redoc-static.html index a52d111e..434b9c5a 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -1301,8 +1301,6 @@ User mask is not automatically applied - i.e. pixels with user mask will have a " class="sc-eVqvcJ sc-fszimp kIppRw drqpJr">

Enable DEFLATE compression of output data.

type
required
string
Enum: "bkg_estimate" "azint" "azint_1d" "spot_count" "spot_count_low_res" "spot_count_indexed" "spot_count_ice" "indexing_rate" "indexing_time" "indexing_unit_cell_length" "indexing_unit_cell_angle" "profile_radius" "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" "pixel_sum" "processing_time" "beam_center_x" "beam_center_y"

Type of requested plot

-
fill
number <float>

Fill value for elements that were missed during data collection

experimental_coord
boolean
Default: false

Test Jungfraujoch system

http://localhost:5232/version