From 0f24c4fb9451f1c32fb89534b37bf7f804e37d99 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 19 Jan 2018 13:17:40 +0100 Subject: indexamajig: Add --overpredict --- src/indexamajig.c | 3 +++ src/process_image.c | 4 ++-- src/process_image.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/indexamajig.c b/src/indexamajig.c index c5249db3..a6651497 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -174,6 +174,7 @@ static void show_help(const char *s) " --int-radius= Set the integration radii. Default: 4,5,7.\n" " --int-diag= Show debugging information about reflections\n" " --push-res= Integrate higher than apparent resolution cutoff\n" +" --overpredict Over-predict reflections (for post-refinement)\n" "\nOutput options:\n\n" " --no-non-hits-in-stream\n" " Do not include non-hit frames in the stream\n" @@ -281,6 +282,7 @@ int main(int argc, char *argv[]) iargs.int_diag = INTDIAG_NONE; iargs.copyme = new_imagefile_field_list(); iargs.min_peaks = 0; + iargs.overpredict = 0; if ( iargs.copyme == NULL ) { ERROR("Couldn't allocate HDF5 field list.\n"); return 1; @@ -343,6 +345,7 @@ int main(int argc, char *argv[]) {"check-peaks", 0, &if_peaks, 1}, {"no-retry", 0, &if_retry, 0}, {"no-multi", 0, &if_multi, 0}, + {"overpredict", 0, &iargs.overpredict, 1}, /* Long-only options which don't actually do anything */ {"no-sat-corr", 0, &iargs.satcorr, 0}, diff --git a/src/process_image.c b/src/process_image.c index 498b3398..cb1d65a3 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -301,12 +301,12 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, /* Integrate! */ time_accounts_set(taccs, TACC_INTEGRATION); sb_shared->pings[cookie]++; - integrate_all_4(&image, iargs->int_meth, PMODEL_SCSPHERE, + integrate_all_5(&image, iargs->int_meth, PMODEL_SCSPHERE, iargs->push_res, iargs->ir_inn, iargs->ir_mid, iargs->ir_out, iargs->int_diag, iargs->int_diag_h, iargs->int_diag_k, iargs->int_diag_l, - &sb_shared->term_lock); + &sb_shared->term_lock, iargs->overpredict); streamwrite: time_accounts_set(taccs, TACC_WRITESTREAM); diff --git a/src/process_image.h b/src/process_image.h index 861ee203..6d170a39 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -100,6 +100,7 @@ struct index_args float fix_profile_r; float fix_bandwidth; float fix_divergence; + int overpredict; int profile; /* Whether or not to do wall clock profiling */ struct taketwo_options taketwo_opts; struct felix_options felix_opts; -- cgit v1.2.3