mirror of
https://github.com/slsdetectorgroup/aare.git
synced 2026-09-02 22:20:43 +02:00
Make gap_rows size_t
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user