From d6db66c2d57be8071465cfcac70baea4499c99df Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 10 Mar 2021 16:48:28 +0100
Subject: detgeom_transform_coords: Take an additional detector shift

This allows the refined detector position to be used in a lot of places.
---
 libcrystfel/src/indexers/asdf.c        | 2 +-
 libcrystfel/src/indexers/dirax.c       | 2 +-
 libcrystfel/src/indexers/felix.c       | 2 +-
 libcrystfel/src/indexers/mosflm.c      | 2 +-
 libcrystfel/src/indexers/pinkindexer.c | 3 ++-
 libcrystfel/src/indexers/taketwo.c     | 2 +-
 libcrystfel/src/indexers/xds.c         | 2 +-
 libcrystfel/src/indexers/xgandalf.c    | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'libcrystfel/src/indexers')

diff --git a/libcrystfel/src/indexers/asdf.c b/libcrystfel/src/indexers/asdf.c
index af8acd78..0c57f9f0 100644
--- a/libcrystfel/src/indexers/asdf.c
+++ b/libcrystfel/src/indexers/asdf.c
@@ -1123,7 +1123,7 @@ int run_asdf(struct image *image, void *ipriv)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		reflections[N_reflections] = gsl_vector_alloc(3);
 		gsl_vector_set(reflections[N_reflections], 0, r[0]/1e10);
diff --git a/libcrystfel/src/indexers/dirax.c b/libcrystfel/src/indexers/dirax.c
index d19cc8b0..4b59f6cb 100644
--- a/libcrystfel/src/indexers/dirax.c
+++ b/libcrystfel/src/indexers/dirax.c
@@ -497,7 +497,7 @@ static void write_drx(struct image *image)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		fprintf(fh, "%10f %10f %10f %8f\n",
 		        r[0]/1e10, r[1]/1e10, r[2]/1e10, 1.0);
diff --git a/libcrystfel/src/indexers/felix.c b/libcrystfel/src/indexers/felix.c
index de49ac0b..89de5f70 100644
--- a/libcrystfel/src/indexers/felix.c
+++ b/libcrystfel/src/indexers/felix.c
@@ -371,7 +371,7 @@ static void write_gve(struct image *image, struct felix_private *gp)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		fprintf(fh, "%.6f %.6f %.6f 0 0 %.6f %.6f %.6f 0\n",
 		        r[2]/1e10, r[0]/1e10, r[1]/1e10,
diff --git a/libcrystfel/src/indexers/mosflm.c b/libcrystfel/src/indexers/mosflm.c
index 9f674d9c..b0e0b121 100644
--- a/libcrystfel/src/indexers/mosflm.c
+++ b/libcrystfel/src/indexers/mosflm.c
@@ -364,7 +364,7 @@ static void write_spt(struct image *image, const char *filename)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		ttx = angle_between_2d(0.0, 1.0,
 		                       r[0], 1.0/image->lambda + r[2]);
diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c
index 03442764..6d98d3c0 100644
--- a/libcrystfel/src/indexers/pinkindexer.c
+++ b/libcrystfel/src/indexers/pinkindexer.c
@@ -112,7 +112,8 @@ int run_pinkIndexer(struct image *image, void *ipriv)
 		if ( f == NULL ) continue;
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
-		                         f->fs, f->ss, image->lambda, r);
+		                         f->fs, f->ss, image->lambda,
+		                         0.0, 0.0, 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;
diff --git a/libcrystfel/src/indexers/taketwo.c b/libcrystfel/src/indexers/taketwo.c
index 66c0d1cc..1bccf1e0 100644
--- a/libcrystfel/src/indexers/taketwo.c
+++ b/libcrystfel/src/indexers/taketwo.c
@@ -2164,7 +2164,7 @@ int taketwo_index(struct image *image, void *priv)
 
 		detgeom_transform_coords(&image->detgeom->panels[pk->pn],
 		                         pk->fs, pk->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		rlps[n_rlps].u = r[0];
 		rlps[n_rlps].v = r[1];
diff --git a/libcrystfel/src/indexers/xds.c b/libcrystfel/src/indexers/xds.c
index c66f734a..3b2f2b87 100644
--- a/libcrystfel/src/indexers/xds.c
+++ b/libcrystfel/src/indexers/xds.c
@@ -221,7 +221,7 @@ static void write_spot(struct image *image)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		ttx = angle_between_2d(0.0, 1.0,
 		                       r[0], 1.0/image->lambda + r[2]);
diff --git a/libcrystfel/src/indexers/xgandalf.c b/libcrystfel/src/indexers/xgandalf.c
index 04cd6a87..6b09f65c 100644
--- a/libcrystfel/src/indexers/xgandalf.c
+++ b/libcrystfel/src/indexers/xgandalf.c
@@ -101,7 +101,7 @@ int run_xgandalf(struct image *image, void *ipriv)
 
 		detgeom_transform_coords(&image->detgeom->panels[f->pn],
 		                         f->fs, f->ss, image->lambda,
-		                         r);
+		                         0.0, 0.0, r);
 
 		reciprocalPeaks_1_per_A->coordinates_x[reciprocalPeaks_1_per_A->peakCount] = r[0] * 1e-10;
 		reciprocalPeaks_1_per_A->coordinates_y[reciprocalPeaks_1_per_A->peakCount] = r[1] * 1e-10;
-- 
cgit v1.2.3