Index: /trunk/psModules/test/astrom/tap_pmAstrometry.c
===================================================================
--- /trunk/psModules/test/astrom/tap_pmAstrometry.c	(revision 21219)
+++ /trunk/psModules/test/astrom/tap_pmAstrometry.c	(revision 21220)
@@ -9,6 +9,6 @@
  *  XXX: Create the pmHDU alloc/free function, test them here
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-19 18:28:38 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-29 19:58:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -53,5 +53,5 @@
 pmFPA* generateSimpleFPA(psMetadata *camera)
 {
-    pmFPA* fpa = pmFPAAlloc(camera);
+    pmFPA* fpa = pmFPAAlloc(camera, cameraName);
     fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
     fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
Index: /trunk/psModules/test/astrom/tap_pmAstrometryWCS.c
===================================================================
--- /trunk/psModules/test/astrom/tap_pmAstrometryWCS.c	(revision 21219)
+++ /trunk/psModules/test/astrom/tap_pmAstrometryWCS.c	(revision 21220)
@@ -43,5 +43,5 @@
         psMetadataAddF32 (header, PS_LIST_TAIL, "PC002002", PS_META_REPLACE, "", 1.0);
 
-        pmFPA *fpa = pmFPAAlloc (NULL);
+        pmFPA *fpa = pmFPAAlloc (NULL, NULL);
         pmChip *chip = pmChipAlloc (NULL, "test");
 
@@ -110,5 +110,5 @@
         psMetadataAddF32 (header, PS_LIST_TAIL, "PC002002", PS_META_REPLACE, "", 1.0);
 
-        pmFPA *fpa = pmFPAAlloc (NULL);
+        pmFPA *fpa = pmFPAAlloc (NULL, NULL);
         pmChip *chip = pmChipAlloc (NULL, "test");
 
Index: /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c
===================================================================
--- /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c	(revision 21219)
+++ /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c	(revision 21220)
@@ -64,5 +64,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -135,5 +135,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -209,5 +209,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -280,5 +280,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -351,5 +351,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -425,5 +425,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -502,5 +502,5 @@
 
     psMetadata *header = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
Index: /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c
===================================================================
--- /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c	(revision 21219)
+++ /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c	(revision 21220)
@@ -62,5 +62,5 @@
 
     psMetadata *header1 = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -153,5 +153,5 @@
     psMetadata *header1 = WriteCoordsToHeader (&coords);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -246,5 +246,5 @@
 
     psMetadata *header1 = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -337,5 +337,5 @@
 
     psMetadata *header1 = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -428,5 +428,5 @@
     psMetadata *header1 = WriteCoordsToHeader (&coords);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -521,5 +521,5 @@
 
     psMetadata *header1 = WriteCoordsToHeader (&coords);
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
Index: /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO4.c
===================================================================
--- /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO4.c	(revision 21219)
+++ /trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO4.c	(revision 21220)
@@ -91,5 +91,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -196,5 +196,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -303,5 +303,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -408,5 +408,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -517,5 +517,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -622,5 +622,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -727,5 +727,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
@@ -834,5 +834,5 @@
     psMetadata *headerMos = WriteCoordsToHeader (&mosaic);
 
-    pmFPA *fpa = pmFPAAlloc (NULL);
+    pmFPA *fpa = pmFPAAlloc (NULL, NULL);
     pmChip *chip = pmChipAlloc (fpa, NULL);
 
Index: /trunk/psModules/test/camera/tap_pmFPA.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPA.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPA.c	(revision 21220)
@@ -99,5 +99,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();
@@ -129,5 +129,5 @@
     {
         psMemId id = psMemGetId();
-        pmFPA* fpa = pmFPAAlloc(NULL);
+        pmFPA* fpa = pmFPAAlloc(NULL, NULL);
         ok(fpa != NULL && psMemCheckFPA(fpa), "pmFPAAlloc() returned a non-NULL pmFPA with a NULL pmCamera input");
         psFree(fpa);
@@ -139,5 +139,5 @@
         psMemId id = psMemGetId();
         psMetadata *camera = psMetadataAlloc();
-        pmFPA* fpa = pmFPAAlloc(camera);
+        pmFPA* fpa = pmFPAAlloc(camera, NULL);
         ok(fpa != NULL, "pmFPAAlloc() returned a non-NULL");
         ok(fpa->fromTPA == NULL, "pmFPAAlloc() set ->fromTPA to NULL");
Index: /trunk/psModules/test/camera/tap_pmFPACellSquish.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPACellSquish.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPACellSquish.c	(revision 21220)
@@ -141,5 +141,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();
Index: /trunk/psModules/test/camera/tap_pmFPACopy.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPACopy.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPACopy.c	(revision 21220)
@@ -116,5 +116,5 @@
 pmFPA* generateSimpleFPASource(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();
@@ -206,5 +206,5 @@
 pmFPA* generateSimpleFPATarget(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();
Index: /trunk/psModules/test/camera/tap_pmFPAExtent.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAExtent.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPAExtent.c	(revision 21220)
@@ -140,5 +140,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();
Index: /trunk/psModules/test/camera/tap_pmFPAFlags.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAFlags.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPAFlags.c	(revision 21220)
@@ -163,5 +163,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();
Index: /trunk/psModules/test/camera/tap_pmFPAHeader.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAHeader.c	(revision 21219)
+++ /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
Index: /trunk/psModules/test/camera/tap_pmFPAMaskW.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAMaskW.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPAMaskW.c	(revision 21220)
@@ -152,5 +152,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();
Index: /trunk/psModules/test/camera/tap_pmFPAUtils.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAUtils.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPAUtils.c	(revision 21220)
@@ -134,5 +134,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();
Index: /trunk/psModules/test/camera/tap_pmFPAView.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmFPAView.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmFPAView.c	(revision 21220)
@@ -146,5 +146,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();
Index: /trunk/psModules/test/camera/tap_pmHDU.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmHDU.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmHDU.c	(revision 21220)
@@ -73,10 +73,9 @@
         psFree(header);
         psFree(image);
-        bool rc = pmHDUWrite(NULL, fitsFile);
+        bool rc = pmHDUWrite(NULL, fitsFile, NULL);
         ok(rc == false, "pmHDUWrite() returned FALSE with NULL psHDU as input");
         psFitsClose(fitsFile);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
-
 
     // Test pmHDUWrite() with NULL psFits input argument
@@ -91,10 +90,9 @@
 	}
         ok(rc == true, "pmConfigFileRead() was successful");
-        rc = pmHDUWrite(hdu, NULL);
+        rc = pmHDUWrite(hdu, NULL, NULL);
         ok(rc == false, "pmHDUWrite() returned FALSE with NULL psFits file as input");
         psFree(hdu);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
-
 
     // Test pmHDURead() with NULL pmHDU input argument
@@ -157,5 +155,5 @@
 	}
         // 3. Use pmHDUWrite() to write that header to the FITS file
-        rc = pmHDUWrite(hdu, fitsFileW);
+        rc = pmHDUWrite(hdu, fitsFileW, NULL);
         ok(rc == true, "pmHDUWrite() returned TRUE");
         // 4. Close the FITS file, free memory
@@ -208,5 +206,5 @@
         psFree(header);
         psFree(image);
-        bool rc = pmHDUWriteWeight(NULL, fitsFile);
+        bool rc = pmHDUWriteWeight(NULL, fitsFile, NULL);
         ok(rc == false, "pmHDUWriteWeight() returned FALSE with NULL psHDU as input");
         psFitsClose(fitsFile);
@@ -226,5 +224,5 @@
 	}
         ok(rc == true, "pmConfigFileRead() was successful");
-        rc = pmHDUWriteWeight(hdu, NULL);
+        rc = pmHDUWriteWeight(hdu, NULL, NULL);
         ok(rc == false, "pmHDUWriteWeight    () returned FALSE with NULL psFits file as input");
         psFree(hdu);
@@ -292,5 +290,5 @@
 	}
         // 3. Use pmHDUWriteWeight() to write that header to the FITS file
