Changeset 15987 for trunk/psModules/test/camera/tap_pmHDU.c

Timestamp:

Jan 2, 2008, 10:53:30 AM (19 years ago)

Author:

gusciora

Message:

Modified file reads to look for dataFiles and then ../dataFiles.
Other additions as well.
First version: tap_pmReadoutFake.c
First version: tap_pmReadoutStack.c

File:

• trunk/psModules/test/camera/tap_pmHDU.c (modified) (13 diffs)

trunk/psModules/test/camera/tap_pmHDU.c

@@ -5 +5 @@
 #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 +18 @@
     psTraceSetLevel("err", 0);
     plan_tests(159);
+
 
     // ----------------------------------------------------------------------
@@ -93 +86 @@
         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 +101 @@
     {
         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 +146 @@
         //    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 +221 @@
         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 +236 @@
     {
         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 +281 @@
         //    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 +356 @@
         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 +371 @@
     {
         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 +416 @@
         //    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 +470 @@
     {
         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 +513 @@
                          "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);