aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/hdf5-file.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-03-31 16:27:13 +0200
committerThomas White <taw@physics.org>2017-03-31 16:30:13 +0200
commit3746b4dbed15569764ec6de473806468951748b8 (patch)
tree6539282693783345105809166fa58fc9b25cb943 /libcrystfel/src/hdf5-file.h
parent10fd97e6f88bd4d28ffc2bff56aa5ff19ca436ae (diff)
Offset peak locations from HDF5 or CXI files by 0.5,0.5
CrystFEL considers all peak locations to be distances from the corner of the detector panel, in pixel units, consistent with its description of detector geometry. In contrast, Cheetah considers the peak locations to be pixel indices in the data array. Therefore, a half-pixel offset is needed when importing the peak lists. For users who need the old behaviour, this commit adds a new option indexamajig --no-half-pixel-shift to deactivate this offset.
Diffstat (limited to 'libcrystfel/src/hdf5-file.h')
-rw-r--r--libcrystfel/src/hdf5-file.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/libcrystfel/src/hdf5-file.h b/libcrystfel/src/hdf5-file.h
index 8c89eb93..f22d4d54 100644
--- a/libcrystfel/src/hdf5-file.h
+++ b/libcrystfel/src/hdf5-file.h
@@ -3,11 +3,11 @@
*
* Read/write HDF5 data files
*
- * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2009-2015 Thomas White <taw@physics.org>
+ * 2009-2017 Thomas White <taw@physics.org>
* 2014 Valerio Mariani
*
@@ -78,9 +78,16 @@ extern void hdfile_close(struct hdfile *f);
extern int get_peaks(struct image *image, struct hdfile *f, const char *p);
+extern int get_peaks_2(struct image *image, struct hdfile *f, const char *p,
+ int half_pixel_shift);
+
extern int get_peaks_cxi(struct image *image, struct hdfile *f, const char *p,
struct filename_plus_event *fpe);
+extern int get_peaks_cxi_2(struct image *image, struct hdfile *f, const char *p,
+ struct filename_plus_event *fpe,
+ int half_pixel_shift);
+
extern struct copy_hdf5_field *new_copy_hdf5_field_list(void);
extern void free_copy_hdf5_field_list(struct copy_hdf5_field *f);