Index: trunk/psModules/test/camera/tap_pmFPAHeader.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAHeader.c	(revision 16008)
+++ trunk/psModules/test/camera/tap_pmFPAHeader.c	(revision 21220)
@@ -142,5 +142,5 @@
 pmFPA* generateSimpleFPA(psMetadata *camera)
 {
-    pmFPA* fpa = pmFPAAlloc(camera);
+    pmFPA* fpa = pmFPAAlloc(camera, NULL);
     fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
     fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
@@ -181,5 +181,5 @@
         ok(chip != NULL, "Allocated a pmChip successfully");
         ok(cell != NULL, "Allocated a pmCell successfully");
-        ok(!pmCellReadHeader(cell, NULL), "pmCellReadHeader(cell, NULL) returned FALSE");
+        ok(!pmCellReadHeader(cell, NULL, NULL), "pmCellReadHeader(cell, NULL) returned FALSE");
         psFree(fpa);
         psFree(camera);
@@ -193,5 +193,5 @@
         psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
         ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
-        ok(!pmCellReadHeader(NULL, fitsFileW), "pmCellReadHeader(NULL, fitsFile) returned FALSE");
+        ok(!pmCellReadHeader(NULL, fitsFileW, NULL), "pmCellReadHeader(NULL, fitsFile) returned FALSE");
         psFree(fitsFileW);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -225,5 +225,5 @@
 	    }
             ok(rc == true, "pmConfigFileRead() was successful");
-            rc = pmHDUWrite(hdu, fitsFileW);
+            rc = pmHDUWrite(hdu, fitsFileW, NULL);
             ok(rc == true, "pmHDUWrite() successfully wrote the header");
             psFree(hdu);
@@ -242,5 +242,5 @@
         ok(cell != NULL, "Allocated a pmCell successfully");
 
-        ok(pmCellReadHeader(cell, fitsFileR), "pmCellReadHeader() returned TRUE with acceptable data");
+        ok(pmCellReadHeader(cell, fitsFileR, NULL), "pmCellReadHeader() returned TRUE with acceptable data");
 
         // XXX: It's not clear if we should test if the HDU and pmConcepts actually
@@ -266,5 +266,5 @@
         ok(chip != NULL, "Allocated a pmChip successfully");
         ok(cell != NULL, "Allocated a pmCell successfully");
-        ok(!pmChipReadHeader(chip, NULL), "pmChipReadHeader(chip, NULL) returned FALSE");
+        ok(!pmChipReadHeader(chip, NULL, NULL), "pmChipReadHeader(chip, NULL) returned FALSE");
         psFree(fpa);
         psFree(camera);
@@ -278,5 +278,5 @@
         psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
         ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
-        ok(!pmChipReadHeader(NULL, fitsFileW), "pmChipReadHeader(NULL, fitsFile) returned FALSE");
+        ok(!pmChipReadHeader(NULL, fitsFileW, NULL), "pmChipReadHeader(NULL, fitsFile) returned FALSE");
         psFree(fitsFileW);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -311,5 +311,5 @@
 	    }
             ok(rc == true, "pmConfigFileRead() was successful");
-            rc = pmHDUWrite(hdu, fitsFileW);
+            rc = pmHDUWrite(hdu, fitsFileW, NULL);
             ok(rc == true, "pmHDUWrite() successfully wrote the header");
             psFree(hdu);
@@ -337,5 +337,5 @@
 	}
 
-        ok(pmChipReadHeader(chip, fitsFileR), "pmChipReadHeader() returned TRUE with acceptable data");
+        ok(pmChipReadHeader(chip, fitsFileR, NULL), "pmChipReadHeader() returned TRUE with acceptable data");
 
 
@@ -362,5 +362,5 @@
         ok(chip != NULL, "Allocated a pmChip successfully");
         ok(cell != NULL, "Allocated a pmCell successfully");
-        ok(!pmFPAReadHeader(fpa, NULL), "pmFPAReadHeader(fpa, NULL) returned FALSE");
+        ok(!pmFPAReadHeader(fpa, NULL, NULL), "pmFPAReadHeader(fpa, NULL) returned FALSE");
         psFree(fpa);
         psFree(camera);
@@ -374,5 +374,5 @@
         psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
         ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
-        ok(!pmFPAReadHeader(NULL, fitsFileW), "pmFPAReadHeader(NULL, fitsFile) returned FALSE");
+        ok(!pmFPAReadHeader(NULL, fitsFileW, NULL), "pmFPAReadHeader(NULL, fitsFile) returned FALSE");
         psFree(fitsFileW);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -407,5 +407,5 @@
 	    }
             ok(rc == true, "pmConfigFileRead() was successful");
-            rc = pmHDUWrite(hdu, fitsFileW);
+            rc = pmHDUWrite(hdu, fitsFileW, NULL);
             ok(rc == true, "pmHDUWrite() successfully wrote the header");
             psFree(hdu);
@@ -435,5 +435,5 @@
         fpa->hdu = pmHDUAlloc(extname);
 
-        ok(pmFPAReadHeader(fpa, fitsFileR), "pmFPAReadHeader() returned TRUE with acceptable data");
+        ok(pmFPAReadHeader(fpa, fitsFileR, NULL), "pmFPAReadHeader() returned TRUE with acceptable data");
 
         // XXX: It's not clear if we should test if the HDU and pmConcepts actually