Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmConcepts.c

Timestamp:

Mar 8, 2006, 5:08:08 PM (20 years ago)

Author:

Paul Price

Message:

Broad changes to introduce pmHDU, and allow read/write at any level. Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

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

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

@@ -154 +154 @@
             }
         }
-        psMetadataAddItem(target, conceptItem, PS_LIST_TAIL, PS_META_REPLACE);
-        psFree(conceptItem);            // Drop reference
+        if (conceptItem) {
+            psMetadataAddItem(target, conceptItem, PS_LIST_TAIL, PS_META_REPLACE);
+            psFree(conceptItem);        // Drop reference
+        }
+        // No error if conceptItem is NULL, since that may only mean that the required information isn't
+        // present yet.
     }
     psFree(specsIter);
@@ -537 +541 @@
 {
     // Copy FPA concepts
-    target->concepts = pap_psMetadataCopy(target->concepts, source->concepts);
+    target->concepts = psMetadataCopy(target->concepts, source->concepts);
 
     // Copy chip concepts
@@ -553 +557 @@
             continue;
         }
-        targetChip->concepts = pap_psMetadataCopy(targetChip->concepts, sourceChip->concepts);
+        targetChip->concepts = psMetadataCopy(targetChip->concepts, sourceChip->concepts);
 
         // Copy cell concepts
@@ -569 +573 @@
                 continue;
             }
-            targetCell->concepts = pap_psMetadataCopy(targetCell->concepts, sourceCell->concepts);
+            targetCell->concepts = psMetadataCopy(targetCell->concepts, sourceCell->concepts);
         }
     }