aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2007-02-07 00:43:04 +0000
committertaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2007-02-07 00:43:04 +0000
commit2badf2f6f6ae8cc571cf376ce5885e5df695ee4e (patch)
treeb16faff95989cad4a59e29d2287fe27221b041ef /src
parentf7e64e18e790ba63b8c1b4893a3a630252c22fa7 (diff)
Honour FormulationMode in iterative statistical peak search
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@5 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src')
-rw-r--r--src/itrans.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/itrans.c b/src/itrans.c
index 1b66915..c210645 100644
--- a/src/itrans.c
+++ b/src/itrans.c
@@ -516,7 +516,12 @@ static unsigned int itrans_peaksearch_iterative(int16_t *image, ControlContext *
px = gsl_matrix_get(p,0,i);
py = gsl_matrix_get(p,1,i);
printf("Reflection %d (%lf,%lf)\n",i,px,py);
- reflection_add_from_dp(ctx, (px-ctx->x_centre), (py-ctx->y_centre), tilt_degrees, 1.);
+ if ( ctx->fmode == FORMULATION_PIXELSIZE ) {
+ reflection_add_from_reciprocal(ctx, (px-ctx->x_centre)*ctx->pixel_size, (py-ctx->y_centre)*ctx->pixel_size,
+ tilt_degrees, 1.0);
+ } else {
+ reflection_add_from_dp(ctx, (px-ctx->x_centre), (py-ctx->y_centre), tilt_degrees, 1.0);
+ }
if (ctx->first_image) imagedisplay_mark_point(imagedisplay, (unsigned int)px, (unsigned int)py);
}
gsl_matrix_free(m);