Index: trunk/psModules/test/camera/tap_pmHDU.c
===================================================================
--- trunk/psModules/test/camera/tap_pmHDU.c	(revision 14881)
+++ trunk/psModules/test/camera/tap_pmHDU.c	(revision 15987)
@@ -5,14 +5,6 @@
 #include "tap.h"
 #include "pstap.h"
-/*
-    The following psModule functions are tested:
-        pmHDUAlloc()
-        pmHDUReadHeader()
-        pmHDURead()
-        pmHDUReadMask()
-        pmHDUReadWeight()
-        pmHDUWrite()
-        pmHDUWriteMask()
-        pmHDUWriteWeight()
+/* STATUS:
+    All functions are tested.
 */
 
@@ -26,4 +18,5 @@
     psTraceSetLevel("err", 0);
     plan_tests(159);
+
 
     // ----------------------------------------------------------------------
@@ -93,5 +86,8 @@
         hdu->header = psMetadataAlloc();
         psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0);
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format");
+        if (!rc) {
+            rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format");
+	}
         ok(rc == true, "pmConfigFileRead() was successful");
         rc = pmHDUWrite(hdu, NULL);
@@ -105,5 +101,8 @@
     {
         psMemId id = psMemGetId();
-        psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r");
+        psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r");
+        if (!fitsFile) {
+            fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r");
+	}
         ok(fitsFile != NULL, "psFitsOpen() was successful");
         bool rc = pmHDURead(NULL, fitsFile);
@@ -147,5 +146,8 @@
         //    Set hdu->images
         pmHDU *hdu = pmHDUAlloc("extname");
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0");
+        if (!rc) {
+            rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0");
+	}
         ok(rc, "pmConfigFileRead() was successful");
         hdu->images = psArrayAlloc(NUM_HDUS);
@@ -219,5 +221,8 @@
         hdu->header = psMetadataAlloc();
         psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0);
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format");
+        if (!rc) {
+            rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format");
+	}
         ok(rc == true, "pmConfigFileRead() was successful");
         rc = pmHDUWriteWeight(hdu, NULL);
@@ -231,5 +236,8 @@
     {
         psMemId id = psMemGetId();
-        psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r");
+        psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r");
+        if (!fitsFile) {
+            fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r");
+	}
         ok(fitsFile != NULL, "psFitsOpen() was successful");
         bool rc = pmHDUReadWeight(NULL, fitsFile);
@@ -273,5 +281,8 @@
         //    Set hdu->images
         pmHDU *hdu = pmHDUAlloc("extname");
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0");
+        if (!rc) {
+            rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0");
+	}
         ok(rc, "pmConfigFileRead() was successful");
         hdu->weights = psArrayAlloc(NUM_HDUS);
@@ -345,5 +356,8 @@
         hdu->header = psMetadataAlloc();
         psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0);
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format");
+        if (!rc) {
+             pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format");
+	}
         ok(rc == true, "pmConfigFileRead() was successful");
         rc = pmHDUWriteMask(hdu, NULL);
@@ -357,5 +371,8 @@
     {
         psMemId id = psMemGetId();
-        psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r");
+        psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r");
+        if (!fitsFile) {
+            fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r");
+	}
         ok(fitsFile != NULL, "psFitsOpen() was successful");
         bool rc = pmHDUReadMask(NULL, fitsFile);
@@ -399,5 +416,8 @@
         //    Set hdu->images
         pmHDU *hdu = pmHDUAlloc("extname");
-        bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0");
+        bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0");
+        if (!rc) {
+            rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0");
+	}
         ok(rc, "pmConfigFileRead() was successful");
         hdu->masks = psArrayAlloc(NUM_HDUS);
@@ -450,5 +470,8 @@
     {
         psMemId id = psMemGetId();
-        psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r");
+        psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r");
+        if (!fitsFile) {
+            fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r");
+	}
         ok(fitsFile != NULL, "psFitsOpen() was successful");
         bool rc = pmHDUReadHeader(NULL, fitsFile);
@@ -490,6 +513,10 @@
                          "psBool Item", (lcv%2 == 0));
             psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYSTR", PS_DATA_STRING,
-
-            bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format");
+                         "psStr Item", extname);
+
+            bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format");
+            if (!rc) {
+                rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format");
+	    }
             ok(rc == true, "pmConfigFileRead() was successful");
             rc = pmHDUWrite(hdu, fitsFileW);