From f300428f9c04ea306eecd9093b2c2e85b5b37b3a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 23 Sep 2019 15:26:43 +0200 Subject: Get rid of "rescut" integration flag Its behaviour is 100% covered by the push-res parameter, which can be set to infinity for no cutoff. --- src/indexamajig.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/indexamajig.c') diff --git a/src/indexamajig.c b/src/indexamajig.c index e607ec29..9a1e6e81 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -676,7 +676,7 @@ int main(int argc, char *argv[]) } args.iargs.ipriv = NULL; /* No default */ args.iargs.int_meth = integration_method("rings-nocen-nosat-nograd", NULL); - args.iargs.push_res = -1.0; + args.iargs.push_res = +INFINITY; args.iargs.highres = +INFINITY; args.iargs.fix_profile_r = -1.0; args.iargs.fix_divergence = -1.0; @@ -884,19 +884,6 @@ int main(int argc, char *argv[]) args.iargs.hdf5_peak_path = args.command_line_peak_path; } - /* Check for push-res without rescut */ - if ( args.iargs.push_res > 0.0 ) { - if ( !(args.iargs.int_meth & INTEGRATION_RESCUT) ) { - ERROR("WARNING: You used --push-res, but not -rescut, " - "therefore --push-res will have no effect.\n"); - ERROR("WARNING: Add --integration=rings-rescut or " - "--integration=prof2d-rescut.\n"); - } - } else { - /* Set default value */ - args.iargs.push_res = 0.0; - } - /* If no integration radii were given, apply the defaults */ if ( args.iargs.ir_inn < 0 ) { STATUS("WARNING: You did not specify --int-radius.\n"); -- cgit v1.2.3