Changeset 15987 for trunk/psModules/test/camera/tap_pmFPAConstruct.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_pmFPAConstruct.c (modified) (3 diffs)

trunk/psModules/test/camera/tap_pmFPAConstruct.c

@@ -14 +14 @@
     psLogSetLevel(PS_LOG_INFO);
     psTraceSetLevel("err", ERR_TRACE_LEVEL);
-    plan_tests(72);
+    plan_tests(9);
 
     // ----------------------------------------------------------------------
@@ -34 +34 @@
     {
         psMetadata *camera = psMetadataAlloc();
-        bool rc = pmConfigFileRead(&camera, "data/camera0/camera.config", "CAMERA 0 config file");
+        bool rc = pmConfigFileRead(&camera, "dataFiles/camera0/camera.config", "CAMERA 0 config file");
+        if (!rc) {
+             rc = pmConfigFileRead(&camera, "../dataFiles/camera0/camera.config", "CAMERA 0 config file");
+        }
+
         // Generate the pmFPA heirarchy
         psMemId id = psMemGetId();
@@ -44 +48 @@
         }
         bool errorFlag = false;
-        ok(fpa->chips->n == 4, "pmFPAConstruct() set fpa->chips->n (%d)", fpa->chips->n);
+        ok(fpa->chips->n == 2, "pmFPAConstruct() set fpa->chips->n (%d)", fpa->chips->n);
         for (int chipID = 0 ; chipID < fpa->chips->n ; chipID++) {
             pmChip *chip = fpa->chips->data[chipID];