Index: trunk/psModules/src/camera/pmHDUUtils.c
===================================================================
--- trunk/psModules/src/camera/pmHDUUtils.c	(revision 9608)
+++ trunk/psModules/src/camera/pmHDUUtils.c	(revision 9699)
@@ -80,56 +80,70 @@
 }
 
+// Print spaces to indent
+#define INDENT(FILE, LEVEL) \
+{ \
+    for (int i = 0; i < (LEVEL); i++) { \
+        fprintf(FILE, " "); \
+    } \
+}
+
 void pmHDUPrint(FILE *fd, const pmHDU *hdu, int level, bool header)
 {
     PS_ASSERT_PTR_NON_NULL(hdu,);
 
-    #ifndef PS_NO_TRACE
-
+    INDENT(fd, level);
     if (hdu->blankPHU) {
-        psTrace("psModules.camera", level, "HDU: (PHU)\n");
+        fprintf(fd, "HDU: (PHU)\n");
     } else {
-        psTrace("psModules.camera", level, "HDU: %s\n", hdu->extname);
+        fprintf(fd, "HDU: %s\n", hdu->extname);
     }
 
-    psTrace("psModules.camera", level + 1, "Format: %p\n", hdu->format);
+    INDENT(fd, level + 1);
+    fprintf(fd, "Format: %p\n", hdu->format);
     if (header) {
+        INDENT(fd, level + 1);
         if (hdu->header) {
-            psTrace("psModules.camera", level + 1, "Header:\n");
+            fprintf(fd, "Header:\n");
             psMetadataPrint(fd, hdu->header, level + 2);
         } else {
-            psTrace("psModules.camera", level + 1, "No header.\n");
+            fprintf(fd, "No header.\n");
         }
     }
 
+    INDENT(fd, level + 1);
     if (hdu->images) {
-        psTrace("psModules.camera", level + 1, "Images:\n");
+        fprintf(fd, "Images:\n");
         for (long i = 0; i < hdu->images->n; i++) {
             psImage *image = hdu->images->data[i]; // Image of interest
-            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, image->numCols, image->numRows);
+            INDENT(fd, level + 2);
+            fprintf(fd, "%ld: %dx%d\n", i, image->numCols, image->numRows);
         }
     } else {
-        psTrace("psModules.camera", level + 1, "NO images.\n");
+        fprintf(fd, "NO images.\n");
     }
 
+    INDENT(fd, level + 1);
     if (hdu->masks) {
-        psTrace("psModules.camera", level + 1, "Masks:\n");
+        fprintf(fd, "Masks:\n");
         for (long i = 0; i < hdu->masks->n; i++) {
             psImage *mask = hdu->masks->data[i]; // Mask of interest
-            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, mask->numCols, mask->numRows);
+            INDENT(fd, level + 2);
+            fprintf(fd, "%ld: %dx%d\n", i, mask->numCols, mask->numRows);
         }
     } else {
-        psTrace("psModules.camera", level + 1, "NO masks.\n");
+        fprintf(fd, "NO masks.\n");
     }
 
+    INDENT(fd, level + 1);
     if (hdu->weights) {
-        psTrace("psModules.camera", level + 1, "Weights:\n");
+        fprintf(fd, "Weights:\n");
         for (long i = 0; i < hdu->masks->n; i++) {
             psImage *weight = hdu->weights->data[i]; // Weight image of interest
-            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, weight->numCols, weight->numRows);
+            INDENT(fd, level + 2);
+            fprintf(fd, "%ld: %dx%d\n", i, weight->numCols, weight->numRows);
         }
     } else {
-        psTrace("psModules.camera", level + 1, "NO weights.\n");
+        fprintf(fd, "NO weights.\n");
     }
-    #endif
 
     return;