From d7addfba3e323ca5169166ac0c36ffcaef920e49 Mon Sep 17 00:00:00 2001 From: vhinger Date: Mon, 24 Aug 2026 18:30:29 +0200 Subject: [PATCH] Make gap_rows size_t --- include/aare/StrixelPixelRemapConfig.hpp | 2 +- include/aare/StrixelPixelRemapGenerate.hpp | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/aare/StrixelPixelRemapConfig.hpp b/include/aare/StrixelPixelRemapConfig.hpp index c1cbe7c1..1a43ab59 100644 --- a/include/aare/StrixelPixelRemapConfig.hpp +++ b/include/aare/StrixelPixelRemapConfig.hpp @@ -144,7 +144,7 @@ inline const defs::SensorConfig SingleChipMP_TEW{ inline constexpr defs::SensorPixelGeometry Quad_iLGAD_pix{512, 512, {9, 9}}; // .num_pix_x = 512, .num_pix_y = 512, .guardring = {.x = 9, .y = 9}}; -inline constexpr int Quad_iLGAD_strixel_gap_rows = 12; +inline constexpr size_t Quad_iLGAD_strixel_gap_rows = 12; inline constexpr defs::GroupConfig Quad_iLGAD_bottomhalf{ StrxP25, //.strixel diff --git a/include/aare/StrixelPixelRemapGenerate.hpp b/include/aare/StrixelPixelRemapGenerate.hpp index 5b8d9744..02ee42bd 100644 --- a/include/aare/StrixelPixelRemapGenerate.hpp +++ b/include/aare/StrixelPixelRemapGenerate.hpp @@ -37,16 +37,12 @@ namespace detail { * * @return Combined strixel-to-pixel map. * - * @throws std::invalid_argument if gap_rows is negative. * @throws std::logic_error if group maps have different widths. */ defs::StrixelGroupToPixelMap combine_group_maps(defs::StrixelGroupToPixelMap const &first, - defs::StrixelGroupToPixelMap const &second, int gap_rows) { - - if (gap_rows < 0) { - throw std::invalid_argument("gap_rows must be non-negative"); - } + defs::StrixelGroupToPixelMap const &second, + size_t gap_rows) { const ssize_t ncols = first.map.shape(1); @@ -91,7 +87,7 @@ combine_group_maps(defs::StrixelGroupToPixelMap const &first, copy_map(first, first_row); copy_map(second, second_row); - // Physical pixel ROI covered by both groups. + // Bounding pixel ROI covered by the combined groups. InclusiveROI effective_roi = first.effective_roi; effective_roi.xmin =