diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-sandbox.c | 8 | ||||
| -rw-r--r-- | src/im-sandbox.h | 1 | ||||
| -rw-r--r-- | src/indexamajig.c | 13 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c index aed0b04b..1b460d4e 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -291,9 +291,11 @@ static void process_image(const struct index_args *iargs, iargs->hdf5_peak_path)) { ERROR("Failed to get peaks from HDF5 file.\n"); } - validate_peaks(&image, iargs->min_int_snr, - iargs->ir_inn, iargs->ir_mid, iargs->ir_out, - iargs->use_saturated); + if ( !iargs->no_revalidate ) { + validate_peaks(&image, iargs->min_int_snr, + iargs->ir_inn, iargs->ir_mid, + iargs->ir_out, iargs->use_saturated); + } break; case PEAK_ZAEF: diff --git a/src/im-sandbox.h b/src/im-sandbox.h index 50dc599b..3851fb40 100644 --- a/src/im-sandbox.h +++ b/src/im-sandbox.h @@ -68,6 +68,7 @@ struct index_args struct copy_hdf5_field *copyme; int integrate_saturated; int use_saturated; + int no_revalidate; }; diff --git a/src/indexamajig.c b/src/indexamajig.c index 57c16932..ae03986c 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -161,10 +161,12 @@ static void show_help(const char *s) " least 10%% of the located peaks.\n" " --no-bg-sub Don't subtract local background estimates from\n" " integrated intensities.\n" -" --use-saturated During the initial peak search, don't reject\n" -" peaks which contain pixels above max_adu.\n" -" --integrate-saturated During the final integration stage, don't reject\n" -" peaks which contain pixels above max_adu.\n" +" --use-saturated During the initial peak search, don't reject\n" +" peaks which contain pixels above max_adu.\n" +" --integrate-saturated During the final integration stage, don't reject\n" +" peaks which contain pixels above max_adu.\n" +" --no-revalidate Don't re-integrate and check HDF5 peaks for\n" +" validity.\n" ); } @@ -248,6 +250,7 @@ int main(int argc, char *argv[]) float ir_out = 7.0; int integrate_saturated = 0; int use_saturated = 0; + int no_revalidate = 0; copyme = new_copy_hdf5_field_list(); if ( copyme == NULL ) { @@ -296,6 +299,7 @@ int main(int argc, char *argv[]) {"int-radius", 1, NULL, 14}, {"integrate-saturated",0, &integrate_saturated,1}, {"use-saturated",0, &use_saturated, 1}, + {"no-revalidate", 0, &no_revalidate, 1}, {0, 0, NULL, 0} }; @@ -644,6 +648,7 @@ int main(int argc, char *argv[]) iargs.ir_out = ir_out; iargs.use_saturated = use_saturated; iargs.integrate_saturated = integrate_saturated; + iargs.no_revalidate = no_revalidate; create_sandbox(&iargs, n_proc, prefix, config_basename, fh, use_this_one_instead, ofh); |