Changeset 7469

Timestamp:

Jun 9, 2006, 3:55:20 PM (20 years ago)

Author:

Paul Price

Message:

Was having trouble reading and writing concepts at different levels. Added 'propagateUp' and 'propagateDown' flags to the pmConceptsRead and pmConceptsWrite functions so we can read up and down the hierarchy. For example, when you read a header at the chip level, it may be a PHU so that you want the FPA to also read concepts from it if it doesn't have its own HDU, and you want the cell to read concepts from it if it doesn't have its own HDU. But if I add a PHU, I only want to propagate upwards, because the downwards propagation will occur when I read the header lower down.

Location:

trunk/psModules/src

Files:

• camera/pmFPAConstruct.c (modified) (4 diffs)
• camera/pmFPAHeader.c (modified) (3 diffs)
• camera/pmFPARead.c (modified) (5 diffs)
• camera/pmFPAWrite.c (modified) (2 diffs)
• concepts/pmConcepts.c (modified) (12 diffs)
• concepts/pmConcepts.h (modified) (3 diffs)
• concepts/pmConceptsWrite.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -138 +138 @@
     fpa->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL)) {
+    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, false, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
         success = false;
@@ -164 +164 @@
     chip->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, false, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
         success = false;
@@ -299 +299 @@
         }
 
-        if (!pmConceptsReadChip(newChip, PM_CONCEPT_SOURCE_DEFAULTS, false, NULL)) {
+        if (!pmConceptsReadChip(newChip, PM_CONCEPT_SOURCE_DEFAULTS, false, false, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for chip %s\n",
                     chipName);
@@ -751 +751 @@
     psFree(contentsIter);
 
-    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from defaults for FPA %s.  Attempting to "
                 "proceed anyway.\n", currentFPAname);

trunk/psModules/src/camera/pmFPAHeader.c

@@ -6 +6 @@
 #include "pmConcepts.h"
 #include "pmFPAHeader.h"
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// File-static (private) functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Read concepts for all cells in a chip
-static bool chipConcepts(pmChip *chip   // The chip for which to read the concepts
-                        )
-{
-    assert(chip);
-
-    bool status = true;                 // Status of concept reading
-    status |= pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, false, NULL);
-    psArray *cells = chip->cells;       // The cells
-    for (int i = 0; i < cells->n; i++) {
-        pmCell *cell = cells->data[i];  // The cell of interest
-        if (!cell) {
-            continue;
-        }
-        status |= pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
-    }
-
-    return status;
-}
-
-// Read concepts for all chips in an FPA
-static bool fpaConcepts(pmFPA *fpa   // The FPA for which to read the concepts
-                       )
-{
-    assert(fpa);
-
-    bool status = true;                 // Status of concept reading
-    status |= pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
-    psArray *chips = fpa->chips;        // The chips
-    for (int i = 0; i < chips->n; i++) {
-        pmChip *chip = chips->data[i];  // The chip of interest
-        if (!chip) {
-            continue;
-        }
-        status |= chipConcepts(chip);
-    }
-
-    return status;
-}
-
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -90 +45 @@
     }
 
-    if (!chipConcepts(chip)) {
+    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n");
         return false;
@@ -114 +69 @@
     }
 
-    if (!fpaConcepts(fpa)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n");
         return false;

trunk/psModules/src/camera/pmFPARead.c

@@ -183 +183 @@
 
     // Make sure we have the information we need
-    pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS,
-                       false, NULL);
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
+                            PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
+        psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");
+        return false;
+    }
 
     // Get the trim and bias sections
@@ -322 +325 @@
     }
 
-    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL)) {
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
         return false;
@@ -354 +357 @@
     }
 
-    pmCellSetDataStatus (cell, true);
+    pmCellSetDataStatus(cell, true);
     return true;
 }
@@ -374 +377 @@
     }
     if (success) {
-        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, false, NULL);
+        if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
+            psError(PS_ERR_IO, false, "Failed to read concepts for FPA.\n");
+            return false;
+        }
         // XXX probably could just use chip->data_exists
-        pmChipSetDataStatus (chip, true);
+        pmChipSetDataStatus(chip, true);
     }
 
@@ -398 +404 @@
     }
     if (success) {
-        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
+        if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+            psError(PS_ERR_IO, false, "Failed to read concepts for FPA.\n");
+            return false;
+        }
     } else {
         psError(PS_ERR_UNKNOWN, false, "Unable to read any chips in FPA");

trunk/psModules/src/camera/pmFPAWrite.c

@@ -136 +136 @@
             (pixels && (hdu->images || (!hdu->images && pmHDUGenerateForChip(chip) && hdu->images)))) { // Data
         success &= pmConceptsWriteChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
-                                       PM_CONCEPT_SOURCE_DEFAULTS, false, NULL);
+                                       PM_CONCEPT_SOURCE_DEFAULTS, false, true, NULL);
         success &= pmHDUWrite(hdu, fits);
     }
