diff options
| author | Thomas White <taw@physics.org> | 2020-05-15 17:06:41 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:42:57 +0200 |
| commit | fe3263953cd65371062ce8fd382ee2257de977f2 (patch) | |
| tree | e2529360d1730dc316eae89d9ddd8c0b69702f44 /libcrystfel | |
| parent | 5f434be3c57e341b2c2a27622462f7c90646e91c (diff) | |
Pass HDF5 path down to load_hdf5_hyperslab()
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/image.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 4bee2683..85f41467 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -1360,7 +1360,8 @@ static int load_hdf5_hyperslab(struct panel_template *p, const char *event, void **pdata, hid_t el_type, size_t el_size, - int skip_placeholders_ok) + int skip_placeholders_ok, + const char *path_spec) { struct event *ev; hid_t fh; @@ -1395,7 +1396,7 @@ static int load_hdf5_hyperslab(struct panel_template *p, return 1; } - panel_full_path = retrieve_full_path(ev, p->data); + panel_full_path = retrieve_full_path(ev, path_spec); if ( !check_path_existence(fh, panel_full_path) ) { ERROR("Cannot find data for panel %s (%s)\n", @@ -1552,7 +1553,8 @@ static struct image *image_read_hdf5(DataTemplate *dtempl, if ( load_hdf5_hyperslab(&dtempl->panels[i], filename, event, (void *)&image->dp[i], H5T_NATIVE_FLOAT, - sizeof(float), 0) ) + sizeof(float), 0, + dtempl->panels[i].data) ) { ERROR("Failed to load panel data\n"); image_free(image); @@ -1591,7 +1593,7 @@ static int load_mask_hdf5(struct panel_template *p, if ( load_hdf5_hyperslab(p, filename, event, (void *)&mask, H5T_NATIVE_INT, - sizeof(int), 1) ) + sizeof(int), 1, p->mask) ) { ERROR("Failed to load mask data\n"); free(mask); |