Changeset 6663 for branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

Timestamp:

Mar 21, 2006, 1:52:54 PM (20 years ago)

Author:

Paul Price

Message:

Now works with GPC1 dummy OTA FITS file from Sidik; some other changes to organise things.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

@@ -115 +115 @@
         return false;
     }
-    psString result = psMetadataLookupStr(&mdok, header, keyword);
-    if (!mdok || strlen(result) == 0) {
+    psMetadataItem *resultItem = psMetadataLookup(header, keyword);
+    if (! resultItem) {
         psError(PS_ERR_IO, false, "Unable to find %s in primary header to identify %s.\n", keyword, name);
         return NULL;
     }
-
-    return result;
+    return psMetadataItemParseString(resultItem);
 }
 
@@ -190 +189 @@
     }
     psMetadataItem *fpaNameItem = psMetadataLookup(phu, nameKeyword); // Name of the FPA
+    if (!fpaNameItem) {
+        psError(PS_ERR_IO, false, "Unable to find keyword %s with the name of the FPA.\n", nameKeyword);
+        return NULL;
+    }
     const char *newFPAname = psMetadataItemParseString(fpaNameItem); // FPA.NAME for new source
     fpaNameItem = psMetadataLookup(fpa->concepts, "FPA.NAME"); // Current name of FPA
@@ -421 +424 @@
             psString chipName = NULL;   // Name of chip under consideration
             pmChip *chip = NULL;        // The chip we're looking for
-            if (! fpa->hdu->phu) {
+            #if 1
+            // Think I'm doing this at the start now
+            if (!fpa->hdu || !fpa->hdu->phu) {
                 // Need to look up the name of the chip
                 chipName = phuNameFromHeader("CHIP.NAME", formatSpec, phu);
@@ -431 +436 @@
                 chip = fpa->chips->data[chipNum];
             }
+            #endif
             for (int i = 0; i < names->n; i++) {
                 psString cellType = values->data[i]; // The type of the cell
                 psString cellName = NULL; // The name of the cell
-                if (fpa->hdu->phu) {
+                if (fpa->hdu && fpa->hdu->phu) {
                     // We've got chipName:cellType with cellType == cellName
                     chipName = names->data[i];