aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-03-10 14:43:48 +0100
committerThomas White <taw@physics.org>2021-03-11 15:59:11 +0100
commit07e01e64c8b470df37db40ea185302d91b8a72ac (patch)
tree8e42420e963a438c8edc8282244ae0a06548b55e /libcrystfel/src
parent665547b5ad276a7fa9f9e3c20cf531aa1f32f247 (diff)
PinkIndexer: Don't use ImageFeature->rx,ry,rz
This brings it up to date after e7cf3911104f.
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/indexers/pinkindexer.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c
index 69905c35..03442764 100644
--- a/libcrystfel/src/indexers/pinkindexer.c
+++ b/libcrystfel/src/indexers/pinkindexer.c
@@ -104,15 +104,18 @@ int run_pinkIndexer(struct image *image, void *ipriv)
}
reciprocalPeaks_1_per_A->peakCount = 0;
for (int i = 0; i < peakCountMax && i < MAX_PEAK_COUNT_FOR_INDEXER; i++) {
+
struct imagefeature *f;
+ double r[3];
+
f = image_get_feature(image->features, i);
- if (f == NULL) {
- continue;
- }
+ if ( f == NULL ) continue;
- reciprocalPeaks_1_per_A->coordinates_x[reciprocalPeaks_1_per_A->peakCount] = f->rz * 1e-10;
- reciprocalPeaks_1_per_A->coordinates_y[reciprocalPeaks_1_per_A->peakCount] = f->rx * 1e-10;
- reciprocalPeaks_1_per_A->coordinates_z[reciprocalPeaks_1_per_A->peakCount] = f->ry * 1e-10;
+ detgeom_transform_coords(&image->detgeom->panels[f->pn],
+ f->fs, f->ss, image->lambda, r);
+ reciprocalPeaks_1_per_A->coordinates_x[reciprocalPeaks_1_per_A->peakCount] = r[2] * 1e-10;
+ reciprocalPeaks_1_per_A->coordinates_y[reciprocalPeaks_1_per_A->peakCount] = r[0] * 1e-10;
+ reciprocalPeaks_1_per_A->coordinates_z[reciprocalPeaks_1_per_A->peakCount] = r[1] * 1e-10;
intensities[reciprocalPeaks_1_per_A->peakCount] = (float) (f->intensity);
reciprocalPeaks_1_per_A->peakCount++;
}