@@ -177 +177 @@
             (pixels && (hdu->images || (!hdu->images && pmHDUGenerateForFPA(fpa) && hdu->images)))) { // Data
         success &= pmConceptsWriteFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
-                                      PM_CONCEPT_SOURCE_DEFAULTS, NULL);
+                                      PM_CONCEPT_SOURCE_DEFAULTS, true, NULL);
         success &= pmHDUWrite(hdu, fits);
     }

trunk/psModules/src/concepts/pmConcepts.c

@@ -189 +189 @@
     }
 
+    psTrace(__func__, 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
+
     if (source & PM_CONCEPT_SOURCE_CAMERA) {
         pmConceptsWriteToCamera(*specs, cell, concepts);
@@ -218 +220 @@
 bool pmConceptsReadFPA(pmFPA *fpa,      // FPA for which to read concepts
                        pmConceptSource source, // The source of the concepts to read
-                       psDB *db         // Database handle
+                       bool propagateDown, // Propagate to lower levels?
+                       psDB *db        // Database handle
                       )
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
+    bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
+    if (propagateDown) {
+        psArray *chips = fpa->chips;    // Array of chips
+        for (long i = 0; i < chips->n; i++) {
+            pmChip *chip = chips->data[i]; // Chip of interest
+            if (chip && !chip->hdu) {
+                success |= pmConceptsReadChip(chip, source, false, true, db);
+            }
+        }
+    }
+
+    return success;
 }
 
@@ -229 +243 @@
 bool pmConceptsWriteFPA(pmFPA *fpa,     // FPA for which to write concepts
                         pmConceptSource source, // The source of the concepts to read
+                        bool propagateDown, // Propagate to lower levels?
                         psDB *db        // Database handle
                        )
@@ -234 +249 @@
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    if (propagateDown) {
+        psArray *chips = fpa->chips;        // Array of chips
+        for (long i = 0; i < chips->n; i++) {
+            pmChip *chip = chips->data[i];  // Chip of interest
+            if (chip && !chip->hdu) {
+                success |= pmConceptsWriteChip(chip, source, false, true, db);
+            }
+        }
+    }
+    return success;
 }
 
@@ -249 +274 @@
 bool pmConceptsReadChip(pmChip *chip,   // Chip for which to read concepts
                         pmConceptSource source, // The source of the concepts to read
-                        bool propagate, // Propagate to higher levels as well?
+                        bool propagateUp, // Propagate to higher levels?
+                        bool propagateDown, // Propagate to lower levels?
                         psDB *db        // Database handle
                        )
@@ -256 +282 @@
     psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db, chip->concepts) &&
-           ((propagate && conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source, db,
-                                       fpa->concepts)) ||
-            !propagate);
+    bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
+                                chip->concepts);
+    if (propagateUp && !fpa->hdu) {
+        success |= conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
+    }
+    if (propagateDown) {
+        psArray *cells = chip->cells;        // Array of cells
+        for (long i = 0; i < cells->n; i++) {
+            pmCell *cell = cells->data[i];  // Cell of interest
+            if (cell && !cell->hdu) {
+                success |= pmConceptsReadCell(cell, source, false, db);
+            }
+        }
+    }
+    return success;
 }
 
@@ -265 +302 @@
 bool pmConceptsWriteChip(pmChip *chip,  // Chip for which to write concepts
                          pmConceptSource source, // The source of the concepts to read
-                         bool propagate,// Propagate to higher levels as well?
+                         bool propagateUp, // Propagate to higher levels?
+                         bool propagateDown, // Propagate to lower levels?
                          psDB *db        // Database handle
                         )
@@ -272 +310 @@
     psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts) &&
-           ((propagate && conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts)) ||
-            !propagate);
+    bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
+    if (propagateUp && !fpa->hdu) {
+        success |= conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts);
+    }
+    if (propagateDown) {
+        psArray *cells = chip->cells;        // Array of cells
+        for (long i = 0; i < cells->n; i++) {
+            pmCell *cell = cells->data[i];  // Cell of interest
+            if (cell && !cell->hdu) {
+                success |= pmConceptsWriteCell(cell, source, false, db);
+            }
+        }
+    }
+    return success;
 }
 
@@ -289 +338 @@
 bool pmConceptsReadCell(pmCell *cell,   // Cell for which to read concepts
                         pmConceptSource source, // The source of the concepts to read
-                        bool propagate,// Propagate to higher levels as well?
+                        bool propagateUp, // Propagate to higher levels?
                         psDB *db        // Database handle
                        )
