diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 8 | ||||
| -rw-r--r-- | src/process_image.c | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 75c7a2d5..fc22a562 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -229,7 +229,7 @@ static void write_harvest_file(struct index_args *args, fprintf(fh, " },\n"); if ( args->ipriv == NULL ) { - fprintf(fh, " \"indexing\": null\n"); + fprintf(fh, " \"indexing\": null,\n"); fprintf(fh, " \"integration\": null\n"); } else { @@ -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 5282e135..9151528d 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -3,11 +3,11 @@ * * The processing pipeline for one image * - * Copyright © 2012-2021 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2022 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: - * 2010-2020 Thomas White <taw@physics.org> + * 2010-2022 Thomas White <taw@physics.org> * 2014-2017 Valerio Mariani <valerio.mariani@desy.de> * 2017 Stijn de Graaf * @@ -319,6 +319,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: |