detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-02-21 00:38:41 +01:00
Code Issues Actions Packages Releases Activity

solved merge conflict

Browse Source
This commit is contained in:
mazzol_a
2026-02-19 14:35:56 +01:00
parent b1e27fa033
commit f961ef6fee
5 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/PixelMap.cpp
View File

@@ -165,8 +165,8 @@ NDArray<ssize_t, 3> GenerateMH02FourCounterPixelMap() {
return order_map;
}
NDArray<ssize_t, 2> GenerateMatterhorn2PixelMap(const size_t dynamic_range,
const size_t n_counters) {
NDArray<ssize_t, 2> GenerateMatterhorn10PixelMap(const size_t dynamic_range,
const size_t n_counters) {
constexpr size_t n_cols = 256;
constexpr size_t n_rows = 256;
NDArray<ssize_t, 2> pixel_map(