From a65abec0fce191e473037a0043e62bdaf6ff8b37 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jun 2022 10:20:52 +0200 Subject: indexamajig: Put MsgPack peaks through validation procedure, like HDF5 --- src/indexamajig.c | 6 +++--- src/process_image.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indexamajig.c b/src/indexamajig.c index 81fb78ae..fc22a562 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -970,11 +970,11 @@ int main(int argc, char *argv[]) "highest pixel and neighbours (peakfinder9 only, just for speed)"}, {"no-use-saturated", 318, NULL, OPTION_NO_USAGE, "Reject saturated peaks"}, {"no-revalidate", 319, NULL, OPTION_NO_USAGE, "Don't re-integrate and check HDF5 " - "peaks"}, + "or MsgPack peaks"}, {"no-half-pixel-shift", 320, NULL, OPTION_NO_USAGE, "Don't offset HDF5 peak " "locations by 0.5 pixels"}, - {"check-hdf5-snr", 321, NULL, OPTION_NO_USAGE, "Check SNR for peaks from HDF5 or " - "CXI (see --min-snr)"}, + {"check-hdf5-snr", 321, NULL, OPTION_NO_USAGE, "Check SNR for peaks from HDF5, " + "CXI or MsgPack (see --min-snr)"}, {NULL, 0, 0, OPTION_DOC, "Indexing options:", 4}, {"indexing", 400, "method", 0, "List of indexing methods"}, diff --git a/src/process_image.c b/src/process_image.c index 4edda678..01efb09e 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -313,6 +313,12 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, pargs->zmq_data, pargs->zmq_data_size, iargs->half_pixel_shift); + 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_NONE: -- cgit v1.2.3