diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-26 17:13:46 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-26 17:13:46 +0000 |
| commit | b419ab4428ff4fa0d58354abe6f2a953b9e236ee (patch) | |
| tree | d9c6115485bdba34900717f6f2e7a66aaf487aa8 /src/itrans-lsq.c | |
| parent | 4930a9088b8a13195a7038e9606e1a857fd6883f (diff) | |
Beginnings of a new initial basis choice (needs fixing)
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@131 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/itrans-lsq.c')
| -rw-r--r-- | src/itrans-lsq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/itrans-lsq.c b/src/itrans-lsq.c index baac6b6..cdc2a5c 100644 --- a/src/itrans-lsq.c +++ b/src/itrans-lsq.c @@ -129,16 +129,16 @@ static void itrans_interpolate(uint16_t *image, int width, int x, int y) { } -unsigned int itrans_peaksearch_lsq(ImageRecord imagerecord, ControlContext *ctx, double tilt_degrees, ImageDisplay *imagedisplay) { +unsigned int itrans_peaksearch_lsq(ImageRecord *imagerecord, ControlContext *ctx, double tilt_degrees, ImageDisplay *imagedisplay) { uint16_t max_val = 0; int width, height; uint16_t *image; unsigned int n_reflections = 0; - width = imagerecord.width; - height = imagerecord.height; - image = imagerecord.image; + width = imagerecord->width; + height = imagerecord->height; + image = imagerecord->image; /* Least-Squares Craziness. NB Doesn't quite work... */ do { @@ -262,7 +262,7 @@ unsigned int itrans_peaksearch_lsq(ImageRecord imagerecord, ControlContext *ctx, printf("Fit converged after %i iterations: Centre %3i,%3i, a=%f b=%f c=%f d=%f e=%f f=%f\n", iter, x, y, ga, gb, gc, gd, ge, gf); brightness = image[x + width*y]; - reflection_add_from_dp(ctx, (x-imagerecord.x_centre), (y-imagerecord.y_centre), imagerecord, brightness); + reflection_add_from_dp(ctx, (x-imagerecord->x_centre), (y-imagerecord->y_centre), imagerecord, brightness); n_reflections++; /* Remove this peak from the image */ |