aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/integration.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-05-28 16:54:36 +0200
committerThomas White <taw@physics.org>2013-05-28 16:54:36 +0200
commitb9523ce11a532ff579ad60299070281fd4167d62 (patch)
tree79ab6caf28457f91d54276fc9e67164b909fe4ca /libcrystfel/src/integration.h
parent05d735b523cf3177021b96984681d46d9b57ce39 (diff)
Honour "-sat"
Diffstat (limited to 'libcrystfel/src/integration.h')
-rw-r--r--libcrystfel/src/integration.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h
index 36f1d5bd..fe939e21 100644
--- a/libcrystfel/src/integration.h
+++ b/libcrystfel/src/integration.h
@@ -33,8 +33,8 @@
#include <config.h>
#endif
-#define INTEGRATION_DEFAULTS_RINGS (INTEGRATION_RINGS | INTEGRATION_SATURATED)
-#define INTEGRATION_DEFAULTS_PROF2D (INTEGRATION_PROF2D | INTEGRATION_SATURATED)
+#define INTEGRATION_DEFAULTS_RINGS (INTEGRATION_RINGS)
+#define INTEGRATION_DEFAULTS_PROF2D (INTEGRATION_PROF2D)
/**
* IntegrationMethod:
@@ -56,8 +56,7 @@ typedef enum {
/* Bits at the top of the IntegrationMethod are flags which modify the
* behaviour of the integration. */
- INTEGRATION_SATURATED = 256,
- INTEGRATION_CLOSER = 512,
+ INTEGRATION_SATURATED = 256
} IntegrationMethod;