diff options
| author | Thomas White <taw@physics.org> | 2018-05-24 10:32:43 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-05-24 15:21:18 +0200 |
| commit | d3f9ed0a184bea13ba36c4291b593ecd7a91fc14 (patch) | |
| tree | 57f8aca2c7889078fa3ddd73d298614977f85d10 | |
| parent | fce9cd58362d09366c8a1c474017ef3e63f0b3aa (diff) | |
Generalise peakfinder9 error messages, and fail if not compiled in
| -rw-r--r-- | libcrystfel/src/peaks.c | 2 | ||||
| -rw-r--r-- | src/process_image.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index 14371271..1ec4ae59 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -665,7 +665,7 @@ int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, int window_radius) { ERROR("This copy of CrystFEL was compiled without peakfinder9 support.\n"); - return 0; + return 1; } #endif // HAVE_FDIP diff --git a/src/process_image.c b/src/process_image.c index b4b2eb70..57f40142 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -232,8 +232,14 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, iargs->min_peak_over_neighbour, iargs->window_radius) ) { - ERROR("Couldn't get enough memory to perform " - "peakFinder9.\n"); + if ( image.event != NULL ) { + ERROR("Failed to find peaks in image %s" + "(event %s).\n", image.filename, + get_event_string(image.event)); + } else { + ERROR("Failed to find peaks in image %s.", + image.filename); + } } break; |