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-stat.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-stat.c')
| -rw-r--r-- | src/itrans-stat.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/itrans-stat.c b/src/itrans-stat.c index f0677d4..7099c8d 100644 --- a/src/itrans-stat.c +++ b/src/itrans-stat.c @@ -495,7 +495,6 @@ unsigned int itrans_peaksearch_stat(ImageRecord imagerecord, ControlContext *ctx gsl_matrix *p; int i; double px,py; - double tilt_degrees = imagerecord.tilt; uint16_t *image = imagerecord.image; m = itrans_peaksearch_stat_createImageMatrix(image, imagerecord.width, imagerecord.height); @@ -505,12 +504,7 @@ unsigned int itrans_peaksearch_stat(ImageRecord imagerecord, ControlContext *ctx px = gsl_matrix_get(p,0,i); py = gsl_matrix_get(p,1,i); - if ( imagerecord.fmode == FORMULATION_PIXELSIZE ) { - reflection_add_from_reciprocal(ctx, (px-imagerecord.x_centre)*imagerecord.pixel_size, (py-imagerecord.y_centre)*imagerecord.pixel_size, - tilt_degrees, 1.0); - } else { - reflection_add_from_dp(ctx, (px-imagerecord.x_centre)/imagerecord.resolution, (py-imagerecord.y_centre)/imagerecord.resolution, tilt_degrees, 1.0); - } + reflection_add_from_dp(ctx, (px-imagerecord.x_centre), (py-imagerecord.y_centre), imagerecord, 1.0); } gsl_matrix_free(m); @@ -519,3 +513,4 @@ unsigned int itrans_peaksearch_stat(ImageRecord imagerecord, ControlContext *ctx return n_reflections; } + |