diff options
| -rw-r--r-- | src/geometry.c | 10 | ||||
| -rw-r--r-- | src/geometry.h | 3 | ||||
| -rw-r--r-- | src/indexamajig.c | 2 | ||||
| -rw-r--r-- | src/partial_sim.c | 2 | ||||
| -rw-r--r-- | tests/pr_gradient_check.c | 6 |
5 files changed, 11 insertions, 12 deletions
diff --git a/src/geometry.c b/src/geometry.c index b53e1aa7..e0714694 100644 --- a/src/geometry.c +++ b/src/geometry.c @@ -122,13 +122,14 @@ static double partiality(double r1, double r2, double r) } -static int check_reflection(struct image *image, double mres, int output, +static int check_reflection(struct image *image, double mres, RefList *reflections, signed int h, signed int k, signed int l, double asx, double asy, double asz, double bsx, double bsy, double bsz, double csx, double csy, double csz) { + const int output = 0; double xl, yl, zl; double ds, ds_sq; double rlow, rhigh; /* "Excitation error" */ @@ -229,8 +230,7 @@ static int check_reflection(struct image *image, double mres, int output, } -RefList *find_intersections(struct image *image, UnitCell *cell, - int output) +RefList *find_intersections(struct image *image, UnitCell *cell) { double asx, asy, asz; double bsx, bsy, bsz; @@ -265,7 +265,7 @@ RefList *find_intersections(struct image *image, UnitCell *cell, for ( h=-hmax; h<=hmax; h++ ) { for ( k=-kmax; k<=kmax; k++ ) { for ( l=-lmax; l<=lmax; l++ ) { - check_reflection(image, mres, output, reflections, h, k, l, + check_reflection(image, mres, reflections, h, k, l, asx,asy,asz,bsx,bsy,bsz,csx,csy,csz); } } @@ -320,7 +320,7 @@ void update_partialities(struct image *image, const char *sym, RefListIterator *iter; RefList *predicted; - predicted = find_intersections(image, image->indexed_cell, 0); + predicted = find_intersections(image, image->indexed_cell); for ( refl = first_refl(predicted, &iter); refl != NULL; diff --git a/src/geometry.h b/src/geometry.h index 6f45a2c8..15c6e552 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -19,8 +19,7 @@ #include "reflist.h" -extern RefList *find_intersections(struct image *image, UnitCell *cell, - int output); +extern RefList *find_intersections(struct image *image, UnitCell *cell); extern void update_partialities(struct image *image, const char *sym, ReflItemList *scalable, diff --git a/src/indexamajig.c b/src/indexamajig.c index 00a7e3e8..f1c39a30 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -322,7 +322,7 @@ static void process_image(void *pp, int cookie) image.bw = beam->bandwidth; image.profile_radius = 0.0001e9; image.reflections = find_intersections(&image, - image.indexed_cell, 0); + image.indexed_cell); integrate_reflections(&image, config_polar, pargs->static_args.config_closer, diff --git a/src/partial_sim.c b/src/partial_sim.c index 937e3a1b..2a412ae4 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -282,7 +282,7 @@ int main(int argc, char *argv[]) snprintf(image.filename, 255, "(simulated %i)", i); image.reflections = find_intersections(&image, - image.indexed_cell, 0); + image.indexed_cell); calculate_partials(image.reflections, osf, full, sym); /* Give a slightly incorrect cell in the stream */ diff --git a/tests/pr_gradient_check.c b/tests/pr_gradient_check.c index a81416f7..d2aa376e 100644 --- a/tests/pr_gradient_check.c +++ b/tests/pr_gradient_check.c @@ -107,12 +107,12 @@ static void calc_either_side(struct image *image, double incr_val, UnitCell *cell; cell = new_shifted_cell(image->indexed_cell, refine, -incr_val); - compare = find_intersections(image, cell, 0); + compare = find_intersections(image, cell); scan_partialities(image->reflections, compare, valid, vals, 0); cell_free(cell); cell = new_shifted_cell(image->indexed_cell, refine, +incr_val); - compare = find_intersections(image, cell, 0); + compare = find_intersections(image, cell); scan_partialities(image->reflections, compare, valid, vals, 2); cell_free(cell); } @@ -129,7 +129,7 @@ static int test_gradients(struct image *image, double incr_val, int refine, int nref; int n_acc, n_valid; - image->reflections = find_intersections(image, image->indexed_cell, 0); + image->reflections = find_intersections(image, image->indexed_cell); nref = num_reflections(image->reflections); if ( nref < 10 ) { |