diff options
| author | Thomas White <taw@physics.org> | 2019-08-08 11:05:09 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-08-16 10:26:59 +0200 |
| commit | f6c9932aa1b41e36178a2471e6728c04fb45289a (patch) | |
| tree | be3993ec0654ee2f76ff14363a4f30496e38de93 /src | |
| parent | ea74744a59728bd375dda10a9386b502eb5056c2 (diff) | |
Clarify cell vs reference in comparison functions. Also reindexed vs permuted
Diffstat (limited to 'src')
| -rw-r--r-- | src/whirligig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/whirligig.c b/src/whirligig.c index cc2b531e..a144e769 100644 --- a/src/whirligig.c +++ b/src/whirligig.c @@ -309,9 +309,9 @@ static IntegerMatrix *try_all(struct window *win, int n1, int n2, for ( i=0; i<i1->n_crystals; i++ ) { for ( j=0; j<i2->n_crystals; j++ ) { - if ( compare_reindexed_cell_parameters_and_orientation(crystal_get_cell(i1->crystals[i]), - crystal_get_cell(i2->crystals[j]), - 0.1, deg2rad(5.0), &m) ) + if ( compare_permuted_cell_parameters_and_orientation(crystal_get_cell(i1->crystals[i]), + crystal_get_cell(i2->crystals[j]), + 0.1, deg2rad(5.0), &m) ) { if ( !crystal_used(win, n1, i) && !crystal_used(win, n2, j) ) @@ -374,9 +374,9 @@ static int try_join(struct window *win, int sn) for ( j=0; j<win->img[win->join_ptr].n_crystals; j++ ) { Crystal *cr2; cr2 = win->img[win->join_ptr].crystals[j]; - if ( compare_reindexed_cell_parameters_and_orientation(ref, crystal_get_cell(cr2), - 0.1, deg2rad(5.0), - &win->mat[sn][win->join_ptr]) ) + if ( compare_permuted_cell_parameters_and_orientation(ref, crystal_get_cell(cr2), + 0.1, deg2rad(5.0), + &win->mat[sn][win->join_ptr]) ) { win->ser[sn][win->join_ptr] = j; cell_free(ref); |