diff options
| author | Thomas White <taw@physics.org> | 2011-09-06 12:00:40 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:37 +0100 |
| commit | dcd0a59fe7d3a1a2ae509ac19b35134afb3c3526 (patch) | |
| tree | 626146c17d8be782401986542673a97a5117f3af /src/hdf5-file.c | |
| parent | 4f9b4954e3596b51540237c93174502d86204fee (diff) | |
Add --hdf5-peaks parameter to indexamajig and assemble_detector
Conflicts:
contrib/assemble_detector.c
Diffstat (limited to 'src/hdf5-file.c')
| -rw-r--r-- | src/hdf5-file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/hdf5-file.c b/src/hdf5-file.c index 7d221387..b43297ec 100644 --- a/src/hdf5-file.c +++ b/src/hdf5-file.c @@ -89,7 +89,7 @@ int hdfile_set_image(struct hdfile *f, const char *path) } -int get_peaks(struct image *image, struct hdfile *f) +int get_peaks(struct image *image, struct hdfile *f, const char *p) { hid_t dh, sh; hsize_t size[2]; @@ -99,12 +99,9 @@ int get_peaks(struct image *image, struct hdfile *f) herr_t r; int tw; - dh = H5Dopen2(f->fh, "/processing/hitfinder/peakinfo", H5P_DEFAULT); - - if ( dh < 0 ) dh = H5Dopen2(f->fh, "/data/peakinfo", H5P_DEFAULT); - + dh = H5Dopen2(f->fh, p, H5P_DEFAULT); if ( dh < 0 ) { - ERROR("No peak list found!\n"); + ERROR("Peak list (%s) not found.\n", p); return 1; } |