diff options
| author | Thomas White <taw@physics.org> | 2016-01-30 20:22:56 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2016-01-30 20:22:56 +0100 |
| commit | 4b2cc069a16bf564404d9f1020733dd2ec0b2275 (patch) | |
| tree | 825b3b5031264f2ca54ccfd4cd7fb640952b52d3 /src | |
| parent | c9c756db807f3ea22dcf2d01401a4ce69f73f4df (diff) | |
indexamajig: Restore --no-refine
Adds yet another indexing option...
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 14 | ||||
| -rw-r--r-- | src/process_image.h | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index a726c1b2..afc41a17 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -198,6 +198,7 @@ int main(int argc, char *argv[]) struct beam_params beam; int have_push_res = 0; int len; + int no_refine = 0; /* Defaults */ iargs.cell = NULL; @@ -241,7 +242,6 @@ int main(int argc, char *argv[]) iargs.fix_profile_r = -1.0; iargs.fix_bandwidth = -1.0; iargs.fix_divergence = -1.0; - iargs.predict_refine = 1; iargs.felix_options = NULL; /* Long options */ @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) {"no-use-saturated", 0, &iargs.use_saturated, 0}, {"no-revalidate", 0, &iargs.no_revalidate, 1}, {"check-hdf5-snr", 0, &iargs.check_hdf5_snr, 1}, - {"no-refine", 0, &iargs.predict_refine, 0}, + {"no-refine", 0, &no_refine, 1}, /* Long-only options which don't actually do anything */ {"no-sat-corr", 0, &iargs.satcorr, 0}, @@ -589,12 +589,22 @@ int main(int argc, char *argv[]) } else { + int i = 0; + indm = build_indexer_list(indm_str); if ( indm == NULL ) { ERROR("Invalid indexer list '%s'\n", indm_str); return 1; } free(indm_str); + + /* If --no-refine, unset the refinement flag on all methods */ + if ( no_refine ) { + while ( indm[i] != INDEXING_NONE ) { + indm[i] &= ~INDEXING_REFINE; + i++; + } + } } /* Parse integration method */ diff --git a/src/process_image.h b/src/process_image.h index 60da7cb8..f474725c 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -88,7 +88,6 @@ struct index_args float fix_profile_r; float fix_bandwidth; float fix_divergence; - int predict_refine; char *felix_options; }; |