diff options
| author | Thomas White <taw@physics.org> | 2013-01-28 14:35:35 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-01-28 14:35:35 +0100 |
| commit | 9ce39259c3d6bb1b76efbe02f84a4e10a30be13d (patch) | |
| tree | 3b17eaf6f3193a92f07429b815469bf592e11e18 /libcrystfel | |
| parent | 082894733e02420a25227467ee203070e4d5d684 (diff) | |
More changes to geometry.c
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/geometry.c | 10 | ||||
| -rw-r--r-- | libcrystfel/src/geometry.h | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c index 02629421..9c494e2c 100644 --- a/libcrystfel/src/geometry.c +++ b/libcrystfel/src/geometry.c @@ -3,11 +3,11 @@ * * Geometry of diffraction * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2013 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: - * 2010-2012 Thomas White <taw@physics.org> + * 2010-2013 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * @@ -44,6 +44,7 @@ #include "reflist.h" #include "reflist-utils.h" #include "symmetry.h" +#include "geometry.h" static signed int locate_peak(double x, double y, double z, double k, @@ -284,7 +285,7 @@ RefList *find_intersections(struct image *image, Crystal *cryst) } -RefList *select_intersections(struct image *image, UnitCell *cell) +RefList *select_intersections(struct image *image, Crystal *cryst) { double ax, ay, az; double bx, by, bz; @@ -297,7 +298,8 @@ RefList *select_intersections(struct image *image, UnitCell *cell) fesetround(1); /* Cell basis vectors for this image */ - cell_get_cartesian(cell, &ax, &ay, &az, &bx, &by, &bz, &cx, &cy, &cz); + cell_get_cartesian(crystal_get_cell(cryst), &ax, &ay, &az, + &bx, &by, &bz, &cx, &cy, &cz); list = reflist_new(); if ( list == NULL ) return NULL; diff --git a/libcrystfel/src/geometry.h b/libcrystfel/src/geometry.h index 14a3a7d6..9d8fa475 100644 --- a/libcrystfel/src/geometry.h +++ b/libcrystfel/src/geometry.h @@ -3,12 +3,12 @@ * * Geometry of diffraction * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2013 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * Copyright © 2012 Richard Kirian * * Authors: - * 2010-2012 Thomas White <taw@physics.org> + * 2010-2013 Thomas White <taw@physics.org> * 2012 Richard Kirian * * This file is part of CrystFEL. @@ -43,10 +43,10 @@ extern "C" { #endif -extern RefList *find_intersections(struct image *image, UnitCell *cell); -extern RefList *select_intersections(struct image *image, UnitCell *cell); +extern RefList *find_intersections(struct image *image, Crystal *cryst); +extern RefList *select_intersections(struct image *image, Crystal *cryst); -extern void update_partialities(struct image *image); +extern void update_partialities(struct image *image, Crystal *cryst); #ifdef __cplusplus } |