From 6eeb3d408255abf9330dd8c59953e5f7a960733c Mon Sep 17 00:00:00 2001
From: Thomas White <taw27@cam.ac.uk>
Date: Wed, 5 Nov 2008 12:14:05 +0000
Subject: Line wrapping and tidy-up in itrans-zaefferer.c

---
 src/itrans-zaefferer.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/itrans-zaefferer.c b/src/itrans-zaefferer.c
index 79e2468..f0eec9e 100644
--- a/src/itrans-zaefferer.c
+++ b/src/itrans-zaefferer.c
@@ -3,7 +3,7 @@
  *
  * Zaefferer peak search
  *
- * (c) 2007 Thomas White <taw27@cam.ac.uk>
+ * (c) 2007-2008 Thomas White <taw27@cam.ac.uk>
  *
  *  dtr - Diffraction Tomography Reconstruction
  *
@@ -65,26 +65,40 @@ ImageFeatureList *itrans_peaksearch_zaefferer(ImageRecord *imagerecord) {
 				mask_y = y;
 				
 				while ( (did_something) && (distance(mask_x, mask_y, x, y)<50) ) {
+				
 					max = image[mask_x+width*mask_y];
 					did_something = 0;
-					for ( sy=biggest(mask_y-PEAK_WINDOW_SIZE/2, 0); sy<smallest(mask_y+PEAK_WINDOW_SIZE/2, height); sy++ ) {
-						for ( sx=biggest(mask_x-PEAK_WINDOW_SIZE/2, 0); sx<smallest(mask_x+PEAK_WINDOW_SIZE/2, width); sx++ ) {
+					
+					for ( sy=biggest(mask_y-PEAK_WINDOW_SIZE/2, 0);
+					      sy<smallest(mask_y+PEAK_WINDOW_SIZE/2, height);
+					      sy++ ) {
+					      
+						for ( sx=biggest(mask_x-PEAK_WINDOW_SIZE/2, 0);
+						      sx<smallest(mask_x+PEAK_WINDOW_SIZE/2, width);
+						      sx++ ) {
+						      
 							if ( image[sx+width*sy] > max ) {
 								max = image[sx+width*sy];
 								mask_x = sx;
 								mask_y = sy;
 								did_something = 1;
 							}
+							
 						}
+						
 					}
+					
 				}
 				
 				if ( !did_something ) {
+				
 					assert(mask_x<width);
 					assert(mask_y<height);
 					assert(mask_x>=0);
 					assert(mask_y>=0);
-					image_add_feature(flist, mask_x, mask_y, imagerecord, image[mask_x + width*mask_y]);
+					image_add_feature(flist, mask_x, mask_y, imagerecord,
+								image[mask_x + width*mask_y]);
+				
 				}
 				
 			}
-- 
cgit v1.2.3