diff options
author | Thomas White <taw@physics.org> | 2022-04-29 16:13:10 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2022-05-03 12:45:34 +0200 |
commit | cdb51dbec109ccde45c8a4ceb29ea925d01e2920 (patch) | |
tree | 050c15bce49627dba7bb2a04e1df43ba72a6f002 /libcrystfel/src/image.c | |
parent | 9ddf2feeffd29bf6bff376413832cd35e5cb3594 (diff) |
Strip out time-accounts
Diffstat (limited to 'libcrystfel/src/image.c')
-rw-r--r-- | libcrystfel/src/image.c | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 7b86588d..7ad8d428 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -42,7 +42,6 @@ #include "image-hdf5.h" #include "image-cbf.h" #include "image-msgpack.h" -#include "time-accounts.h" #include "datatemplate.h" #include "datatemplate_priv.h" @@ -1287,35 +1286,28 @@ struct image *image_create_for_simulation(const DataTemplate *dtempl) static int do_image_read(struct image *image, const DataTemplate *dtempl, - int no_image_data, int no_mask_data, - TimeAccounts *taccs) + int no_image_data, int no_mask_data) { int i; /* Load the image data */ - time_accounts_set(taccs, TACC_IMAGE_DATA); if ( !no_image_data ) { if ( image_read_image_data(image, dtempl) ) return 1; } else { if ( image_set_zero_data(image, dtempl) ) return 1; } - time_accounts_set(taccs, TACC_IMAGE_PARAMS); if ( set_image_parameters(image, dtempl) ) { ERROR("Failed to read image parameters\n"); return 1; } - time_accounts_set(taccs, TACC_CREATE_DETGEOM); if ( create_detgeom(image, dtempl) ) { ERROR("Failed to read geometry information\n"); return 1; } - time_accounts_set(taccs, TACC_CREATE_BADMAP); if ( create_badmap(image, dtempl, no_mask_data) ) return 1; - time_accounts_set(taccs, TACC_CREATE_SATMAP); if ( create_satmap(image, dtempl) ) return 1; - time_accounts_set(taccs, TACC_CACHE_HEADERS); for ( i=0; i<dtempl->n_headers_to_copy; i++ ) { read_header_to_cache(image, dtempl->headers_to_copy[i]); } @@ -1324,12 +1316,11 @@ static int do_image_read(struct image *image, const DataTemplate *dtempl, } -struct image *image_read_with_time_accounting(const DataTemplate *dtempl, - const char *filename, - const char *event, - int no_image_data, - int no_mask_data, - TimeAccounts *taccs) +struct image *image_read(const DataTemplate *dtempl, + const char *filename, + const char *event, + int no_image_data, + int no_mask_data) { struct image *image; @@ -1355,7 +1346,7 @@ struct image *image_read_with_time_accounting(const DataTemplate *dtempl, image->data_source_type = file_type(image->filename); - if ( do_image_read(image, dtempl, no_image_data, no_mask_data, taccs) ) { + if ( do_image_read(image, dtempl, no_image_data, no_mask_data) ) { image_free(image); return NULL; } @@ -1364,26 +1355,13 @@ struct image *image_read_with_time_accounting(const DataTemplate *dtempl, } -struct image *image_read(const DataTemplate *dtempl, - const char *filename, - const char *event, - int no_image_data, - int no_mask_data) -{ - return image_read_with_time_accounting(dtempl, filename, event, - no_image_data, no_mask_data, - NULL); -} - - struct image *image_read_data_block(const DataTemplate *dtempl, void *data_block, size_t data_block_size, DataSourceType type, int serial, int no_image_data, - int no_mask_data, - TimeAccounts *taccs) + int no_mask_data) { struct image *image; char tmp[64]; @@ -1407,7 +1385,7 @@ struct image *image_read_data_block(const DataTemplate *dtempl, image->data_source_type = type; - if ( do_image_read(image, dtempl, no_image_data, no_mask_data, taccs) ) { + if ( do_image_read(image, dtempl, no_image_data, no_mask_data) ) { image_free(image); ERROR("Failed to load image\n"); return NULL; |