diff options
| author | Thomas White <taw@physics.org> | 2020-05-25 15:01:58 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:42:57 +0200 |
| commit | aab8403884c4731f7365796de8f53315f4a61616 (patch) | |
| tree | 6a7bc45b52c7943220c71de07caba9c681b2567d /libcrystfel/src/image.h | |
| parent | 23ea67dc03ac19f7a1457ecfdc8d5ee9cac68632 (diff) | |
Get rid of imagefile_field_list and stuff_from_stream
The only place this is used is in geoptimiser, to get the
average_camera_length, itself a very bad solution.
Diffstat (limited to 'libcrystfel/src/image.h')
| -rw-r--r-- | libcrystfel/src/image.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h index 90cb823d..1ea0bc35 100644 --- a/libcrystfel/src/image.h +++ b/libcrystfel/src/image.h @@ -44,8 +44,6 @@ struct detector; struct imagefeature; struct sample; struct image; -struct imagefile; -struct imagefile_field_list; #include "utils.h" #include "cell.h" @@ -155,11 +153,8 @@ struct image char *ev; /** @} */ - /** A list of image file headers to copy to the stream */ - const struct imagefile_field_list *copyme; - /** A list of metadata read from the stream */ - struct stuff_from_stream *stuff_from_stream; + char *copied_headers; /** Mean of the camera length values for all panels */ double avg_clen; @@ -235,9 +230,6 @@ extern int imagefile_read(struct imagefile *f, struct image *image, extern int imagefile_read_simple(struct imagefile *f, struct image *image); extern struct hdfile *imagefile_get_hdfile(struct imagefile *f); extern enum imagefile_type imagefile_get_type(struct imagefile *f); -extern void imagefile_copy_fields(struct imagefile *f, - const struct imagefile_field_list *copyme, - FILE *fh, struct event *ev); extern void imagefile_close(struct imagefile *f); extern signed int is_cbf_file(const char *filename); @@ -256,13 +248,6 @@ extern ImageFeatureList *image_read_peaks(const DataTemplate *dtempl, extern struct event_list *image_expand_frames(const DataTemplate *dtempl, const char *filename); -/* Field lists */ -extern struct imagefile_field_list *new_imagefile_field_list(void); -extern void free_imagefile_field_list(struct imagefile_field_list *f); - -extern void add_imagefile_field(struct imagefile_field_list *copyme, - const char *name); - #ifdef __cplusplus } #endif |