detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-06-06 10:58:42 +02:00
Code Issues Actions Packages Releases Activity

fix format
Build on RHEL9 / build (push) Successful in 2m30s
Details
Build on RHEL8 / build (push) Successful in 3m3s
Details
Run tests using data on local RHEL8 / build (push) Successful in 4m2s
Details

Browse Source
This commit is contained in:
Erik Fröjdh
2026-06-02 16:08:15 +02:00
parent c20a94015c
commit 6fd26d7252
11 changed files with 289 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/bind_PixelHistogram.hpp
+50 -45
View File
@@ -12,7 +12,7 @@ using namespace ::aare;
void define_pixel_histogram_bindings(py::module &m) {
py::class_<PixelHistogram>(m, "PixelHistogram",
"A histogram for pixel-wise statistics")
"A histogram for pixel-wise statistics")
.def(py::init<int, int, int, double, double, int, std::size_t>(),
R"(
Initialize a PixelHistogram.
@@ -32,20 +32,21 @@ void define_pixel_histogram_bindings(py::module &m) {
py::arg("xmin"), py::arg("xmax"), py::arg("n_threads") = 1,
py::arg("max_pending") = std::size_t{16})
.def("fill_async",
[](PixelHistogram &self,
py::array_t<PixelHistogram::AxisType, 0> image) {
// Copy the numpy buffer into an owned NDArray while we
// still hold the GIL so we don't depend on the array's
// backing storage outliving this call.
auto view = make_view_2d(image);
NDArray<PixelHistogram::AxisType, 2> owned(view);
// Release the GIL while enqueueing - fill_async can block
// on backpressure when the queue is full.
py::gil_scoped_release release;
self.fill_async(std::move(owned));
},
R"(
.def(
"fill_async",
[](PixelHistogram &self,
py::array_t<PixelHistogram::AxisType, 0> image) {
// Copy the numpy buffer into an owned NDArray while we
// still hold the GIL so we don't depend on the array's
// backing storage outliving this call.
auto view = make_view_2d(image);
NDArray<PixelHistogram::AxisType, 2> owned(view);
// Release the GIL while enqueueing - fill_async can block
// on backpressure when the queue is full.
py::gil_scoped_release release;
self.fill_async(std::move(owned));
},
R"(
Submit an image for asynchronous filling.
The image is copied into an internal buffer before this call
@@ -57,37 +58,37 @@ void define_pixel_histogram_bindings(py::module &m) {
Args:
image: A 2D numpy array of pixel values (dtype: float32)
)",
py::arg("image").noconvert())
py::arg("image").noconvert())
.def("flush",
&PixelHistogram::flush,
.def("flush", &PixelHistogram::flush,
R"(
Block until all images submitted via fill_async() have been
merged into the accumulators. Cheap when nothing is pending.
)",
py::call_guard<py::gil_scoped_release>())
.def("pending",
&PixelHistogram::pending,
.def("pending", &PixelHistogram::pending,
R"(
Return the number of images either waiting in the queue or
currently being processed by the background thread. Useful
for monitoring/diagnostics.
)")
.def("values",
[](const PixelHistogram &self) {
// values() implicitly flushes - release the GIL while it
// does so. Allocation/copy into the NDArray runs without
// the GIL too; only the numpy wrapping needs it.
NDArray<PixelHistogram::StorageType, 3>* ptr = nullptr;
{
py::gil_scoped_release release;
ptr = new NDArray<PixelHistogram::StorageType, 3>(self.values());
}
return return_image_data(ptr);
},
R"(
.def(
"values",
[](const PixelHistogram &self) {
// values() implicitly flushes - release the GIL while it
// does so. Allocation/copy into the NDArray runs without
// the GIL too; only the numpy wrapping needs it.
NDArray<PixelHistogram::StorageType, 3> *ptr = nullptr;
{
py::gil_scoped_release release;
ptr = new NDArray<PixelHistogram::StorageType, 3>(
self.values());
}
return return_image_data(ptr);
},
R"(
Get the histogram data as a numpy array.
Implicitly flushes any pending asynchronous fills before
@@ -98,23 +99,27 @@ void define_pixel_histogram_bindings(py::module &m) {
A 3D numpy array containing the histogram bins for each pixel
)")
.def("bin_centers",
[](const PixelHistogram &self) {
auto ptr = new NDArray<PixelHistogram::AxisType, 1>(self.bin_centers());
return return_image_data(ptr);
},
R"(
.def(
"bin_centers",
[](const PixelHistogram &self) {
auto ptr = new NDArray<PixelHistogram::AxisType, 1>(
self.bin_centers());
return return_image_data(ptr);
},
R"(
Get the bin centers along the value axis.
Returns:
A 1D numpy array containing the center values for each histogram bin
)")
.def("bin_edges",
[](const PixelHistogram &self) {
auto ptr = new NDArray<PixelHistogram::AxisType, 1>(self.bin_edges());
return return_image_data(ptr);
},
R"(
.def(
"bin_edges",
[](const PixelHistogram &self) {
auto ptr =
new NDArray<PixelHistogram::AxisType, 1>(self.bin_edges());
return return_image_data(ptr);
},
R"(
Get the bin edges along the value axis.
Returns: