diff options
| author | Thomas White <taw@physics.org> | 2015-02-16 10:56:45 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-02-16 15:15:31 +0100 |
| commit | 3fcc518b7efc9fb4e2e6fe95c0bdbf2d1bab035b (patch) | |
| tree | b0ef3148bdb516684c3b2a6bc6cee15539965370 /src/process_image.c | |
| parent | 463c7cc933e9928fa825507f1a122a5a8dc013f4 (diff) | |
indexamajig: --peaks=cxi instead of --peaks=hdf5 --cxi-hdf5-peaks
Diffstat (limited to 'src/process_image.c')
| -rw-r--r-- | src/process_image.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/process_image.c b/src/process_image.c index d5133a0c..847cc9f4 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -225,10 +225,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, switch ( iargs->peaks ) { case PEAK_HDF5: - /* Get peaks from HDF5 */ - - if ( get_peaks(&image, hdfile, iargs->hdf5_peak_path, - iargs->cxi_hdf5_peaks, pargs->filename_p_e) ) { + if ( get_peaks(&image, hdfile, iargs->hdf5_peak_path) ) { ERROR("Failed to get peaks from HDF5 file.\n"); } if ( !iargs->no_revalidate ) { @@ -239,6 +236,19 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, } break; + case PEAK_CXI: + if ( get_peaks_cxi(&image, hdfile, iargs->hdf5_peak_path, + pargs->filename_p_e) ) { + ERROR("Failed to get peaks from CXI file.\n"); + } + if ( !iargs->no_revalidate ) { + validate_peaks(&image, iargs->min_snr, + iargs->pk_inn, iargs->pk_mid, + iargs->pk_out, iargs->use_saturated, + iargs->check_hdf5_snr); + } + break; + case PEAK_ZAEF: search_peaks(&image, iargs->threshold, iargs->min_gradient, iargs->min_snr, |