diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-01-20 11:42:56 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:43 +0100 |
| commit | c1006299fc36d89b12fa1ab52d013858a862a830 (patch) | |
| tree | b8f6a7db720397cd026f0d177267863318a8bfd2 | |
| parent | c5b795a281d10edd1bebf2ec9f63b53227619dc8 (diff) | |
Sanity check no longer requires the predicted peaks
Also comment out the old resolution estimation stuff
| -rw-r--r-- | libcrystfel/src/index.c | 2 | ||||
| -rw-r--r-- | src/indexamajig.c | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index d5e76c50..c040f4d6 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -205,9 +205,7 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm, if ( new_cell == NULL ) continue; /* Sanity check */ - image->reflections = find_intersections(image, new_cell); image->indexed_cell = new_cell; - if ( !config_insane && !peak_sanity_check(image) ) { cell_free(new_cell); image->indexed_cell = NULL; diff --git a/src/indexamajig.c b/src/indexamajig.c index 5a10fce8..ab0ee5a1 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -360,22 +360,16 @@ static void process_image(void *pp, int cookie) pargs->indexable = 1; - if ( image.reflections != NULL ) { + image.reflections = find_intersections(&image, + image.indexed_cell); - double min, max; + if ( image.reflections != NULL ) { integrate_reflections(&image, config_polar, pargs->static_args.config_closer, pargs->static_args.config_bgsub, pargs->static_args.min_int_snr); - estimate_resolution(image.reflections, - image.indexed_cell, &min, &max); - image.reflections = res_cutoff(image.reflections, - image.indexed_cell, - min, max); - image.diffracting_resolution = max; - } } else { |