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

rename to NDView

Browse Source
This commit is contained in:
Bechir 2024-03-21 16:07:02 +01:00
parent e42cb6e8ff
commit 2d5b28d500
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/include/aare/Frame.hpp
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "aare/View.hpp" #include "aare/NDView.hpp"
#include "aare/defs.hpp" #include "aare/defs.hpp"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@ -40,10 +40,10 @@ class Frame {
} }
template <typename T> template <typename T>
View<T> view() { NDView<T> view() {
std::vector<ssize_t> shape = {m_rows, m_cols}; std::vector<ssize_t> shape = {m_rows, m_cols};
T* data = reinterpret_cast<T *>(m_data); T* data = reinterpret_cast<T *>(m_data);
return View<T>(data, shape); return NDView<T>(data, shape);
} }
~Frame() { delete[] m_data; } ~Frame() { delete[] m_data; }

32
core/include/aare/View.hpp → core/include/aare/NDView.hpp
View File

@ -30,18 +30,18 @@ template <ssize_t Ndim> std::array<ssize_t, Ndim> make_array(const std::vector<s
return arr; return arr;
} }
template <typename T, ssize_t Ndim=2> class View { template <typename T, ssize_t Ndim=2> class NDView {
public: public:
View(){}; NDView(){};
View(T* buffer, std::array<ssize_t, Ndim> shape) { NDView(T* buffer, std::array<ssize_t, Ndim> shape) {
buffer_ = buffer; buffer_ = buffer;
strides_ = c_strides<Ndim>(shape); strides_ = c_strides<Ndim>(shape);
shape_ = shape; shape_ = shape;
size_ = std::accumulate(std::begin(shape), std::end(shape), 1, std::multiplies<ssize_t>()); size_ = std::accumulate(std::begin(shape), std::end(shape), 1, std::multiplies<ssize_t>());
} }
View(T *buffer, const std::vector<ssize_t> &shape) { NDView(T *buffer, const std::vector<ssize_t> &shape) {
buffer_ = buffer; buffer_ = buffer;
strides_ = c_strides<Ndim>(make_array<Ndim>(shape)); strides_ = c_strides<Ndim>(make_array<Ndim>(shape));
shape_ = make_array<Ndim>(shape); shape_ = make_array<Ndim>(shape);
@ -59,28 +59,28 @@ template <typename T, ssize_t Ndim=2> class View {
ssize_t size() const { return size_; } ssize_t size() const { return size_; }
View(const View &) = default; NDView(const NDView &) = default;
View(View &&) = default; NDView(NDView &&) = default;
T *begin() { return buffer_; } T *begin() { return buffer_; }
T *end() { return buffer_ + size_; } T *end() { return buffer_ + size_; }
T &operator()(ssize_t i) { return buffer_[i]; } T &operator()(ssize_t i) { return buffer_[i]; }
T &operator[](ssize_t i) { return buffer_[i]; } T &operator[](ssize_t i) { return buffer_[i]; }
View &operator+=(const T val) { return elemenwise(val, std::plus<T>()); } NDView &operator+=(const T val) { return elemenwise(val, std::plus<T>()); }
View &operator-=(const T val) { return elemenwise(val, std::minus<T>()); } NDView &operator-=(const T val) { return elemenwise(val, std::minus<T>()); }
View &operator*=(const T val) { return elemenwise(val, std::multiplies<T>()); } NDView &operator*=(const T val) { return elemenwise(val, std::multiplies<T>()); }
View &operator/=(const T val) { return elemenwise(val, std::divides<T>()); } NDView &operator/=(const T val) { return elemenwise(val, std::divides<T>()); }
View &operator/=(const View &other) { return elemenwise(other, std::divides<T>()); } NDView &operator/=(const NDView &other) { return elemenwise(other, std::divides<T>()); }
View &operator=(const T val) { NDView &operator=(const T val) {
for (auto it = begin(); it != end(); ++it) for (auto it = begin(); it != end(); ++it)
*it = val; *it = val;
return *this; return *this;
} }
View &operator=(const View &other) { NDView &operator=(const NDView &other) {
shape_ = other.shape_; shape_ = other.shape_;
strides_ = other.strides_; strides_ = other.strides_;
size_ = other.size_; size_ = other.size_;
@ -98,13 +98,13 @@ template <typename T, ssize_t Ndim=2> class View {
std::array<ssize_t, Ndim> shape_{}; std::array<ssize_t, Ndim> shape_{};
ssize_t size_{}; ssize_t size_{};
template <class BinaryOperation> View &elemenwise(T val, BinaryOperation op) { template <class BinaryOperation> NDView &elemenwise(T val, BinaryOperation op) {
for (ssize_t i = 0; i != size_; ++i) { for (ssize_t i = 0; i != size_; ++i) {
buffer_[i] = op(buffer_[i], val); buffer_[i] = op(buffer_[i], val);
} }
return *this; return *this;
} }
template <class BinaryOperation> View &elemenwise(const View &other, BinaryOperation op) { template <class BinaryOperation> NDView &elemenwise(const NDView &other, BinaryOperation op) {
for (ssize_t i = 0; i != size_; ++i) { for (ssize_t i = 0; i != size_; ++i) {
buffer_[i] = op(buffer_[i], other.buffer_[i]); buffer_[i] = op(buffer_[i], other.buffer_[i]);
} }
@ -112,5 +112,5 @@ template <typename T, ssize_t Ndim=2> class View {
} }
}; };
template class View<uint16_t, 2>; template class NDView<uint16_t, 2>;

18
core/include/aare/VariableSizeClusterFinder.hpp
View File

@ -30,12 +30,12 @@ template <typename T> class ClusterFinder {
private: private:
const std::array<ssize_t, 2> shape_; const std::array<ssize_t, 2> shape_;
View<T, 2> original_; NDView<T, 2> original_;
ImageData<int, 2> labeled_; ImageData<int, 2> labeled_;
ImageData<int, 2> peripheral_labeled_; ImageData<int, 2> peripheral_labeled_;
ImageData<bool, 2> binary_; // over threshold flag ImageData<bool, 2> binary_; // over threshold flag
T threshold_; T threshold_;
View<T, 2> noiseMap; NDView<T, 2> noiseMap;
bool use_noise_map = false; bool use_noise_map = false;
int peripheralThresholdFactor_ = 5; int peripheralThresholdFactor_ = 5;
int current_label; int current_label;
@ -58,12 +58,12 @@ template <typename T> class ClusterFinder {
ImageData<int, 2> labeled() { return labeled_; } ImageData<int, 2> labeled() { return labeled_; }
void set_noiseMap(View<T, 2> noise_map) { noiseMap = noise_map; use_noise_map = true; } void set_noiseMap(NDView<T, 2> noise_map) { noiseMap = noise_map; use_noise_map = true; }
void set_peripheralThresholdFactor(int factor) { peripheralThresholdFactor_ = factor; } void set_peripheralThresholdFactor(int factor) { peripheralThresholdFactor_ = factor; }
void find_clusters(View<T, 2> img); void find_clusters(NDView<T, 2> img);
void find_clusters_X(View<T, 2> img); void find_clusters_X(NDView<T, 2> img);
void rec_FillHit(int clusterIndex, int i, int j); void rec_FillHit(int clusterIndex, int i, int j);
void single_pass(View<T, 2> img); void single_pass(NDView<T, 2> img);
void first_pass(); void first_pass();
void second_pass(); void second_pass();
void store_clusters(); void store_clusters();
@ -144,7 +144,7 @@ template <typename T> int ClusterFinder<T>::check_neighbours(int i, int j) {
} }
} }
template <typename T> void ClusterFinder<T>::find_clusters(View<T, 2> img) { template <typename T> void ClusterFinder<T>::find_clusters(NDView<T, 2> img) {
original_ = img; original_ = img;
labeled_ = 0; labeled_ = 0;
peripheral_labeled_ = 0; peripheral_labeled_ = 0;
@ -156,7 +156,7 @@ template <typename T> void ClusterFinder<T>::find_clusters(View<T, 2> img) {
store_clusters(); store_clusters();
} }
template <typename T> void ClusterFinder<T>::find_clusters_X(View<T, 2> img) { template <typename T> void ClusterFinder<T>::find_clusters_X(NDView<T, 2> img) {
original_ = img; original_ = img;
int clusterIndex = 0; int clusterIndex = 0;
for (int i = 0; i < shape_[0]; ++i) { for (int i = 0; i < shape_[0]; ++i) {
@ -214,7 +214,7 @@ template <typename T> void ClusterFinder<T>::rec_FillHit(int clusterIndex, int i
} }
} }
template <typename T> void ClusterFinder<T>::single_pass(View<T, 2> img) { template <typename T> void ClusterFinder<T>::single_pass(NDView<T, 2> img) {
original_ = img; original_ = img;
labeled_ = 0; labeled_ = 0;
current_label = 0; current_label = 0;

8
core/test/wrappers.test.cpp
View File

@ -1,4 +1,4 @@
#include <aare/View.hpp> #include <aare/NDView.hpp>
#include <aare/Frame.hpp> #include <aare/Frame.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <cstdint> #include <cstdint>
@ -22,20 +22,20 @@ TEST_CASE("Frame") {
delete[] data; delete[] data;
} }
TEST_CASE("View") { TEST_CASE("NDView") {
auto data = new uint16_t[100]; auto data = new uint16_t[100];
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
data[i] = i; data[i] = i;
} }
SECTION("constructors") { SECTION("constructors") {
View<uint16_t, 2> ds(data, std::vector<ssize_t>({10, 10})); NDView<uint16_t, 2> ds(data, std::vector<ssize_t>({10, 10}));
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
REQUIRE(ds(i / 10, i % 10) == data[i]); REQUIRE(ds(i / 10, i % 10) == data[i]);
} }
} }
SECTION("from Frame") { SECTION("from Frame") {
Frame f(reinterpret_cast<std::byte *>(data), 10, 10, 16); Frame f(reinterpret_cast<std::byte *>(data), 10, 10, 16);
View<uint16_t> ds = f.view<uint16_t>(); NDView<uint16_t> ds = f.view<uint16_t>();
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
REQUIRE(ds(i / 10, i % 10) == data[i]); REQUIRE(ds(i / 10, i % 10) == data[i]);
} }