Build Packages / Unit tests (push) Successful in 1h32m35s
Build Packages / build:windows:cuda (push) Successful in 18m0s
Build Packages / build:viewer-tgz:cpu (push) Successful in 7m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 8m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m13s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m57s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m23s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m45s
Build Packages / build:rpm (rocky8) (push) Successful in 11m39s
Build Packages / build:rpm (rocky9) (push) Successful in 14m0s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m42s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m38s
Build Packages / DIALS test (push) Successful in 14m55s
Build Packages / XDS test (durin plugin) (push) Successful in 7m11s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m34s
Build Packages / Generate python client (push) Successful in 28s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 9m55s
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * Analysis: The azimuthal-integration solid-angle correction now follows the incidence angle to the detector normal (`cos^3` of that angle) instead of `cos^3(2*theta)`, so it is correct for a tilted detector and matches PyFAI `solidAngleArray` and MAX IV azint (unchanged for an untilted detector). Crystal geometry refinement (`XtalOptimizer`) no longer silently ignores an imported PONI `rot3` (rotation about the beam): it is applied as a fixed rotation in the residual so refinement stays consistent with the rest of the pipeline. Polarization and azimuthal binning already honoured `rot3` through the full PONI rotation. * jfjoch_viewer: Open datasets on the WSL2/UNC filesystem (paths starting `\\`); write processing outputs next to the input file, with a Browse button and independent `_process.h5` / merged `.mtz`/`.cif` toggles; and show the determined space group in the merge-statistics window. * rugnux: Accept an absolute `-o` output prefix in offline processing. * Packaging: The self-contained Linux viewer `.tgz` now bundles cuFFT, so it runs without a system CUDA toolkit (`.deb`/`.rpm` are unchanged, distro-managed). * Docs: Bring the analysis references up to date with the code. `docs/CPU_DATA_ANALYSIS.md` now reflects the unified profile-fit Bragg integration engine, multi-lattice indexing, azimuthal phi binning, the radial parallax/bandwidth profile with sub-pixel centring, the rot3d capture-fraction handling and the automatic CC1/2 resolution cutoff, and drops the descriptions of features that were never implemented (French-Wilson amplitudes, the still excitation-error partiality model); `docs/RUGNUX.md` documents the new `--resolution-cutoff`/`--resolution-cc-target`/`--resolution-shells`, `--min-captured-fraction`, `--mosaicity`, `--reference-column`, the azimuthal correction toggles and the geometry-override options, and corrects the `-N` default. The outdated in-source design notes (ICE_RING_DETECTION, BRAGG_INTEGRATION_ENGINE, NEXTGEN_INTEGRATOR) are removed.Reviewed-on: #68 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
88 lines
3.9 KiB
C++
88 lines
3.9 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "../reader/JFJochReader.h"
|
|
#include "../common/BrokerStatus.h"
|
|
#include "../common/ImageBuffer.h"
|
|
#include "../common/ROIDefinition.h"
|
|
|
|
// libcurl's easy handle, kept opaque here so this widely-included header does NOT pull in
|
|
// <curl/curl.h>. On Windows curl.h drags in <windows.h>, whose min/max/ERROR/LoadImage macros
|
|
// would then clobber every viewer translation unit that includes this header (breaking std::min /
|
|
// std::max in gemmi, the `ERROR` enum, the LoadImage() calls, ...). CURL is `typedef void` in
|
|
// libcurl; <curl/curl.h> is included only in JFJochHttpReader.cpp.
|
|
using CURL = void;
|
|
|
|
class JFJochHttpReader : public JFJochReader {
|
|
mutable std::mutex http_mutex;
|
|
std::string addr;
|
|
|
|
// Persistent libcurl handle: created lazily on the first request (i.e. as soon as an address
|
|
// is selected) and then reused for every subsequent request so the TCP/TLS connection is kept
|
|
// alive. libcurl transparently reopens the connection if it was dropped (idle timeout,
|
|
// server-side session limit, ...). curl_mutex serialises access because a single easy handle
|
|
// must never be used from two threads at once; it is a leaf lock (nothing else is taken while
|
|
// it is held), so it cannot deadlock with http_mutex.
|
|
mutable std::mutex curl_mutex;
|
|
mutable CURL *curl_handle = nullptr;
|
|
|
|
std::optional<int64_t> last_image_buffer_counter;
|
|
bool last_op_http_sync = false;
|
|
|
|
// Cache of the (constant-per-acquisition) pixel mask, keyed on arm date, so the per-refresh
|
|
// dataset rebuild reuses one shared mask instead of reconstructing it every tick.
|
|
std::shared_ptr<const PixelMask> cached_pixel_mask;
|
|
std::string cached_pixel_mask_arm_date;
|
|
|
|
// Minimal HTTP result: whether a response arrived (transport-level success), the HTTP status
|
|
// code, and the (possibly binary) response body.
|
|
struct HttpResult {
|
|
bool ok = false;
|
|
long status = 0;
|
|
std::string body;
|
|
};
|
|
// Single libcurl request helper behind every endpoint call. method is "GET" or "PUT"; for PUT
|
|
// the body is sent with the given content_type.
|
|
HttpResult Request(const std::string &method, const std::string &path,
|
|
const std::string &body = {}, const std::string &content_type = {}) const;
|
|
|
|
// Tear down the persistent connection (on disconnect, when a new address is selected, and in
|
|
// the destructor); the next Request transparently re-opens it.
|
|
void ResetConnection() const;
|
|
|
|
ImageBufferStatus GetImageBufferStatus() const;
|
|
|
|
bool LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage& message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) override;
|
|
std::shared_ptr<JFJochReaderDataset> UpdateDataset_i();
|
|
std::vector<float> GetPlot_i(const std::string &plot_type, float fill_value = 0.0) const;
|
|
public:
|
|
~JFJochHttpReader() override;
|
|
|
|
void ReadURL(const std::string& url);
|
|
uint64_t GetNumberOfImages() const override;
|
|
void Close() override;
|
|
|
|
// Refresh dataset/plots if the image buffer changed since the last poll (returns nullptr if
|
|
// unchanged). Always writes the current number of images to num_images_out. Does not load an image.
|
|
std::shared_ptr<const JFJochReaderDataset> RefreshDatasetIfChanged(int64_t &num_images_out);
|
|
|
|
void UploadUserMask(const std::vector<uint32_t>& mask);
|
|
|
|
[[nodiscard]] ROIDefinition GetROIDefinitions() const; // GET /config/roi
|
|
void UploadROIDefinitions(const ROIDefinition &rois) const; // PUT /config/roi
|
|
|
|
BrokerStatus GetBrokerStatus() const;
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> GetRawImage(int64_t image_number) override;
|
|
std::vector<SpotToSave> ReadSpots(int64_t image) const override;
|
|
};
|
|
|
|
|
|
|