diff options
| author | Thomas White <taw@physics.org> | 2015-07-23 20:02:14 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-07-23 20:02:14 +0200 |
| commit | decf9d47416281c322def480a624bfabb0af7012 (patch) | |
| tree | 27795b86dbafbef7add428e8a0dd719ff5d15077 /src | |
| parent | cc6ea7ee6804abd10d7739424f93c889db33fc3c (diff) | |
indexamajig: Peak detection method must be parsed before checking peak path
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 15 |
1 files 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 ) { |