From d5b1df9996421d5f2af849ee72865a5f886605bc Mon Sep 17 00:00:00 2001
From: Thomas White <taw27@cam.ac.uk>
Date: Wed, 8 Apr 2009 19:55:18 +0100
Subject: mapping.c: whitespace, add a debug line

---
 src/mapping.c | 67 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/mapping.c b/src/mapping.c
index 16dbe34..4ffc57d 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -25,29 +25,29 @@ void mapping_rotate(double x, double y, double z, double *ddx, double *ddy, doub
 
 	double nx, ny, nz;
 	double x_temp, y_temp, z_temp;
-	
+
 	/* First: rotate image clockwise until tilt axis is aligned horizontally. */
 	nx = x*cos(omega) + y*sin(omega);
 	ny = -x*sin(omega) + y*cos(omega);
 	nz = z;
-	
+
 	/* Now, tilt about the x-axis ANTICLOCKWISE around +x, i.e. the "wrong" way.
 		This is because the crystal is rotated in the experiment, not the Ewald sphere. */
-	x_temp = nx; y_temp = ny; z_temp = nz;	
+	x_temp = nx; y_temp = ny; z_temp = nz;
 	nx = x_temp;
 	ny = cos(tilt)*y_temp + sin(tilt)*z_temp;
 	nz = -sin(tilt)*y_temp + cos(tilt)*z_temp;
-	
+
 	/* Finally, reverse the omega rotation to restore the location of the image in 3D space */
-	x_temp = nx; y_temp = ny; z_temp = nz;	
+	x_temp = nx; y_temp = ny; z_temp = nz;
 	nx = x_temp*cos(-omega) + y_temp*sin(-omega);
 	ny = -x_temp*sin(-omega) + y_temp*cos(-omega);
 	nz = z_temp;
-	
+
 	*ddx = nx;
 	*ddy = ny;
 	*ddz = nz;
-	
+
 }
 
 int mapping_map_to_space(ImageFeature *refl, double *ddx, double *ddy, double *ddz, double *twotheta) {
@@ -55,22 +55,22 @@ int mapping_map_to_space(ImageFeature *refl, double *ddx, double *ddy, double *d
 	/* "Input" space */
 	double d, x, y;
 	ImageRecord *imagerecord;
-	
+
 	/* Angular description of reflection */
 	double theta, psi, k;
-	
+
 	/* Reciprocal space */
 	double tilt;
 	double omega;
-	
+
 	double x_temp, y_temp, z_temp;
-	
+
 	imagerecord = refl->parent;
 	x = refl->x - imagerecord->x_centre;	y = refl->y - imagerecord->y_centre;
 	tilt = imagerecord->tilt;
 	omega = imagerecord->omega;
 	k = 1/imagerecord->lambda;
-	
+
 	/* Calculate an angular description of the reflection */
 	if ( imagerecord->fmode == FORMULATION_CLEN ) {
 		x /= imagerecord->resolution;
@@ -87,15 +87,15 @@ int mapping_map_to_space(ImageFeature *refl, double *ddx, double *ddy, double *d
 		return -1;
 	}
 	psi = atan2(y, x);
-	
+
 	x_temp = k*sin(theta)*cos(psi);
 	y_temp = k*sin(theta)*sin(psi);
 	z_temp = k - k*cos(theta);
-	
+
 	mapping_rotate(x_temp, y_temp, z_temp, ddx, ddy, ddz, omega, tilt);
-	
+
 	*twotheta = theta;	/* Radians.  I've used the "wrong" nomenclature above */
-	
+
 	return 0;
 
 }
@@ -105,17 +105,17 @@ int mapping_scale(ImageFeature *refl, double *ddx, double *ddy) {
 	double x, y;
 	ImageRecord *imagerecord;
 	double k;
-	
+
 	imagerecord = refl->parent;
 	x = refl->x - imagerecord->x_centre;
 	y = refl->y - imagerecord->y_centre;
 	k = 1/imagerecord->lambda;
-	
+
 	if ( imagerecord->fmode == FORMULATION_CLEN ) {
 		x /= imagerecord->resolution;
 		y /= imagerecord->resolution;	/* Convert pixels to metres */
 		*ddx = x * k / imagerecord->camera_len;
-		*ddy = y * k / imagerecord->camera_len;	
+		*ddy = y * k / imagerecord->camera_len;
 	} else if (imagerecord->fmode == FORMULATION_PIXELSIZE ) {
 		*ddx = x * imagerecord->pixel_size;
 		*ddy = y * imagerecord->pixel_size;	/* Convert pixels to metres^-1 */
@@ -123,9 +123,9 @@ int mapping_scale(ImageFeature *refl, double *ddx, double *ddy) {
 		fprintf(stderr, "Unrecognised formulation mode in mapping_scale.\n");
 		return -1;
 	}
-	
+
 	return 0;
-	
+
 }
 
 /* Return the length of a 1 nm^-1 scale bar in the given image (in pixels)
@@ -137,7 +137,7 @@ double mapping_scale_bar_length(ImageRecord *image) {
 		case FORMULATION_CLEN : return 1.0e9*image->resolution*image->camera_len*image->lambda;
 		default : fprintf(stderr, "Unrecognised formulation mode in mapping_scale_bar_length.\n");
 	}
-	
+
 	return 0.0;
 
 }
@@ -145,29 +145,31 @@ double mapping_scale_bar_length(ImageRecord *image) {
 void mapping_map_features(ControlContext *ctx) {
 
 	int i;
-	
+
 	/* Create reflection list for measured reflections */
 	if ( ctx->reflectionlist ) reflectionlist_free(ctx->reflectionlist);
 	ctx->reflectionlist = reflectionlist_new();
-	
+
 	printf("MP: Mapping to 3D..."); fflush(stdout);
 	for ( i=0; i<ctx->images->n_images; i++ ) {
-	
+
 		int j;
-		
+
 		/* Iterate over the features in this image */
 		for ( j=0; j<ctx->images->images[i].features->n_features; j++ ) {
-		
+
 			double nx, ny, nz, twotheta;
-			
+
 			if ( !mapping_map_to_space(&ctx->images->images[i].features->features[j],
 											&nx, &ny, &nz, &twotheta) ) {
 				reflection_add(ctx->reflectionlist, nx, ny, nz,
 					ctx->images->images[i].features->features[j].intensity, REFLECTION_NORMAL);
+			} else {
+				printf("Couldn't map\n");
 			}
-			
+
 		}
-		
+
 	}
 	printf("done.\n");
 
@@ -182,12 +184,11 @@ void mapping_adjust_axis(ControlContext *ctx, double offset) {
 							rad2deg(ctx->images->images[i].omega+offset));
 		ctx->images->images[i].omega += offset;
 	}
-	
+
 	mapping_map_features(ctx);
 	if ( ctx->dw ) {
 		displaywindow_update_imagestack(ctx->dw);
 		displaywindow_update(ctx->dw);
 	}
-	
-}
 
+}
-- 
cgit v1.2.3