Changeset 9539 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Oct 13, 2006, 11:22:09 AM (20 years ago)

Author:

Paul Price

Message:

Fixing psLib APIs following clean-up.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -28 +28 @@
 
     bool status = true;                 // Result of MD lookup
-    psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS
+    psMetadata *cells = psMetadataLookupMetadata(&status, format, "CELLS"); // The CELLS
     if (!status || !cells) {
         psError(PS_ERR_IO, true, "Unable to determine CELLS of camera.\n");
@@ -34 +34 @@
     }
 
-    psMetadata *cellData = psMetadataLookupMD(&status, cells, cellName); // The data for the particular cell
+    psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell
     if (!status || !cellData) {
         psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName);
@@ -389 +389 @@
 
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information
+    psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // File information
     if (!mdok || !file) {
         psError(PS_ERR_IO, true, "Unable to find FILE information in camera format configuration.\n");
@@ -427 +427 @@
 
     bool mdok = true;                   // Status from MD lookups
-    psMetadata *components = psMetadataLookupMD(&mdok, camera, "FPA"); // FPA components
+    psMetadata *components = psMetadataLookupMetadata(&mdok, camera, "FPA"); // FPA components
     if (!mdok || !components) {
         psError(PS_ERR_IO, true, "Failed to lookup \"FPA\"");
@@ -475 +475 @@
 
     bool mdok = true;                   // Status from metadata lookups
-    psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
+    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
     if (!mdok || !fileInfo) {
         psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");
@@ -553 +553 @@
     // In cases 2 and 3, the CONTENTS is of type METADATA, and is either a menu (if EXTENSIONS=NONE), or a
     // list of extensions otherwise.
-    psMetadata *contents = psMetadataLookupMD(&mdok, format, "CONTENTS"); // The contents of the FITS file
+    psMetadata *contents = psMetadataLookupMetadata(&mdok, format, "CONTENTS"); // The contents of the FITS file
     if (!mdok || !contents) {
         if (mdok && !contents) {
@@ -775 +775 @@
 
     bool mdok = true;                   // Status from metadata lookups
-    psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
+    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
     if (!mdok || !fileInfo) {
         psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");