mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 54 Wiki Activity

DetectorGeometry: Fix module slow direction if horizontal stacking > module number

Browse Source
This commit is contained in:
leonarski_f
2023-07-04 11:25:19 +02:00
parent 8a203b7cf5
commit 9d35660cf4
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/DetectorGeometry.cpp
+2
View File
@@ -29,6 +29,8 @@ DetectorGeometry::DetectorGeometry(int32_t nmodules, int32_t horizontal_stacking
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Gap x has to be non-negative");
if (gap_y < 0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Gap y has to be non-negative");
if (nmodules < horizontal_stacking)
horizontal_stacking = nmodules;
width = horizontal_stacking * CONVERTED_MODULE_COLS + (horizontal_stacking - 1) * gap_x;
int64_t conv_lines = nmodules / horizontal_stacking + (nmodules % horizontal_stacking > 0 ? 1 : 0);
tests/DetectorGeometryTest.cpp
+14
View File
@@ -20,6 +20,20 @@ TEST_CASE("DetectorGeometry_Regular", "[DetectorGeometry]") {
REQUIRE(pbuf.module_geometry(15).slow_direction_step() == pbuf.width_pxl());
}
TEST_CASE("DetectorGeometry_Regular_1Module", "[DetectorGeometry]") {
DetectorGeometry geometry(1, 3, 8, 36, false);
const JFJochProtoBuf::DetectorGeometry pbuf = geometry;
REQUIRE(pbuf.module_geometry_size() == 1);
REQUIRE(pbuf.width_pxl() == CONVERTED_MODULE_COLS);
REQUIRE(pbuf.height_pxl() == CONVERTED_MODULE_LINES);
REQUIRE(pbuf.module_geometry(0).pixel0() == 0);
REQUIRE(pbuf.module_geometry(0).fast_direction_step() == 1);
REQUIRE(pbuf.module_geometry(0).slow_direction_step() == CONVERTED_MODULE_COLS);
}
TEST_CASE("DetectorGeometry_RegularMirror", "[DetectorGeometry]") {
DetectorGeometry geometry(18, 3, 8, 36, true);