The detector plane was three PONI angles and nothing else, so the two things it
cannot express - an image mirrored in Y, and one mounted at a multiple of 90
degrees - had no home at all. They are now the DetectorOrientation carried by the
detector setup, composed with the PONI rotation into one orthogonal matrix whose
columns ARE the fast axis, the slow axis and the sample->PONI normal:
lab = R(rot1, rot2, rot3) * Delta * ( (x-bx)*p , (y-by)*p , distance )
GetFastAxis/GetSlowAxis/GetNormalAxis read those columns and DetectorAxes() sets
the plane from them, decomposing back to the angles; PoniRotMatrix and
PoniAnglesFromMatrix are the conversion in both directions, exact on the canonical
branch (rot2 in [-pi/2, pi/2]) and with a stated convention at gimbal lock. The
angles stay stored rather than re-derived, so a geometry given as angles is
written back as the same angles, to the bit.
Delta is never inferred. In particular an arbitrary rot3 is NOT decomposed into a
quarter turn plus a residual: rot3 is a fitted quantity, and a least-squares step
must not be able to turn the stored image. It is set only where something states
it - the detector setup, --detector-mirror-y / --detector-quarter-turns, or the
value a file this system wrote records - and defaults to the identity, which makes
the whole change a no-op for every existing detector and every existing file.
It is a different setting from DetectorSetup::mirror_y, which flips the MODULE
LAYOUT while an image is assembled and so decides what the stored pixels are.
Merging the two would apply the mirror twice for every modular detector, or change
the pixel content of every file written; both are ruled out. The new one earns its
keep exactly where the old one is a no-op: a detector whose image arrives already
assembled has no layout to flip.
Both generators are signed permutations of the in-plane offset, so they preserve
the distance from the PONI. That is why almost nothing downstream changes:
everything needing an azimuth already goes through LabCoord, and everything that
does not needs only a radius. The two hand-written copies of the rotation -
XtalResidual and RingOptimizer - take the discrete part as four constants next to
cos_rot3/sin_rot3, since it acts in the detector frame where rot3 acts in the
laboratory and cannot be folded into it. RingOptimizer needs it despite being a
radial fit: it fits the tilt, and the discrete part changes which way the tilt
tips a ring.
Carried as two optional CBOR keys and two detectorSpecific datasets, both
back-compatible; the NXmx module axis vectors and the translation direction stop
being hardcoded and are computed from it, reproducing today's values exactly at
the identity. GetPoniRotMatrix is renamed GetDetectorMatrix, because it is no
longer only the PONI rotation.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Lc5JG6kJqZoCWaoZ43JGTW
607 lines
24 KiB
C++
607 lines
24 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochHttpReader.h"
|
|
|
|
#include <cstring>
|
|
#include <mutex>
|
|
#include <nlohmann/json.hpp>
|
|
#include "../frame_serialize/CBORStream2Deserializer.h"
|
|
#include "../broker/gen/model/Image_buffer_status.h"
|
|
#include "../broker/gen/model/Plots.h"
|
|
#include "../broker/gen/model/Broker_status.h"
|
|
#include "../broker/gen/model/Roi_definitions.h"
|
|
#include "../common/JFJochMath.h"
|
|
#include "../image_analysis/bragg_integration/CalcISigma.h"
|
|
|
|
// Included last, after all std/project headers: on Windows <curl/curl.h> pulls in <windows.h>,
|
|
// whose min/max (and other) macros must not precede the headers that use std::min / std::max.
|
|
#include <curl/curl.h>
|
|
|
|
namespace {
|
|
// libcurl write callback: append the received bytes to a std::string (which holds binary fine).
|
|
size_t AppendToString(char *ptr, size_t size, size_t nmemb, void *userdata) {
|
|
auto *out = static_cast<std::string *>(userdata);
|
|
out->append(ptr, size * nmemb);
|
|
return size * nmemb;
|
|
}
|
|
|
|
// libcurl needs a one-time global init before any easy handle is used; do it once and
|
|
// thread-safely, as the viewer drives the reader from a worker thread.
|
|
void EnsureCurlGlobalInit() {
|
|
static std::once_flag once;
|
|
std::call_once(once, [] { curl_global_init(CURL_GLOBAL_DEFAULT); });
|
|
}
|
|
}
|
|
|
|
JFJochHttpReader::HttpResult JFJochHttpReader::Request(const std::string &method, const std::string &path,
|
|
const std::string &body,
|
|
const std::string &content_type) const {
|
|
// One easy handle is reused across requests so the connection stays alive. curl_easy_reset
|
|
// clears the previous request's options but deliberately keeps the live connection and the DNS
|
|
// / TLS-session caches, so a same-host request reuses the open socket; if that socket has since
|
|
// been closed, libcurl reconnects (and retries the request) on its own.
|
|
std::lock_guard cl(curl_mutex);
|
|
|
|
if (curl_handle == nullptr) {
|
|
EnsureCurlGlobalInit();
|
|
curl_handle = curl_easy_init();
|
|
if (curl_handle == nullptr)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Could not initialize CURL");
|
|
} else {
|
|
curl_easy_reset(curl_handle);
|
|
}
|
|
CURL *curl = curl_handle;
|
|
|
|
HttpResult result;
|
|
const std::string url = addr + path;
|
|
|
|
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
|
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, AppendToString);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &result.body);
|
|
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L); // safe to use from worker threads
|
|
// Cap connect and total transfer at 5 s so a stalled/black-holed broker fails the request instead
|
|
// of blocking curl_easy_perform forever (which would wedge the reader thread and Close() on
|
|
// curl_mutex). All viewer requests are small and against a nearby broker, so 5 s is ample.
|
|
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 5L);
|
|
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
|
|
|
|
curl_slist *headers = nullptr;
|
|
if (method == "PUT") {
|
|
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
|
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.data());
|
|
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, static_cast<long>(body.size()));
|
|
if (!content_type.empty())
|
|
headers = curl_slist_append(headers, ("Content-Type: " + content_type).c_str());
|
|
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
|
}
|
|
|
|
if (curl_easy_perform(curl) == CURLE_OK) {
|
|
result.ok = true;
|
|
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &result.status);
|
|
}
|
|
|
|
if (headers != nullptr)
|
|
curl_slist_free_all(headers);
|
|
return result;
|
|
}
|
|
|
|
JFJochHttpReader::~JFJochHttpReader() {
|
|
ResetConnection();
|
|
}
|
|
|
|
void JFJochHttpReader::ResetConnection() const {
|
|
std::lock_guard cl(curl_mutex);
|
|
if (curl_handle != nullptr) {
|
|
curl_easy_cleanup(curl_handle);
|
|
curl_handle = nullptr;
|
|
}
|
|
}
|
|
|
|
void JFJochHttpReader::Close() {
|
|
std::unique_lock ul(http_mutex);
|
|
addr = "";
|
|
SetStartMessage({});
|
|
last_image_buffer_counter = {};
|
|
last_op_http_sync = false;
|
|
cached_pixel_mask.reset();
|
|
cached_pixel_mask_arm_date.clear();
|
|
ResetConnection(); // drop the kept-alive connection on disconnect
|
|
}
|
|
|
|
ImageBufferStatus JFJochHttpReader::GetImageBufferStatus() const {
|
|
auto res = Request("GET", "/image_buffer/status");
|
|
if (!res.ok || res.status != 200)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not get image buffer status");
|
|
|
|
try {
|
|
org::openapitools::server::model::Image_buffer_status status = nlohmann::json::parse(res.body);
|
|
ImageBufferStatus ret{};
|
|
ret.max_image_number = status.getMaxImageNumber();
|
|
ret.min_image_number = status.getMinImageNumber();
|
|
ret.available_slots = status.getAvailableSlots();
|
|
ret.total_slots = status.getTotalSlots();
|
|
ret.images_in_the_buffer = status.getImageNumbers();
|
|
if (status.currentCounterIsSet())
|
|
ret.current_counter = status.getCurrentCounter();
|
|
return ret;
|
|
} catch (std::exception &e) {
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not parse image buffer status");
|
|
}
|
|
}
|
|
|
|
BrokerStatus JFJochHttpReader::GetBrokerStatus() const {
|
|
auto res = Request("GET", "/status");
|
|
if (!res.ok || res.status != 200)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not get broker status");
|
|
|
|
try {
|
|
org::openapitools::server::model::Broker_status input = nlohmann::json::parse(res.body);
|
|
BrokerStatus ret{};
|
|
ret.broker_version = input.getBrokerVersion();
|
|
ret.gpu_count = input.getGpuCount();
|
|
if (input.progressIsSet())
|
|
ret.progress = input.getProgress();
|
|
if (input.messageIsSet())
|
|
ret.message = input.getMessage();
|
|
|
|
if (input.getState() == "Inactive")
|
|
ret.state = JFJochState::Inactive;
|
|
else if (input.getState() == "Idle")
|
|
ret.state = JFJochState::Idle;
|
|
else if (input.getState() == "Measuring")
|
|
ret.state = JFJochState::Measuring;
|
|
else if (input.getState() == "Error")
|
|
ret.state = JFJochState::Error;
|
|
else if (input.getState() == "Busy")
|
|
ret.state = JFJochState::Busy;
|
|
else if (input.getState() == "Pedestal")
|
|
ret.state = JFJochState::Calibration;
|
|
|
|
if (input.getMessageSeverity() == "info")
|
|
ret.message_severity = BrokerStatus::MessageSeverity::Info;
|
|
else if (input.getMessageSeverity() == "success")
|
|
ret.message_severity = BrokerStatus::MessageSeverity::Success;
|
|
else if (input.getMessageSeverity() == "warning")
|
|
ret.message_severity = BrokerStatus::MessageSeverity::Warning;
|
|
else if (input.getMessageSeverity() == "error")
|
|
ret.message_severity = BrokerStatus::MessageSeverity::Error;
|
|
if (input.brokerVersionIsSet())
|
|
ret.broker_version = input.getBrokerVersion();
|
|
|
|
return ret;
|
|
} catch (std::exception &e) {
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not parse broker status");
|
|
}
|
|
}
|
|
|
|
uint64_t JFJochHttpReader::GetNumberOfImages() const {
|
|
std::unique_lock ul(http_mutex);
|
|
|
|
if (addr.empty())
|
|
return 0;
|
|
auto status = GetImageBufferStatus();
|
|
return status.max_image_number + 1;
|
|
}
|
|
|
|
std::shared_ptr<JFJochReaderDataset> JFJochHttpReader::UpdateDataset_i() {
|
|
auto res = Request("GET", "/image_buffer/start.cbor");
|
|
|
|
if (!res.ok || (res.status != 200 && res.status != 404))
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not get image buffer status");
|
|
|
|
if (res.status == 404)
|
|
return {};
|
|
if (res.body.empty())
|
|
return {};
|
|
|
|
try {
|
|
auto msg = CBORStream2Deserialize(res.body);
|
|
|
|
if (msg->msg_type != CBORImageType::START)
|
|
return {};
|
|
|
|
auto dataset = std::make_shared<JFJochReaderDataset>();
|
|
dataset->arm_date = msg->start_message->arm_date;
|
|
|
|
dataset->experiment = default_experiment;
|
|
|
|
// JFJochReader is always using int32_t
|
|
dataset->experiment.BitDepthImage(32);
|
|
dataset->experiment.PixelSigned(true);
|
|
dataset->experiment.FilePrefix(msg->start_message->file_prefix);
|
|
dataset->experiment.BeamX_pxl(msg->start_message->beam_center_x);
|
|
dataset->experiment.BeamY_pxl(msg->start_message->beam_center_y);
|
|
dataset->experiment.DetectorDistance_mm(msg->start_message->detector_distance * 1000.0);
|
|
dataset->experiment.DetectIceRings(msg->start_message->detect_ice_rings.value_or(false));
|
|
dataset->experiment.PoniRot1_rad(msg->start_message->poni_rot1.value_or(0.0));
|
|
dataset->experiment.PoniRot2_rad(msg->start_message->poni_rot2.value_or(0.0));
|
|
dataset->experiment.PoniRot3_rad(msg->start_message->poni_rot3.value_or(0.0));
|
|
|
|
dataset->az_int_bin_to_q = msg->start_message->az_int_bin_to_q;
|
|
dataset->az_int_bin_to_phi = msg->start_message->az_int_bin_to_phi;
|
|
dataset->q_bins = msg->start_message->az_int_q_bin_count.value_or(0);
|
|
dataset->azimuthal_bins = msg->start_message->az_int_phi_bin_count.value_or(0);
|
|
dataset->jfjoch_release = msg->start_message->jfjoch_release;
|
|
|
|
DetectorSetup detector = DetDECTRIS(msg->start_message->image_size_x, msg->start_message->image_size_y,
|
|
msg->start_message->detector_description, {});
|
|
detector.PixelSize_um(msg->start_message->pixel_size_x * 1e6);
|
|
detector.ImageOrientation(DetectorOrientation(msg->start_message->detector_orientation_mirror_y,
|
|
msg->start_message->detector_orientation_quarter_turns));
|
|
detector.SaturationLimit(SaturationLimitFromValue(msg->start_message->saturation_value));
|
|
detector.MinFrameTime(std::chrono::microseconds(0));
|
|
detector.MinCountTime(std::chrono::microseconds(0));
|
|
detector.ReadOutTime(std::chrono::microseconds (0));
|
|
dataset->experiment.Detector(detector);
|
|
|
|
dataset->experiment.FrameTime(
|
|
std::chrono::microseconds(std::lround(msg->start_message->frame_time * 1e6)),
|
|
std::chrono::microseconds(std::lround(msg->start_message->count_time * 1e6))
|
|
);
|
|
|
|
if (!msg->start_message->pixel_mask.empty()) {
|
|
// The pixel mask is constant for an acquisition; build the full-detector (~tens of MB)
|
|
// PixelMask once per arm and share it across the per-refresh dataset snapshots, so a live
|
|
// dataset refresh does not reconstruct and copy it on every tick.
|
|
if (!cached_pixel_mask || cached_pixel_mask_arm_date != dataset->arm_date) {
|
|
cached_pixel_mask =
|
|
std::make_shared<const PixelMask>(msg->start_message->pixel_mask.begin()->second);
|
|
cached_pixel_mask_arm_date = dataset->arm_date;
|
|
}
|
|
dataset->pixel_mask = cached_pixel_mask;
|
|
}
|
|
|
|
dataset->experiment.NumTriggers(1);
|
|
dataset->experiment.ImagesPerTrigger(msg->start_message->number_of_images);
|
|
dataset->experiment.SampleName(msg->start_message->sample_name);
|
|
dataset->experiment.SampleTemperature_K(msg->start_message->sample_temperature_K);
|
|
dataset->experiment.RingCurrent_mA(msg->start_message->ring_current_mA);
|
|
dataset->experiment.IncidentEnergy_keV(msg->start_message->incident_energy / 1000.0);
|
|
|
|
dataset->experiment.FluorescenceSpectrum(msg->start_message->fluorescence_spectrum);
|
|
|
|
dataset->bkg_estimate = GetPlot_i("bkg_estimate");
|
|
dataset->ice_ring_score = GetPlot_i("ice_ring_score");
|
|
dataset->spot_count = GetPlot_i("spot_count");
|
|
dataset->spot_count_ice_rings = GetPlot_i("spot_count_ice");
|
|
dataset->spot_count_low_res = GetPlot_i("spot_count_low_res");
|
|
dataset->spot_count_indexed = GetPlot_i("spot_count_indexed");
|
|
|
|
dataset->indexing_result = GetPlot_i("indexing_rate");
|
|
dataset->indexing_lattice_count = GetPlot_i("indexing_lattice_count");
|
|
dataset->profile_radius = GetPlot_i("profile_radius");
|
|
dataset->mosaicity_deg = GetPlot_i("mosaicity");
|
|
dataset->b_factor = GetPlot_i("b_factor");
|
|
dataset->resolution_estimate = GetPlot_i("resolution_estimate");
|
|
dataset->efficiency = GetPlot_i("image_collection_efficiency");
|
|
dataset->integrated_reflections = GetPlot_i("integrated_reflections");
|
|
dataset->image_scale_factor = GetPlot_i("image_scale_factor");
|
|
dataset->image_scale_cc = GetPlot_i("image_scale_cc");
|
|
|
|
if (msg->start_message->goniometer)
|
|
dataset->experiment.Goniometer(msg->start_message->goniometer);
|
|
else if (msg->start_message->grid_scan)
|
|
dataset->experiment.GridScan(msg->start_message->grid_scan);
|
|
|
|
return dataset;
|
|
} catch (std::exception &e) {
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
std::string("Could not load dataset: ") + std::string(e.what()));
|
|
}
|
|
}
|
|
|
|
void JFJochHttpReader::ReadURL(const std::string &url) {
|
|
std::unique_lock ul(http_mutex);
|
|
ResetConnection(); // selecting an address (re)opens the connection from scratch
|
|
// Drop the previous source's cached mask: a different (or re-armed) source has its own mask, and
|
|
// the arm_date key alone does not distinguish an empty/duplicate arm_date across sources.
|
|
cached_pixel_mask.reset();
|
|
cached_pixel_mask_arm_date.clear();
|
|
addr = url;
|
|
if (url.empty())
|
|
SetStartMessage({});
|
|
else
|
|
SetStartMessage(UpdateDataset_i());
|
|
}
|
|
|
|
std::shared_ptr<const JFJochReaderDataset> JFJochHttpReader::RefreshDatasetIfChanged(int64_t &num_images_out) {
|
|
std::unique_lock ul(http_mutex);
|
|
|
|
num_images_out = 0;
|
|
if (addr.empty())
|
|
return {};
|
|
|
|
auto status = GetImageBufferStatus();
|
|
num_images_out = status.max_image_number + 1;
|
|
|
|
// Re-fetch the dataset (start message + plots) only when the buffer actually changed,
|
|
// so the dataset-only follow mode does not hammer the broker with plot requests.
|
|
const bool buffer_changed = !last_image_buffer_counter.has_value()
|
|
|| !status.current_counter.has_value()
|
|
|| last_image_buffer_counter.value() != status.current_counter.value();
|
|
last_image_buffer_counter = status.current_counter;
|
|
|
|
if (!buffer_changed)
|
|
return {};
|
|
|
|
SetStartMessage(UpdateDataset_i());
|
|
return GetDataset();
|
|
}
|
|
|
|
bool JFJochHttpReader::LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage &message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) {
|
|
std::unique_lock ul(http_mutex);
|
|
|
|
if (addr.empty())
|
|
return false;
|
|
|
|
bool buffer_changed = false;
|
|
|
|
// For autoupdate - if buffer didn't change don't update dataset
|
|
auto status = GetImageBufferStatus();
|
|
if (!last_image_buffer_counter.has_value() // No information on the previous buffer state - always assume it changed
|
|
|| !status.current_counter.has_value() // No information on the current buffer state - e.g. old version of software
|
|
|| last_image_buffer_counter.value() != status.current_counter.value()) // current counter value different from previous
|
|
buffer_changed = true;
|
|
last_image_buffer_counter = status.current_counter;
|
|
|
|
if (image_number == -1) {
|
|
if (last_op_http_sync && !buffer_changed)
|
|
return false;
|
|
last_op_http_sync = true;
|
|
} else {
|
|
last_op_http_sync = false;
|
|
}
|
|
|
|
// Always update dataset, as it might have changed from the last time
|
|
if (buffer_changed && update_dataset)
|
|
dataset = UpdateDataset_i();
|
|
if (!dataset)
|
|
return false;
|
|
|
|
auto res = Request("GET", "/image_buffer/image.cbor?id=" + std::to_string(image_number));
|
|
|
|
if (!res.ok || res.status != 200)
|
|
return false;
|
|
|
|
if (res.body.empty()) {
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
buffer.resize(res.body.size());
|
|
memcpy(buffer.data(), res.body.data(), res.body.size());
|
|
|
|
auto msg = CBORStream2Deserialize(buffer);
|
|
|
|
if (msg->msg_type != CBORImageType::IMAGE)
|
|
return false;
|
|
|
|
message = *msg->data_message;
|
|
|
|
CalcISigma(message);
|
|
CalcWilsonBFactor(message);
|
|
|
|
return true;
|
|
} catch (std::exception &e) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> JFJochHttpReader::GetRawImage(int64_t image_number) {
|
|
if (addr.empty())
|
|
return {};
|
|
|
|
auto res = Request("GET", "/image_buffer/image.cbor?id=" + std::to_string(image_number));
|
|
|
|
if (!res.ok || res.status != 200 || res.body.empty())
|
|
return {};
|
|
|
|
try {
|
|
auto msg =
|
|
CBORStream2Deserialize(reinterpret_cast<uint8_t *>(res.body.data()), res.body.size());
|
|
|
|
if (msg->msg_type != CBORImageType::IMAGE)
|
|
return {};
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> image = std::make_shared<JFJochReaderRawImage>();
|
|
image->image_buffer.resize(msg->data_message->image.GetCompressedSize());
|
|
memcpy(image->image_buffer.data(),
|
|
msg->data_message->image.GetCompressed(),
|
|
msg->data_message->image.GetCompressedSize());
|
|
image->image = CompressedImage(
|
|
image->image_buffer.data(),
|
|
image->image_buffer.size(),
|
|
msg->data_message->image.GetWidth(),
|
|
msg->data_message->image.GetHeight(),
|
|
msg->data_message->image.GetMode(),
|
|
msg->data_message->image.GetCompressionAlgorithm()
|
|
);
|
|
|
|
return image;
|
|
} catch (std::exception &e) {
|
|
return {};
|
|
}
|
|
}
|
|
|
|
std::vector<float> JFJochHttpReader::GetPlot_i(const std::string &plot_type, float fill_value) const {
|
|
if (addr.empty())
|
|
return {};
|
|
|
|
auto res_bin = Request("GET", "/preview/plot.bin?type=" + plot_type);
|
|
if (res_bin.ok && res_bin.status == 200) {
|
|
if (res_bin.body.size() % sizeof(float) != 0) {
|
|
throw std::runtime_error("Input size is not a multiple of sizeof(float)");
|
|
}
|
|
std::vector<float> v(res_bin.body.size() / sizeof(float));
|
|
std::memcpy(v.data(), res_bin.body.data(), res_bin.body.size());
|
|
return v;
|
|
}
|
|
|
|
auto res = Request("GET", "/preview/plot?binning=1&experimental_coord=false&fill="
|
|
+ std::to_string(fill_value) + "&type=" + plot_type);
|
|
|
|
if (!res.ok || res.status != 200)
|
|
return {};
|
|
|
|
try {
|
|
org::openapitools::server::model::Plots plots = nlohmann::json::parse(res.body);
|
|
auto plot_v = plots.getPlot();
|
|
if (plot_v.size() == 1)
|
|
return plot_v[0].getY();
|
|
else
|
|
return {};
|
|
} catch (nlohmann::json::parse_error &e) {
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Could not parse plot " + plot_type);
|
|
}
|
|
}
|
|
|
|
void JFJochHttpReader::UploadUserMask(const std::vector<uint32_t>& mask) {
|
|
std::unique_lock ul(http_mutex);
|
|
|
|
if (addr.empty())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"HTTP address not set. Call ReadURL() first.");
|
|
|
|
if (mask.empty())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"User mask is empty.");
|
|
|
|
const char* data_ptr = reinterpret_cast<const char*>(mask.data());
|
|
const size_t byte_size = mask.size() * sizeof(uint32_t);
|
|
|
|
auto res = Request("PUT", "/config/user_mask",
|
|
std::string(data_ptr, byte_size),
|
|
"application/octet-stream");
|
|
|
|
if (!res.ok)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Failed to connect to server to upload user mask");
|
|
|
|
if (res.status != 200)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Server rejected user mask upload");
|
|
}
|
|
|
|
ROIDefinition JFJochHttpReader::GetROIDefinitions() const {
|
|
std::unique_lock ul(http_mutex);
|
|
if (addr.empty())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "HTTP address not set");
|
|
|
|
auto res = Request("GET", "/config/roi");
|
|
if (!res.ok || res.status != 200)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Could not get ROI definitions");
|
|
|
|
org::openapitools::server::model::Roi_definitions input = nlohmann::json::parse(res.body);
|
|
ROIDefinition out;
|
|
for (const auto &i : input.getBox().getRois())
|
|
out.boxes.emplace_back(i.getName(), i.getMinXPxl(), i.getMaxXPxl(), i.getMinYPxl(), i.getMaxYPxl());
|
|
for (const auto &i : input.getCircle().getRois())
|
|
out.circles.emplace_back(i.getName(), i.getCenterXPxl(), i.getCenterYPxl(), i.getRadiusPxl());
|
|
for (const auto &i : input.getAzim().getRois()) {
|
|
float phi_min = 0, phi_max = 0;
|
|
if (i.phiMinDegIsSet() && i.phiMaxDegIsSet()) {
|
|
phi_min = i.getPhiMinDeg();
|
|
phi_max = i.getPhiMaxDeg();
|
|
}
|
|
const float d_min = (i.getQMaxRecipA() == 0.0f) ? 0.0f : 2.0f * static_cast<float>(PI) / i.getQMaxRecipA();
|
|
const float d_max = (i.getQMinRecipA() == 0.0f) ? 0.0f : 2.0f * static_cast<float>(PI) / i.getQMinRecipA();
|
|
out.azimuthal.emplace_back(i.getName(), d_min, d_max, phi_min, phi_max);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
void JFJochHttpReader::UploadROIDefinitions(const ROIDefinition &rois) const {
|
|
std::unique_lock ul(http_mutex);
|
|
if (addr.empty())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "HTTP address not set");
|
|
|
|
namespace model = org::openapitools::server::model;
|
|
model::Roi_definitions out;
|
|
|
|
model::Roi_box_list bl;
|
|
std::vector<model::Roi_box> boxes;
|
|
for (const auto &b : rois.boxes) {
|
|
model::Roi_box e;
|
|
e.setName(b.GetName());
|
|
e.setMinXPxl(b.GetXMin()); e.setMaxXPxl(b.GetXMax());
|
|
e.setMinYPxl(b.GetYMin()); e.setMaxYPxl(b.GetYMax());
|
|
boxes.push_back(e);
|
|
}
|
|
bl.setRois(boxes);
|
|
out.setBox(bl);
|
|
|
|
model::Roi_circle_list cl;
|
|
std::vector<model::Roi_circle> circles;
|
|
for (const auto &c : rois.circles) {
|
|
model::Roi_circle e;
|
|
e.setName(c.GetName());
|
|
e.setCenterXPxl(c.GetX()); e.setCenterYPxl(c.GetY());
|
|
e.setRadiusPxl(c.GetRadius_pxl());
|
|
circles.push_back(e);
|
|
}
|
|
cl.setRois(circles);
|
|
out.setCircle(cl);
|
|
|
|
model::Roi_azim_list al;
|
|
std::vector<model::Roi_azimuthal> azim;
|
|
for (const auto &a : rois.azimuthal) {
|
|
model::Roi_azimuthal e;
|
|
e.setName(a.GetName());
|
|
e.setQMinRecipA(a.GetQMin_recipA());
|
|
e.setQMaxRecipA(a.GetQMax_recipA());
|
|
if (a.HasPhi()) {
|
|
e.setPhiMinDeg(a.GetPhiMin_deg());
|
|
e.setPhiMaxDeg(a.GetPhiMax_deg());
|
|
}
|
|
azim.push_back(e);
|
|
}
|
|
al.setRois(azim);
|
|
out.setAzim(al);
|
|
|
|
nlohmann::json j = out;
|
|
auto res = Request("PUT", "/config/roi", j.dump(), "application/json");
|
|
if (!res.ok)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Failed to connect to server to upload ROIs");
|
|
if (res.status != 200)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Server rejected ROI upload");
|
|
}
|
|
|
|
std::vector<SpotToSave> JFJochHttpReader::ReadSpots(int64_t image) const {
|
|
std::unique_lock ul(http_mutex);
|
|
|
|
if (image < 0)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Image number must be non-negative");
|
|
|
|
if (addr.empty())
|
|
return {};
|
|
|
|
auto res = Request("GET", "/image_buffer/image.cbor?id=" + std::to_string(image));
|
|
|
|
if (!res.ok || res.status != 200 || res.body.empty())
|
|
return {};
|
|
|
|
try {
|
|
auto msg = CBORStream2Deserialize(res.body);
|
|
|
|
if (msg->msg_type != CBORImageType::IMAGE)
|
|
return {};
|
|
|
|
return msg->data_message->spots;
|
|
} catch (std::exception &e) {
|
|
return {};
|
|
}
|
|
}
|