From 9055e1f2517b0bf867335603198871a604e9a426 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 13 Oct 2008 16:47:05 +0100 Subject: Line wrapping and comments in prealign.{c,h} --- src/prealign.c | 40 ++++++++++++++++++++++++++++------------ src/prealign.h | 4 ++-- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/prealign.c b/src/prealign.c index 2fd5982..cd53cbc 100644 --- a/src/prealign.c +++ b/src/prealign.c @@ -1,9 +1,9 @@ /* * prealign.c * - * Rough initial alignment of images + * Initial alignment of images * - * (c) 2007 Thomas White + * (c) 2007-2008 Thomas White * * dtr - Diffraction Tomography Reconstruction * @@ -88,10 +88,18 @@ void prealign_sum_stack(ImageList *list, int have_centres, int sum_stack) { /* Determine maximum size of image to accommodate, and allocate memory */ mnorth = 0; msouth = 0; mwest = 0; meast = 0; for ( i=0; in_images; i++ ) { - if ( list->images[i].width-list->images[i].x_centre > meast ) meast = list->images[i].width-list->images[i].x_centre; - if ( list->images[i].x_centre > mwest ) mwest = list->images[i].x_centre; - if ( list->images[i].height-list->images[i].y_centre > mnorth ) mnorth = list->images[i].height-list->images[i].y_centre; - if ( list->images[i].y_centre > msouth ) msouth = list->images[i].y_centre; + if ( list->images[i].width-list->images[i].x_centre > meast ) { + meast = list->images[i].width-list->images[i].x_centre; + } + if ( list->images[i].x_centre > mwest ) { + mwest = list->images[i].x_centre; + } + if ( list->images[i].height-list->images[i].y_centre > mnorth ) { + mnorth = list->images[i].height-list->images[i].y_centre; + } + if ( list->images[i].y_centre > msouth ) { + msouth = list->images[i].y_centre; + } } twidth = mwest + meast; theight = mnorth + msouth; @@ -198,7 +206,8 @@ void prealign_fine_centering(ImageList *list, int sum_stack) { mask_x = list->images[i].x_centre; mask_y = list->images[i].y_centre; - while ( (did_something) && (distance(mask_x, mask_y, list->images[i].x_centre, list->images[i].y_centre)<100) ) { + while ( (did_something) && + (distance(mask_x, mask_y, list->images[i].x_centre, list->images[i].y_centre)<100) ) { double nmax, nmask_x, nmask_y; @@ -208,8 +217,12 @@ void prealign_fine_centering(ImageList *list, int sum_stack) { max = list->images[i].image[mask_x+width*mask_y]; did_something = 0; - for ( sy=biggest(mask_y-CENTERING_WINDOW_SIZE/2, 0); syimages[i].image[sx+width*sy] > nmax ) { nmax = list->images[i].image[sx+width*sy]; @@ -236,7 +249,8 @@ void prealign_fine_centering(ImageList *list, int sum_stack) { assert(mask_x>=0); assert(mask_y>=0); - printf("AL: Image %3i: centre offset by %f,%f\n", i, mask_x-list->images[i].x_centre, mask_y-list->images[i].y_centre); + printf("AL: Image %3i: centre offset by %f,%f\n", i, + mask_x-list->images[i].x_centre, mask_y-list->images[i].y_centre); list->images[i].x_centre = mask_x; list->images[i].y_centre = mask_y; @@ -260,8 +274,10 @@ void prealign_feature_centering(ImageList *list) { ImageFeature *feature2; int idx; - feature1 = image_feature_closest(list->images[i].features, list->images[i].x_centre, list->images[i].y_centre, &d1, &idx); - feature2 = image_feature_second_closest(list->images[i].features, list->images[i].x_centre, list->images[i].y_centre, &d2, &idx); + feature1 = image_feature_closest(list->images[i].features, list->images[i].x_centre, + list->images[i].y_centre, &d1, &idx); + feature2 = image_feature_second_closest(list->images[i].features, list->images[i].x_centre, + list->images[i].y_centre, &d2, &idx); printf("AL: Image %i, d1=%f, d2=%f\n", i, d1, d2); diff --git a/src/prealign.h b/src/prealign.h index 105e5c7..bca58fa 100644 --- a/src/prealign.h +++ b/src/prealign.h @@ -1,9 +1,9 @@ /* * prealign.h * - * Rough initial alignment of images + * Initial alignment of images * - * (c) 2007 Thomas White + * (c) 2007-2008 Thomas White * * dtr - Diffraction Tomography Reconstruction * -- cgit v1.2.3