Changeset 4386 for trunk/archive/scripts/src/test_pmFPARead.c

Timestamp:

Jun 24, 2005, 3:05:59 PM (21 years ago)

Author:

Paul Price

Message:

Retrieval of concepts seems to be working.

File:

• trunk/archive/scripts/src/test_pmFPARead.c (modified) (2 diffs)

trunk/archive/scripts/src/test_pmFPARead.c

@@ -25 +25 @@
 #endif
 
-    psTraceSetLevel("readMultipleRegions", 0);
-    psTraceSetLevel("portions", 0);
-    psTraceSetLevel("pmFPARead", 10);
-    
+    (void)psTraceSetLevel(".", 10);
+    (void)psTraceSetLevel("readMultipleRegions", 0);
+    (void)psTraceSetLevel("portions", 0);
+    (void)psTraceSetLevel("pmFPARead", 10);
+    (void)psTraceSetLevel("pmFPAfromHeader", 10);
 
     if (argc != 3) {
@@ -34 +35 @@
         exit(EXIT_FAILURE);
     }
-    const char *configName = argv[1];
+    const char *cameraName = argv[1];
     const char *imageName = argv[2];
-        
+
     int badLines = 0;                   // Number of bad lines in camera configuration
-
-    (void)psTraceSetLevel("pmFPAfromHeader", 10);
-
-    psMetadata *camera = psMetadataConfigParse(NULL, &badLines, configName, true); // Camera config
-
+    psMetadata *camera = psMetadataConfigParse(NULL, &badLines, cameraName, true); // Read camera config file
     if (badLines > 0) {
-        printf("%d bad lines encountered while reading %s\n", badLines, configName);
+        psLogMsg(__func__, PS_LOG_WARN, "%d bad lines encountered while reading camera configuration %s\n",
+                 badLines, cameraName);
     }
 
-    printf("Camera information:\n");
-    psMetadataPrint(camera, 0);
-   
     psFits *fits = psFitsAlloc(imageName);
-    papFPA *fpa = pmFPARead(camera, fits);
+    papFPA *fpa = pmFPARead(fits, camera, NULL);
+    (void)pmFPAPrint(fpa);
 
+    printf("Test: %d %d\n", psCellGetValueS32(fpa, "ccd15", "left", "CELL.XPARITY"),
+           psCellGetValueS32(fpa, "ccd15", "right", "CELL.XPARITY"));
+    printf("Test: %d %d\n", psCellGetValueS32(fpa, "ccd15", "left", "CELL.YPARITY"),
+           psCellGetValueS32(fpa, "ccd15", "right", "CELL.YPARITY"));
+    printf("Test: %d %d\n", psCellGetValueS32(fpa, "ccd15", "left", "CELL.YPARITY"),
+           psCellGetValueS32(fpa, "ccd15", "right", "CELL.YPARITY"));
+
+//    (void)pmFPAPrint(fpa);
+
+    // Tidy up
     psMemCheckCorruption(true);