diff options
| author | Thomas White <taw@physics.org> | 2020-07-10 15:30:51 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:45 +0200 |
| commit | 30973775e4bddba8ceebf4b93f58440cbb520617 (patch) | |
| tree | bf11a7762e8d14e24d551e550243b8233147c005 /libcrystfel/src/image.c | |
| parent | 47ecc15f4f32350bb29085459e23f208007e3d1c (diff) | |
stream_read_chunk: Add option to load image data
Diffstat (limited to 'libcrystfel/src/image.c')
| -rw-r--r-- | libcrystfel/src/image.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 2b6f5b16..52a7f5f5 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -538,6 +538,27 @@ int image_set_zero_mask(struct image *image, } +int image_read_image_data(struct image *image, + const DataTemplate *dtempl, + const char *filename, + const char *event) +{ + if ( is_hdf5_file(filename) ) { + return image_hdf5_read(image, dtempl, filename, event); + + } else if ( is_cbf_file(filename) ) { + return image_cbf_read(image, dtempl, filename, event, 0); + + } else if ( is_cbfgz_file(filename) ) { + return image_cbf_read(image, dtempl, filename, event, 1); + + } + + ERROR("Unrecognised file type: %s\n", filename); + return 1; +} + + struct image *image_read(DataTemplate *dtempl, const char *filename, const char *event, @@ -561,19 +582,8 @@ struct image *image_read(DataTemplate *dtempl, if ( !no_image_data ) { - if ( is_hdf5_file(filename) ) { - r = image_hdf5_read(image, dtempl, filename, event); - - } else if ( is_cbf_file(filename) ) { - r = image_cbf_read(image, dtempl, filename, event, 0); - - } else if ( is_cbfgz_file(filename) ) { - r = image_cbf_read(image, dtempl, filename, event, 1); - - } else { - ERROR("Unrecognised file type: %s\n", filename); - r = 1; - } + r = image_read_image_data(image, dtempl, + filename, event); } else { |