Index: trunk/psModules/test/camera/tap_pmFPAReadWrite.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAReadWrite.c	(revision 14549)
+++ trunk/psModules/test/camera/tap_pmFPAReadWrite.c	(revision 14882)
@@ -12,5 +12,4 @@
 // XXX: For the genSimpleFPA() code, add IDs to each function so that
 // the values set in each chip-?cell-?hdu-?image are unique
-// XXX: For the genSimpleFPA() code, write masks and weights as well
 
 #define CHIP_ALLOC_NAME		"ChipName"
@@ -674,8 +673,8 @@
         // XXX: chipID should be cellID
         for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-            if (VERBOSE) printf("Reading cell %d\n", chipID);
+            if (VERBOSE) diag("Reading cell %d\n", chipID);
             pmCell *cell = (pmCell *) chip->cells->data[chipID];
             for (int k = 0 ; k < cell->hdu->images->n ; k++) {
-                if (VERBOSE) printf("Cool: image %d\n", k);
+                if (VERBOSE) diag("Cool: image %d\n", k);
                 psImage *img = cell->hdu->images->data[k];
                 for (int i = 0 ; i < img->numRows ; i++) {
@@ -794,8 +793,8 @@
         // XXX: chipID should be cellID
         for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-            if (VERBOSE) printf("Reading cell %d\n", chipID);
+            if (VERBOSE) diag("Reading cell %d\n", chipID);
             pmCell *cell = (pmCell *) chip->cells->data[chipID];
             for (int k = 0 ; k < cell->hdu->weights->n ; k++) {
-                if (VERBOSE) printf("Cool: image %d\n", k);
+                if (VERBOSE) diag("Cool: image %d\n", k);
                 psImage *wgt = cell->hdu->weights->data[k];
                 for (int i = 0 ; i < wgt->numRows ; i++) {
@@ -865,8 +864,8 @@
         // XXX: chipID should be cellID
         for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-            if (VERBOSE) printf("Reading cell %d\n", chipID);
+            if (VERBOSE) diag("Reading cell %d\n", chipID);
             pmCell *cell = (pmCell *) chip->cells->data[chipID];
             for (int k = 0 ; k < cell->hdu->masks->n ; k++) {
-                if (VERBOSE) printf("Cool: image %d\n", k);
+                if (VERBOSE) diag("Cool: image %d\n", k);
                 psImage *msk = cell->hdu->masks->data[k];
                 for (int i = 0 ; i < msk->numRows ; i++) {
@@ -986,8 +985,8 @@
             pmChip *chip = fpa->chips->data[fpaID];
             for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-                if (VERBOSE) printf("Reading cell %d\n", chipID);
+                if (VERBOSE) diag("Reading cell %d\n", chipID);
                 pmCell *cell = (pmCell *) chip->cells->data[chipID];
                 for (int k = 0 ; k < cell->hdu->images->n ; k++) {
-                    if (VERBOSE) printf("Cool: image %d\n", k);
+                    if (VERBOSE) diag("Cool: image %d\n", k);
                     psImage *img = cell->hdu->images->data[k];
                     for (int i = 0 ; i < img->numRows ; i++) {
@@ -1108,8 +1107,8 @@
             pmChip *chip = fpa->chips->data[fpaID];
             for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-                if (VERBOSE) printf("Reading cell %d\n", chipID);
+                if (VERBOSE) diag("Reading cell %d\n", chipID);
                 pmCell *cell = (pmCell *) chip->cells->data[chipID];
                 for (int k = 0 ; k < cell->hdu->weights->n ; k++) {
-                    if (VERBOSE) printf("Cool: image %d\n", k);
+                    if (VERBOSE) diag("Cool: image %d\n", k);
                     psImage *wgt = cell->hdu->weights->data[k];
                     for (int i = 0 ; i < wgt->numRows ; i++) {
@@ -1230,8 +1229,8 @@
             pmChip *chip = fpa->chips->data[fpaID];
             for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) {
-                if (VERBOSE) printf("Reading cell %d\n", chipID);
+                if (VERBOSE) diag("Reading cell %d\n", chipID);
                 pmCell *cell = (pmCell *) chip->cells->data[chipID];
                 for (int k = 0 ; k < cell->hdu->masks->n ; k++) {
-                    if (VERBOSE) printf("Cool: image %d\n", k);
+                    if (VERBOSE) diag("Cool: image %d\n", k);
                     psImage *msk = cell->hdu->masks->data[k];
                     for (int i = 0 ; i < msk->numRows ; i++) {
@@ -1256,4 +1255,2 @@
 }
 
-
-//HERE