@@ -298 +347 @@
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
 
-    bool cellSuccess = conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db, cell->concepts);
-
-    bool chipSuccess = true;
-    if (propagate) {
-        chipSuccess = conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db, chip->concepts);
-    }
-
-    bool fpaSuccess = true;
-    if (propagate) {
-        fpaSuccess = conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db, fpa->concepts);
-    }
-
-    return (cellSuccess && chipSuccess && fpaSuccess);
+    bool success = conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db,
+                                cell->concepts);
+    if (propagateUp) {
+        if (!chip->hdu) {
+            success |= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db,
+                                    chip->concepts);
+            if (!fpa->hdu) {
+                success |= conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db,
+                                        fpa->concepts);
+            }
+        }
+    }
+
+    return success;
 }
 
@@ -316 +366 @@
 bool pmConceptsWriteCell(pmCell *cell,  // FPA for which to write concepts
                          pmConceptSource source, // The source of the concepts to read
-                         bool propagate,// Propagate to higher levels as well?
+                         bool propagateUp, // Propagate to higher levels?
                          psDB *db       // Database handle
                         )
@@ -324 +374 @@
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(&conceptsCell, fpa, chip, cell, source, db, cell->concepts) &&
-           ((propagate && conceptsWrite(&conceptsChip, fpa, chip, cell, source, db, chip->concepts) &&
-             conceptsWrite(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts)) || !propagate);
+
+    bool success = conceptsWrite(&conceptsCell, fpa, chip, cell, source, db, cell->concepts);
+    if (propagateUp) {
+        if (!chip->hdu) {
+            success |= conceptsWrite(&conceptsChip, fpa, chip, cell, source, db, chip->concepts);
+            if (!fpa->hdu) {
+                success |= conceptsWrite(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts);
+            }
+        }
+    }
+
+    return success;
 }
 

trunk/psModules/src/concepts/pmConcepts.h

@@ -47 +47 @@
 bool pmConceptsReadFPA(pmFPA *fpa,      // FPA for which to read concepts
                        pmConceptSource source, // Source for concepts
+                       bool propagateDown, // Propagate to lower levels?
                        psDB *db         // Database handle
                       );
 bool pmConceptsWriteFPA(pmFPA *fpa,     // FPA for which to write concepts
                         pmConceptSource source, // Source for concepts
+                        bool propagateDown, // Propagate to lower levels?
                         psDB *db        // Database handle
                        );
@@ -57 +59 @@
 bool pmConceptsReadChip(pmChip *chip,   // Chip for which to read concepts
                         pmConceptSource source, // Source for concepts
-                        bool propagate, // Propagate to higher levels as well?
+                        bool propagateUp, // Propagate to higher levels?
+                        bool propagateDown, // Propagate to lower levels?
                         psDB *db        // Database handle
                        );
 bool pmConceptsWriteChip(pmChip *chip,  // Chip for which to write concepts
                          pmConceptSource source, // Source for concepts
-                         bool propagate,// Propagate to higher levels as well?
+                         bool propagateUp,// Propagate to higher levels?
+                         bool propagateDown, // Propagate to lower levels?
                          psDB *db       // Database handle
                         );
@@ -69 +73 @@
 bool pmConceptsReadCell(pmCell *cell,   // Cell for which to read concepts
                         pmConceptSource source, // Source for concepts
-                        bool propagate, // Propagate to higher levels as well?
+                        bool propagateUp, // Propagate to higher levels?
                         psDB *db        // Database handle
                        );
 bool pmConceptsWriteCell(pmCell *cell,  // FPA for which to write concepts
                          pmConceptSource source, // Source for concepts
-                         bool propagate,// Propagate to higher levels as well?
+                         bool propagateUp, // Propagate to higher levels?
                          psDB *db       // Database handle
                         );

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -141 +141 @@
     switch (item->type) {
     case PS_DATA_STRING:
+        psTrace(__func__, 9, "Writing header %s: %s\n", keyword, item->data.V);
         return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.V);
     case PS_DATA_S32:
+        psTrace(__func__, 9, "Writing header %s: %d\n", keyword, item->data.S32);
         return psMetadataAddS32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.S32);
     case PS_DATA_F32:
+        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F32);
         return psMetadataAddF32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F32);
     case PS_DATA_F64:
+        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F64);
         return psMetadataAddF64(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F64);
     case PS_DATA_REGION: {
             psString region = psRegionToString(*(psRegion*)item->data.V);
+            psTrace(__func__, 9, "Writing header %s: %s\n", keyword, region);
             bool result = psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                            region);
@@ -378 +383 @@
                 continue;
             }
+            psTrace(__func__, 3, "Writing %s to header %s\n", name, headerItem->data.V);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);