aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-02-02 00:14:06 +0100
committerThomas White <taw@physics.org>2014-02-02 00:14:06 +0100
commit512af3db1c82578f0c82275c5cea70e04b9915d4 (patch)
treebc15482fe7d344a56371033c8eb1068f7acbcfa7 /src
parent07f1ba5269db94d44278596d827ac26845914b90 (diff)
indexamajig: Make --integrate-saturated work again
This option is provided for backwards compatibility
Diffstat (limited to 'src')
-rw-r--r--src/indexamajig.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 7615872a..40a3ecc8 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -159,6 +159,7 @@ int main(int argc, char *argv[])
char *rval = NULL;
int config_checkprefix = 1;
int config_basename = 0;
+ int integrate_saturated = 0;
IndexingMethod *indm;
IndexingPrivate **ipriv;
char *indm_str = NULL;
@@ -199,7 +200,6 @@ int main(int argc, char *argv[])
iargs.ir_mid = 5.0;
iargs.ir_out = 7.0;
iargs.use_saturated = 1;
- iargs.integrate_saturated = 0;
iargs.no_revalidate = 0;
iargs.stream_peaks = 1;
iargs.stream_refls = 1;
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
{"basename", 0, &config_basename, 1},
{"no-peaks-in-stream", 0, &iargs.stream_peaks, 0},
{"no-refls-in-stream", 0, &iargs.stream_refls, 0},
- {"integrate-saturated",0, &iargs.integrate_saturated,1},
+ {"integrate-saturated",0, &integrate_saturated, 1},
{"use-saturated", 0, &iargs.use_saturated, 1},
{"no-use-saturated", 0, &iargs.use_saturated, 0},
{"no-revalidate", 0, &iargs.no_revalidate, 1},
@@ -481,6 +481,10 @@ int main(int argc, char *argv[])
}
free(int_str);
}
+ if ( integrate_saturated ) {
+ /* Option provided for backwards compatibility */
+ iargs.int_meth |= INTEGRATION_SATURATED;
+ }
if ( toler != NULL ) {
int ttt;