Make debug messages optional

1 files changed, 13 insertions, 8 deletions

diff --git a/src/refine.c b/src/refine.c
index 0c20cad..c81161e 100644
--- a/src/refine.c
+++ b/src/refine.c
@@ -36,7 +36,7 @@
 #define NUM_PARAMS 9
 
 /* Refine debug */
-#define REFINE_DEBUG 1
+#define REFINE_DEBUG 0
 
 typedef struct {
 	signed int h;	signed int k;	signed int l;
@@ -126,9 +126,12 @@ static double refine_mean_dev(Deviation *d, int nf, Basis *devcell) {
 		/* Project into original image */
 		dx = xdf*d[f].xx + ydf*d[f].xy + zdf*d[f].xz;
 		dy = xdf*d[f].yx + ydf*d[f].yy + zdf*d[f].yz;
+		if ( REFINE_DEBUG ) printf("%2i %2i %2i dx=%8.5f dy=%8.5f => ",
+						d[f].h, d[f].k, d[f].l, dx/DISPFACTOR, dy/DISPFACTOR);
 		
 		dx -= d[f].dx;
 		dy -= d[f].dy;
+		if ( REFINE_DEBUG ) printf("%8.5f %8.5f\n", dx/DISPFACTOR, dy/DISPFACTOR);
 		
 		fom += sqrt(dx*dx + dy*dy);
 		
@@ -174,7 +177,7 @@ double refine_do_cell(ControlContext *ctx) {
 			if ( ctx->images->images[i].rflist->features[j].partner != NULL ) nf++;
 		}
 		
-		printf("%i features from image %i\n", nf, i);
+		if ( REFINE_DEBUG ) printf("%i features from image %i\n", nf, i);
 		
 	}
 	if ( REFINE_DEBUG ) printf("RF: There are %i partnered features in total\n", nf);
@@ -205,8 +208,8 @@ double refine_do_cell(ControlContext *ctx) {
 			/* Determine the difference vector */
 			dix = rf->partner->x - rf->x;
 			diy = rf->partner->y - rf->y;
-			printf("RF: Feature %3i: %3i %3i %3i dev = %+9.5f %+9.5f px ", j, d[f].h, d[f].k, d[f].l,
-													dix, diy);
+			if ( REFINE_DEBUG ) printf("RF: Feature %3i: %3i %3i %3i dev = %+9.5f %+9.5f px ",
+							j, d[f].h, d[f].k, d[f].l, dix, diy);
 			
 			old_x = rf->partner->x;
 			old_y = rf->partner->y;
@@ -215,7 +218,7 @@ double refine_do_cell(ControlContext *ctx) {
 			mapping_scale(rf->partner, &dx, &dy);
 			rf->partner->x = old_x;
 			rf->partner->y = old_y;
-			printf("=> %+10.5f %+10.5f nm^-1\n", dx/DISPFACTOR, dy/DISPFACTOR);
+			if ( REFINE_DEBUG ) printf("=> %+10.5f %+10.5f nm^-1\n", dx/DISPFACTOR, dy/DISPFACTOR);
 			
 			d[f].dx = dx;
 			d[f].dy = dy;
@@ -237,7 +240,7 @@ double refine_do_cell(ControlContext *ctx) {
 	devcell->a.y =  0.0e9;  devcell->b.y = 0.0e9;  devcell->c.y = 0.0e9;
 	devcell->a.z =  0.0e9;  devcell->b.z = 0.0e9;  devcell->c.z = 0.0e9;
 	mean_dev = refine_mean_dev(d, nf, devcell);
-	printf("Initial mean deviation: %13.8f nm^1\n", mean_dev/DISPFACTOR);
+	if ( REFINE_DEBUG ) printf("Initial mean deviation: %13.8f nm^1\n", mean_dev/DISPFACTOR);
 	
 	/* Determine direction of steepest gradient */
 	devcell_try = malloc(sizeof(Basis));
@@ -278,11 +281,13 @@ double refine_do_cell(ControlContext *ctx) {
 		} else {
 			break;
 		}
-		if ( !(it % 1000) ) printf("After %5i iterations: mean dev = %13.8f nm^1\n", it, mean_dev/DISPFACTOR);
+		if ( REFINE_DEBUG && !(it % 1000) ) {
+			printf("After %5i iterations: mean dev = %13.8f nm^1\n", it, mean_dev/DISPFACTOR);
+		}
 	}
 	free(devcell_try);
 	free(devcell_try_best);
-	printf("Final mean dev (%5i iterations) = %13.8f nm^1\n", it, mean_dev/DISPFACTOR);
+	if ( REFINE_DEBUG ) printf("Final mean dev (%5i iterations) = %13.8f nm^1\n", it, mean_dev/DISPFACTOR);
 	
 	/* Apply the final values to the cell */
 	ctx->cell->a.x += devcell->a.x;	ctx->cell->b.x += devcell->b.x;	ctx->cell->c.x += devcell->c.x;