mirror of
https://github.com/slsdetectorgroup/aare.git
synced 2026-08-12 05:30:28 +02:00
PixelHistogram (#317)
Multi threaded filling of per pixel histograms for example for detector calibration 1. PixelHistogram - Generic variant expects already pedestal subtracted data 2. PedestalTrackingHistogram - Terrible name, useful class. Keeps it's own pedestal and does conversion and pedestal tracking in the worker threads. --------- Co-authored-by: Lars Erik Fröjd <froejdh_e@pc-jungfrau-02.psi.ch>
This commit is contained in:
co-authored by
Lars Erik Fröjd
parent
8e69b498e5
commit
f670ba77a2
@@ -0,0 +1,147 @@
|
||||
// SPDX-License-Identifier: MPL-2.0
|
||||
#include "aare/hist/PixelHistogram.hpp"
|
||||
#include "np_helper.hpp"
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <pybind11/numpy.h>
|
||||
#include <pybind11/pybind11.h>
|
||||
#include <pybind11/stl.h>
|
||||
#include <string>
|
||||
|
||||
namespace py = pybind11;
|
||||
using namespace ::aare;
|
||||
|
||||
namespace {
|
||||
|
||||
template <typename StorageType>
|
||||
void define_pixel_histogram_binding(py::module &m, const char *class_name,
|
||||
const char *storage_dtype) {
|
||||
using Hist = PixelHistogram<StorageType, double>;
|
||||
|
||||
const std::string doc =
|
||||
std::string("A histogram for pixel-wise statistics with float64 input "
|
||||
"axis and ") +
|
||||
storage_dtype + " bin storage";
|
||||
|
||||
py::class_<Hist>(m, class_name, doc.c_str())
|
||||
.def(py::init<int, int, int, double, double, int, std::size_t>(),
|
||||
R"(
|
||||
Initialize a PixelHistogram.
|
||||
|
||||
Args:
|
||||
rows: Number of rows in the detector
|
||||
cols: Number of columns in the detector
|
||||
n_bins: Number of histogram bins
|
||||
xmin: Minimum value for histogram range
|
||||
xmax: Maximum value for histogram range
|
||||
n_threads: Number of threads for parallel filling (default: 1)
|
||||
max_pending: Maximum number of images that can be queued for
|
||||
asynchronous filling before fill_async() applies
|
||||
backpressure on the caller (default: 16)
|
||||
)",
|
||||
py::kw_only(), py::arg("rows"), py::arg("cols"), py::arg("n_bins"),
|
||||
py::arg("xmin"), py::arg("xmax"), py::arg("n_threads") = 1,
|
||||
py::arg("max_pending") = std::size_t{16})
|
||||
|
||||
.def(
|
||||
"fill_async",
|
||||
[](Hist &self, py::array_t<double, 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<double, 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
|
||||
returns, so the caller may mutate or free the numpy array
|
||||
immediately. The actual histogram update happens on a
|
||||
background thread. If the internal queue is full this call
|
||||
blocks (with the GIL released) until a slot becomes available.
|
||||
|
||||
Args:
|
||||
image: A 2D numpy array of pixel values (dtype: float64)
|
||||
)",
|
||||
py::arg("image").noconvert())
|
||||
|
||||
.def("flush", &Hist::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(
|
||||
"values",
|
||||
[](const Hist &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<StorageType, 3> *ptr = nullptr;
|
||||
{
|
||||
py::gil_scoped_release release;
|
||||
ptr = new NDArray<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
|
||||
returning, so the snapshot is consistent with everything
|
||||
submitted up to this call.
|
||||
|
||||
Returns:
|
||||
A 3D numpy array containing the histogram bins for each pixel
|
||||
)")
|
||||
|
||||
.def(
|
||||
"bin_centers",
|
||||
[](const Hist &self) {
|
||||
auto ptr = new NDArray<double, 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 Hist &self) {
|
||||
auto ptr = new NDArray<double, 1>(self.bin_edges());
|
||||
return return_image_data(ptr);
|
||||
},
|
||||
R"(
|
||||
Get the bin edges along the value axis.
|
||||
|
||||
Returns:
|
||||
A 1D numpy array containing the edge values for the histogram bins
|
||||
)");
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void define_pixel_histogram_bindings(py::module &m) {
|
||||
define_pixel_histogram_binding<double>(m, "PixelHistogram_d", "float64");
|
||||
define_pixel_histogram_binding<float>(m, "PixelHistogram_f", "float32");
|
||||
define_pixel_histogram_binding<std::uint64_t>(m, "PixelHistogram_u64",
|
||||
"uint64");
|
||||
define_pixel_histogram_binding<std::uint32_t>(m, "PixelHistogram_u32",
|
||||
"uint32");
|
||||
define_pixel_histogram_binding<std::uint16_t>(m, "PixelHistogram_u16",
|
||||
"uint16");
|
||||
define_pixel_histogram_binding<std::uint8_t>(m, "PixelHistogram_u8",
|
||||
"uint8");
|
||||
|
||||
// Backwards-compatible alias for the generic Python class name.
|
||||
m.attr("PixelHistogram") = m.attr("PixelHistogram_d");
|
||||
}
|
||||
Reference in New Issue
Block a user