aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/integration.c12
-rw-r--r--libcrystfel/src/integration.h3
2 files changed, 9 insertions, 6 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;
diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h
index 7a230daf..99945198 100644
--- a/libcrystfel/src/integration.h
+++ b/libcrystfel/src/integration.h
@@ -98,8 +98,7 @@ typedef enum {
/** Center the peak in the box prior to integration */
INTEGRATION_CENTER = 512,
- /** Stop integrating at the diffraction limit of the crystal */
- INTEGRATION_RESCUT = 1024,
+ /* 1024 was INTEGRATION_RESCUT, which is no longer used */
/** Fit a gradient to the background */
INTEGRATION_GRADIENTBG = 2048,