diff options
| author | Thomas White <taw@physics.org> | 2022-03-08 15:18:27 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-03-08 17:41:52 +0100 |
| commit | dad7c029fdfc1d0a475a86a01ecb02d2adc16dc2 (patch) | |
| tree | 2e79bb418309fd9c6cd75484678fa01b374f1658 /libcrystfel/src/datatemplate.h | |
| parent | 0b758e3ae3c3fd66c75a42740a80afbabba5c82f (diff) | |
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
Diffstat (limited to 'libcrystfel/src/datatemplate.h')
| -rw-r--r-- | libcrystfel/src/datatemplate.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcrystfel/src/datatemplate.h b/libcrystfel/src/datatemplate.h index 3d457f80..28cabcf5 100644 --- a/libcrystfel/src/datatemplate.h +++ b/libcrystfel/src/datatemplate.h @@ -76,7 +76,11 @@ extern int data_template_panel_name_to_number(const DataTemplate *dt, extern int data_template_file_to_panel_coords(const DataTemplate *dt, float *pfs, float *pss, - int *pn); + int pn); + +extern int data_template_slabby_file_to_panel_coords(const DataTemplate *dt, + float *pfs, float *pss, + int *ppn); extern int data_template_panel_to_file_coords(const DataTemplate *dt, int pn, |