From dad7c029fdfc1d0a475a86a01ecb02d2adc16dc2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 8 Mar 2022 15:18:27 +0100 Subject: Fix slabbiness assumptions This adds a new routine, data_template_slabby_file_to_panel_coords, to be used (only!) in places where external forces require assumptions of slabbiness: pixel maps and MsgPack/HDF5 peak lists (including CXI-style). This also fixes the prototype of data_template_file_to_panel_coords to make the panel number strictly an input parameter. This was an oversight in the implementation of DataTemplate, and caused problems when reading non-slabby streams. Fixes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/66 --- src/make_pixelmap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/make_pixelmap.c') diff --git a/src/make_pixelmap.c b/src/make_pixelmap.c index 903f17e2..5f590bfa 100644 --- a/src/make_pixelmap.c +++ b/src/make_pixelmap.c @@ -310,9 +310,8 @@ int main(int argc, char *argv[]) cfs = fs + 0.5; css = ss + 0.5; - if ( data_template_file_to_panel_coords(dtempl, - &cfs, &css, - &pn) ) + if ( data_template_slabby_file_to_panel_coords(dtempl, + &cfs, &css, &pn) ) { ERROR("Couldn't convert coordinates\n"); return 1; -- cgit v1.2.3