From decf9d47416281c322def480a624bfabb0af7012 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 23 Jul 2015 20:02:14 +0200 Subject: indexamajig: Peak detection method must be parsed before checking peak path --- src/indexamajig.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/indexamajig.c b/src/indexamajig.c index 0d528d39..65b86b07 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -493,17 +493,9 @@ int main(int argc, char *argv[]) return 1; } - /* Defaults */ if ( tempdir == NULL ) { tempdir = strdup("."); } - if ( iargs.hdf5_peak_path == NULL ) { - if ( iargs.peaks == PEAK_HDF5 ) { - iargs.hdf5_peak_path = strdup("/processing/hitfinder/peakinfo"); - } else if ( iargs.peaks == PEAK_CXI ) { - iargs.hdf5_peak_path = strdup("/entry_1/result_1"); - } - } /* Open input */ if ( strcmp(filename, "-") == 0 ) { @@ -534,6 +526,13 @@ int main(int argc, char *argv[]) return 1; } free(speaks); + if ( iargs.hdf5_peak_path == NULL ) { + if ( iargs.peaks == PEAK_HDF5 ) { + iargs.hdf5_peak_path = strdup("/processing/hitfinder/peakinfo"); + } else if ( iargs.peaks == PEAK_CXI ) { + iargs.hdf5_peak_path = strdup("/entry_1/result_1"); + } + } /* Check prefix (if given) */ if ( prefix == NULL ) { -- cgit v1.2.3