diff options
| author | Thomas White <taw@physics.org> | 2019-08-21 12:23:39 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-08-22 17:03:28 +0200 |
| commit | 0b1db945a12c0e68491412baf322b761511eb016 (patch) | |
| tree | c725147e0e1a68814c2eb24754847c2181402064 /libcrystfel/src/index.c | |
| parent | 5ab96056a6d1972a248abb154ea5df0ffda44d06 (diff) | |
Tidy up comparison function definitions
Especially, remove the last ltl/atl tolerance values.
Diffstat (limited to 'libcrystfel/src/index.c')
| -rw-r--r-- | libcrystfel/src/index.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index aa0cfb6a..45b24afb 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -553,7 +553,8 @@ static int check_cell(IndexingFlags flags, Crystal *cr, UnitCell *target, if ( ! ((flags & INDEXING_CHECK_CELL_COMBINATIONS) || (flags & INDEXING_CHECK_CELL_AXES)) ) return 0; - if ( compare_lattices(crystal_get_cell(cr), target, tolerance, &rm) ) + if ( compare_reindexed_cell_parameters(crystal_get_cell(cr), target, + tolerance, &rm) ) { out = cell_transform_rational(crystal_get_cell(cr), rm); cell_free(crystal_get_cell(cr)); @@ -691,13 +692,17 @@ static int try_indexer(struct image *image, IndexingMethod indm, for ( j=0; j<this_crystal; j++ ) { Crystal *that_cr = image->crystals[j]; + const double tols[] = {0.1, 0.1, 0.1, + deg2rad(5.0), + deg2rad(5.0), + deg2rad(5.0)}; /* Don't do similarity check against bad crystals */ if ( crystal_get_user_flag(that_cr) ) continue; if ( compare_permuted_cell_parameters_and_orientation(crystal_get_cell(cr), crystal_get_cell(that_cr), - 0.1, deg2rad(0.5), NULL) ) + tols, NULL) ) { crystal_set_user_flag(cr, 1); } |