diff options
| author | Thomas White <taw@physics.org> | 2012-10-02 15:03:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-10-02 15:03:11 +0200 |
| commit | 6633efd7a1931925bb6814dad0761f10d0a457b7 (patch) | |
| tree | 4ad51c1254344fad9bac57ab4307d6aabea1aa07 /libcrystfel/src/reax.c | |
| parent | ea8e5c457b96184bd152eb20b72fb15682b18474 (diff) | |
| parent | d51007fe1a9d8a797bdd9b71eea715a09252cc6e (diff) | |
Merge branch 'tom/symmetry'
Diffstat (limited to 'libcrystfel/src/reax.c')
| -rw-r--r-- | libcrystfel/src/reax.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcrystfel/src/reax.c b/libcrystfel/src/reax.c index 5cfa908a..7529d12f 100644 --- a/libcrystfel/src/reax.c +++ b/libcrystfel/src/reax.c @@ -41,12 +41,12 @@ #include <gsl/gsl_vector.h> #include <gsl/gsl_linalg.h> #include <gsl/gsl_eigen.h> -#include <gsl/gsl_blas.h> #include "image.h" #include "utils.h" #include "peaks.h" #include "cell.h" +#include "cell-utils.h" #include "index.h" #include "index-priv.h" @@ -744,7 +744,7 @@ static double max_feature_resolution(ImageFeatureList *flist) } -static int right_handed(struct rvec a, struct rvec b, struct rvec c) +static int right_handed_vec(struct rvec a, struct rvec b, struct rvec c) { struct rvec aCb; double aCb_dot_c; @@ -957,7 +957,7 @@ static void assemble_cells_from_candidates(struct image *image, bi.u = vj.x; bi.v = vj.y; bi.w = vj.z; ci.u = vk.x; ci.v = vk.y; ci.w = vk.z; - if ( !right_handed(ai, bi, ci) ) continue; + if ( !right_handed_vec(ai, bi, ci) ) continue; /* We have three vectors with the right angles */ cnew = cell_new_from_direct_axes(ai, bi, ci); |