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

added variable cluster finder

Browse Source
This commit is contained in:
Erik Fröjdh
2024-10-30 17:22:57 +01:00
parent dde92b993f
commit a466887064
5 changed files with 109 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
python/src/np_helper.hpp
View File

@ -7,36 +7,37 @@
#include "aare/Frame.hpp"
#include "aare/NDArray.hpp"
#include "aare/NDView.hpp"
namespace py = pybind11;
// Pass image data back to python as a numpy array
// template <typename T, ssize_t Ndim>
// py::array return_image_data(pl::ImageData<T, Ndim> *image) {
template <typename T, int64_t Ndim>
py::array return_image_data(aare::NDArray<T, Ndim> *image) {
// py::capsule free_when_done(image, [](void *f) {
// pl::ImageData<T, Ndim> *foo =
// reinterpret_cast<pl::ImageData<T, Ndim> *>(f);
// delete foo;
// });
py::capsule free_when_done(image, [](void *f) {
aare::NDArray<T, Ndim> *foo =
reinterpret_cast<aare::NDArray<T, Ndim> *>(f);
delete foo;
});
// return py::array_t<T>(
// image->shape(), // shape
// image->byte_strides(), // C-style contiguous strides for double
// image->data(), // the data pointer
// free_when_done); // numpy array references this parent
// }
return py::array_t<T>(
image->shape(), // shape
image->byte_strides(), // C-style contiguous strides for double
image->data(), // the data pointer
free_when_done); // numpy array references this parent
}
// template <typename T> py::array return_vector(std::vector<T> *vec) {
// py::capsule free_when_done(vec, [](void *f) {
// std::vector<T> *foo = reinterpret_cast<std::vector<T> *>(f);
// delete foo;
// });
// return py::array_t<T>({vec->size()}, // shape
// {sizeof(T)}, // C-style contiguous strides for double
// vec->data(), // the data pointer
// free_when_done); // numpy array references this parent
// }
template <typename T> py::array return_vector(std::vector<T> *vec) {
py::capsule free_when_done(vec, [](void *f) {
std::vector<T> *foo = reinterpret_cast<std::vector<T> *>(f);
delete foo;
});
return py::array_t<T>({vec->size()}, // shape
{sizeof(T)}, // C-style contiguous strides for double
vec->data(), // the data pointer
free_when_done); // numpy array references this parent
}
// template <typename Reader> py::array do_read(Reader &r, size_t n_frames) {
// py::array image;
@ -62,54 +63,54 @@ namespace py = pybind11;
// return image;
// }
py::array return_frame(pl::Frame *ptr) {
py::capsule free_when_done(ptr, [](void *f) {
pl::Frame *foo = reinterpret_cast<pl::Frame *>(f);
delete foo;
});
// py::array return_frame(pl::Frame *ptr) {
// py::capsule free_when_done(ptr, [](void *f) {
// pl::Frame *foo = reinterpret_cast<pl::Frame *>(f);
// delete foo;
// });
const uint8_t item_size = ptr->bytes_per_pixel();
std::vector<ssize_t> shape;
for (auto val : ptr->shape())
if (val > 1)
shape.push_back(val);
// const uint8_t item_size = ptr->bytes_per_pixel();
// std::vector<ssize_t> shape;
// for (auto val : ptr->shape())
// if (val > 1)
// shape.push_back(val);
std::vector<ssize_t> strides;
if (shape.size() == 1)
strides.push_back(item_size);
else if (shape.size() == 2) {
strides.push_back(item_size * shape[1]);
strides.push_back(item_size);
}
// std::vector<ssize_t> strides;
// if (shape.size() == 1)
// strides.push_back(item_size);
// else if (shape.size() == 2) {
// strides.push_back(item_size * shape[1]);
// strides.push_back(item_size);
// }
if (item_size == 1)
return py::array_t<uint8_t>(
shape, strides,
reinterpret_cast<uint8_t *>(ptr->data()), free_when_done);
else if (item_size == 2)
return py::array_t<uint16_t>(shape, strides,
reinterpret_cast<uint16_t *>(ptr->data()),
free_when_done);
else if (item_size == 4)
return py::array_t<uint32_t>(shape, strides,
reinterpret_cast<uint32_t *>(ptr->data()),
free_when_done);
return {};
}
// if (item_size == 1)
// return py::array_t<uint8_t>(
// shape, strides,
// reinterpret_cast<uint8_t *>(ptr->data()), free_when_done);
// else if (item_size == 2)
// return py::array_t<uint16_t>(shape, strides,
// reinterpret_cast<uint16_t *>(ptr->data()),
// free_when_done);
// else if (item_size == 4)
// return py::array_t<uint32_t>(shape, strides,
// reinterpret_cast<uint32_t *>(ptr->data()),
// free_when_done);
// return {};
// }
// todo rewrite generic
template <class T, int Flags> auto get_shape_3d(py::array_t<T, Flags> arr) {
return pl::Shape<3>{arr.shape(0), arr.shape(1), arr.shape(2)};
return aare::Shape<3>{arr.shape(0), arr.shape(1), arr.shape(2)};
}
template <class T, int Flags> auto make_span_3d(py::array_t<T, Flags> arr) {
return pl::DataSpan<T, 3>(arr.mutable_data(), get_shape_3d<T, Flags>(arr));
template <class T, int Flags> auto make_view_3d(py::array_t<T, Flags> arr) {
return aare::NDView<T, 3>(arr.mutable_data(), get_shape_3d<T, Flags>(arr));
}
template <class T, int Flags> auto get_shape_2d(py::array_t<T, Flags> arr) {
return pl::Shape<2>{arr.shape(0), arr.shape(1)};
return aare::Shape<2>{arr.shape(0), arr.shape(1)};
}
template <class T, int Flags> auto make_span_2d(py::array_t<T, Flags> arr) {
return pl::DataSpan<T, 2>(arr.mutable_data(), get_shape_2d<T, Flags>(arr));
template <class T, int Flags> auto make_view_2d(py::array_t<T, Flags> arr) {
return aare::NDView<T, 2>(arr.mutable_data(), get_shape_2d<T, Flags>(arr));
}