Changeset 22704

Timestamp:

Feb 26, 2009, 3:45:15 PM (17 years ago)

Author:

Paul Price

Message:

Actually, the HDU is not so important: we don't have a copy function that requires it, yet.

File:

• trunk/psModules/src/concepts/pmConceptsCopy.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConceptsCopy.c

@@ -81 +81 @@
     psMetadata *specs = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
 
-    pmHDU *hdu = pmHDUGetFirst(target); // HDU with camera format
-    if (!hdu) {
-        psError(PS_ERR_UNKNOWN, true, "Can't find HDU for FPA");
-        return false;
-    }
+    pmHDU *hdu = target->hdu;           // Header data unit
+    psMetadata *format = hdu ? hdu->format : NULL; // Camera format
 
     // Copy FPA concepts
-    if (!copyConcepts(target->concepts, source->concepts, specs, target->hdu->format,
+    if (!copyConcepts(target->concepts, source->concepts, specs, format,
                       source, NULL, NULL, dontCopyConceptsFPA)) {
         return false;
@@ -125 +122 @@
     psMetadata *specs = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
     pmHDU *hdu = pmHDUFromChip(target); // Header data unit
-    if (!hdu) {
-        hdu = pmHDUGetFirst(target->parent);
-        if (!hdu) {
-            psError(PS_ERR_UNKNOWN, true, "Can't find HDU for chip");
-            return false;
-        }
-    }
+    psMetadata *format = hdu ? hdu->format : NULL; // Camera format
 
     // Copy chip concepts
-    if (!copyConcepts(target->concepts, source->concepts, specs, hdu->format,
+    if (!copyConcepts(target->concepts, source->concepts, specs, format,
                       source->parent, source, NULL, dontCopyConceptsChip)) {
         return false;
@@ -172 +163 @@
     psMetadata *specs = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
     pmHDU *hdu = pmHDUFromCell(target); // Header data unit
-    if (!hdu) {
-        hdu = pmHDUGetFirst(target->parent->parent);
-        if (!hdu) {
-            psError(PS_ERR_UNKNOWN, true, "Can't find HDU for cell");
-            return false;
-        }
-    }
+    psMetadata *format = hdu ? hdu->format : NULL; // Camera format
 
-    return copyConcepts(target->concepts, source->concepts, specs, hdu->format,
+    return copyConcepts(target->concepts, source->concepts, specs, format,
                         source->parent->parent, source->parent, source, dontCopyConceptsCell);
 }