-        rc = pmHDUWriteWeight(hdu, fitsFileW);
+        rc = pmHDUWriteWeight(hdu, fitsFileW, NULL);
         ok(rc == true, "pmHDUWriteWeight() returned TRUE");
         // 4. Close the FITS file, free memory
@@ -343,5 +341,5 @@
         psFree(header);
         psFree(image);
-        bool rc = pmHDUWriteMask(NULL, fitsFile);
+        bool rc = pmHDUWriteMask(NULL, fitsFile, NULL);
         ok(rc == false, "pmHDUWriteMask() returned FALSE with NULL psHDU as input");
         psFitsClose(fitsFile);
@@ -361,5 +359,5 @@
 	}
         ok(rc == true, "pmConfigFileRead() was successful");
-        rc = pmHDUWriteMask(hdu, NULL);
+        rc = pmHDUWriteMask(hdu, NULL, NULL);
         ok(rc == false, "pmHDUWriteMask() returned FALSE with NULL psFits file as input");
         psFree(hdu);
@@ -427,5 +425,5 @@
 	}
         // 3. Use pmHDUWriteMask() to write that header to the FITS file
-        rc = pmHDUWriteMask(hdu, fitsFileW);
+        rc = pmHDUWriteMask(hdu, fitsFileW, NULL);
         ok(rc == true, "pmHDUWriteMask() returned TRUE");
         // 4. Close the FITS file, free memory
@@ -520,5 +518,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);
Index: /trunk/psModules/test/camera/tap_pmHDUUtils.c
===================================================================
--- /trunk/psModules/test/camera/tap_pmHDUUtils.c	(revision 21219)
+++ /trunk/psModules/test/camera/tap_pmHDUUtils.c	(revision 21220)
@@ -143,5 +143,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();