Changeset 6663 for branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.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/pmConceptsWrite.c (modified) (8 diffs)

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

@@ -132 +132 @@
     if (cell) {
         pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+        if (!hdu) {
+            return false;
+        }
         psMetadata *cameraFormat = hdu->format; // The camera format
         psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator
@@ -145 +148 @@
                 // Formatted version
                 psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, NULL, NULL, cell);
+                if (!formatted) {
+                    continue;
+                }
                 psString nameSource = NULL; // String with the concept name and ".SOURCE" added
                 psStringAppend(&nameSource, "%s.SOURCE", name);
@@ -193 +199 @@
 {
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
@@ -208 +217 @@
                 psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
                 psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+                if (!formatted) {
+                    continue;
+                }
                 if (! compareConcepts(defaultItem, formatted)) {
                     psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera "
@@ -229 +241 @@
 {
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
@@ -249 +264 @@
                 psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
                 psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+                if (!formatted) {
+                    continue;
+                }
                 psList *keywords = psStringSplit(headerItem->data.V, " ,;"); // List of header keywords
                 if (formatted->type == PS_DATA_LIST) {
@@ -289 +307 @@
 {
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
+    if (!hdu) {
+        return false;
+    }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
@@ -311 +332 @@
                 psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
                 psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+                if (!formatted) {
+                    continue;
+                }
 
                 psMetadata *dbLookup = dbItem->data.V; // How to look up the value of interest