diff options
| author | Thomas White <taw@physics.org> | 2020-03-05 11:47:41 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:42:24 +0200 |
| commit | 94df5f31d5a91b22991e26cd02bc37763005f2d1 (patch) | |
| tree | 569de419937b1b17747e396837ee222e736ea568 /src | |
| parent | 026af04547c22c67886c66d3b1808c4dd3ade997 (diff) | |
ImageFeatureList: Store panel number, not pointer
This makes the conversion to DataTemplate/detgeom MUCH easier.
Diffstat (limited to 'src')
| -rw-r--r-- | src/geoptimiser.c | 5 | ||||
| -rw-r--r-- | src/process_image.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/geoptimiser.c b/src/geoptimiser.c index 136cca39..73e37249 100644 --- a/src/geoptimiser.c +++ b/src/geoptimiser.c @@ -768,7 +768,8 @@ static int compute_pixel_displacements(struct image *images, int n_images, imfe = image_get_feature(flist, fi); if ( imfe == NULL ) continue; - compute_x_y(imfe->fs, imfe->ss, imfe->p, &fx, &fy); + compute_x_y(imfe->fs, imfe->ss, + &det->panels[imfe->pn], &fx, &fy); /* Find the closest reflection (from all crystals) */ refl = find_closest_reflection(&images[cp], fx, fy, @@ -779,7 +780,7 @@ static int compute_pixel_displacements(struct image *images, int n_images, struct gpanel *gp; int r; - gp = &gpanels[panel_number(det, imfe->p)]; + gp = &gpanels[imfe->pn]; r = add_distance_to_list(gp, imfe, refl, fx, fy, det_shift); diff --git a/src/process_image.c b/src/process_image.c index 1e6bb814..930052c4 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -359,7 +359,8 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, } image.peak_resolution = estimate_peak_resolution(image.features, - image.lambda); + image.lambda, + image.det); restore_image_data(image.dp, image.det, prefilter); |