diff options
author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-08-30 12:14:32 +0000 |
---|---|---|
committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-08-30 12:14:32 +0000 |
commit | e9a2b408c139a17e431dfb84384edd62a2ead7e3 (patch) | |
tree | 3bac693f8b773553f29456973dd77317378c6e8f /src/itrans-zaefferer.c | |
parent | 0126d58f87dae943396f3701d83ccb1686143568 (diff) |
Merge the two reflection_add routines for different formulations
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@95 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/itrans-zaefferer.c')
-rw-r--r-- | src/itrans-zaefferer.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/itrans-zaefferer.c b/src/itrans-zaefferer.c index 1454fd4..c6e7b39 100644 --- a/src/itrans-zaefferer.c +++ b/src/itrans-zaefferer.c @@ -82,14 +82,8 @@ unsigned int itrans_peaksearch_zaefferer(ImageRecord imagerecord, ControlContext } if ( !did_something ) { - if ( imagerecord.fmode == FORMULATION_PIXELSIZE ) { - reflection_add_from_reciprocal(ctx, (signed)(mask_x-imagerecord.x_centre)*imagerecord.pixel_size, - (signed)(mask_y-imagerecord.y_centre)*imagerecord.pixel_size, - tilt_degrees, image[mask_x + width*mask_y]); - } else { - reflection_add_from_dp(ctx, (signed)(mask_x-imagerecord.x_centre)/imagerecord.resolution, (signed)(mask_y-imagerecord.y_centre)/imagerecord.resolution, - tilt_degrees, image[mask_x + width*mask_y]); - } + reflection_add_from_dp(ctx, ((double)mask_x-imagerecord.x_centre), ((double)mask_y-imagerecord.y_centre), + imagerecord, image[mask_x + width*mask_y]); n_reflections++; } |