aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-06-10 16:32:31 +0200
committerThomas White <taw@physics.org>2013-06-10 16:32:31 +0200
commit71f3e20da9a1ac99045c6e34de02176524f044bc (patch)
treec120e14a6f7a47ad5d94ccba61848a4c4dce50a8
parentd16071266043b374408ac0bd14fab1d8042e6e08 (diff)
indexamajig: Fix default integration method
-rw-r--r--libcrystfel/src/integration.h2
-rw-r--r--src/indexamajig.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h
index 58f05c39..b438e090 100644
--- a/libcrystfel/src/integration.h
+++ b/libcrystfel/src/integration.h
@@ -33,7 +33,7 @@
#include <config.h>
#endif
-#define INTEGRATION_DEFAULTS_RINGS (INTEGRATION_RINGS | INTEGRATION_CENTER)
+#define INTEGRATION_DEFAULTS_RINGS (INTEGRATION_RINGS)
#define INTEGRATION_DEFAULTS_PROF2D (INTEGRATION_PROF2D | INTEGRATION_CENTER)
/**
diff --git a/src/indexamajig.c b/src/indexamajig.c
index d257b50c..b36bbbc2 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
}
iargs.indm = NULL; /* No default */
iargs.ipriv = NULL; /* No default */
- iargs.int_meth = INTEGRATION_RINGS; /* No centering, no saturation */
+ iargs.int_meth = integration_method("rings-nocen", NULL);
/* Long options */
const struct option longopts[] = {