detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-27 21:51:09 +02:00
Code Issues Actions Packages Releases Activity

fixed quad structure
All checks were successful
Build on RHEL9 / build (push) Successful in 2m50s
Details
Build on RHEL8 / build (push) Successful in 3m2s
Details

Browse Source
This commit is contained in:
mazzol_a
2025-06-23 17:26:59 +02:00
parent 318e640639
commit 664055de92
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/DetectorGeometry.cpp
View File

@ -23,13 +23,12 @@ DetectorGeometry::DetectorGeometry(const xy &geometry,
for (size_t port_col = 0; for (size_t port_col = 0;
port_col < udp_interfaces_per_module.col; ++port_col) { port_col < udp_interfaces_per_module.col; ++port_col) {
ModuleGeometry g; ModuleGeometry g;
g.origin_x = (col + port_col) * module_pixels_x;
g.origin_y = (row + port_row) *
module_pixels_y; // TODO: quad doesnt seem
// to have an effect
g.row_index = g.row_index =
quad ? (row + port_row + 1) % 2 : (row + port_row); quad ? (row + port_row + 1) % 2 : (row + port_row);
g.col_index = col + port_col; g.col_index = col + port_col;
g.origin_x = g.col_index * module_pixels_x;
g.origin_y = g.row_index * module_pixels_y;
g.width = module_pixels_x; g.width = module_pixels_x;
g.height = module_pixels_y; g.height = module_pixels_y;
module_geometries.push_back(g); module_geometries.push_back(g);

5
src/RawFile.test.cpp
View File

@ -202,9 +202,8 @@ TEST_CASE("check find_geometry", "[.integration][.files][.rawfile]") {
"raw/eiger_quad_data/" "raw/eiger_quad_data/"
"W13_vthreshscan_m21C_300V_800eV_vrpre3400_master_0.json", "W13_vthreshscan_m21C_300V_800eV_vrpre3400_master_0.json",
2, 1, 2, 512, 512, 2, 1, 2, 512, 512,
std::vector<ModuleGeometry>{ std::vector<ModuleGeometry>{ModuleGeometry{0, 256, 256, 512, 1, 0},
ModuleGeometry{0, 0, 256, 512, 0, 0}, ModuleGeometry{0, 0, 256, 512, 0, 0}}});
ModuleGeometry{0, 256, 256, 512, 1, 0}}});
auto fpath = test_data_path() / test_parameters.master_filename; auto fpath = test_data_path() / test_parameters.master_filename;