diff options
Diffstat (limited to 'libcrystfel/src/integration.c')
| -rw-r--r-- | libcrystfel/src/integration.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c index a1655aab..1384c20b 100644 --- a/libcrystfel/src/integration.c +++ b/libcrystfel/src/integration.c @@ -1670,8 +1670,6 @@ void integrate_all_5(struct image *image, IntegrationMethod meth, int i; int *masks[image->det->n_panels]; - if ( !(meth & INTEGRATION_RESCUT) ) push_res = +INFINITY; - /* Predict all reflections */ for ( i=0; i<image->n_crystals; i++ ) { @@ -1818,10 +1816,16 @@ IntegrationMethod integration_method(const char *str, int *err) meth &= ~INTEGRATION_CENTER; } else if ( strcmp(methods[i], "rescut") == 0 ) { - meth |= INTEGRATION_RESCUT; + ERROR("'rescut'/'norescut' in integration method is no " + "longer used. Set --push-res instead.\n"); + if ( err != NULL ) *err = 1; + return INTEGRATION_NONE; } else if ( strcmp(methods[i], "norescut") == 0 ) { - meth &= ~INTEGRATION_RESCUT; + ERROR("'rescut'/'norescut' in integration method is no " + "longer used. Set --push-res instead.\n"); + if ( err != NULL ) *err = 1; + return INTEGRATION_NONE; } else if ( strcmp(methods[i], "grad") == 0 ) { meth |= INTEGRATION_GRADIENTBG; |