Changeset 21264 for branches/pap_branch_20090128/psModules/src/camera/pmFPARead.c

Timestamp:

Feb 2, 2009, 8:05:38 AM (17 years ago)

Author:

Paul Price

Message:

Adding work on integrating covariances into the read/write system. Not sure I like this framework (putting covariances for an HDU into a common table); might rework to write a covariance image for each cell. I think I started doing that and ran into problems, but I can't remember what they were and how they stopped me.

File:

• branches/pap_branch_20090128/psModules/src/camera/pmFPARead.c (modified) (4 diffs)

branches/pap_branch_20090128/psModules/src/camera/pmFPARead.c

@@ -28 +28 @@
     FPA_READ_TYPE_IMAGE,                // Read image
     FPA_READ_TYPE_MASK,                 // Read mask
-    FPA_READ_TYPE_VARIANCE,               // Read variance map
+    FPA_READ_TYPE_VARIANCE,             // Read variance map
     FPA_READ_TYPE_HEADER                // Read header
 } fpaReadType;
@@ -515 +515 @@
     }
 
-    // XXX for IMAGE, we need the CELL.BAD value, but for MASK, we need the BAD mask value
-
-    float bad = 0;
-    if (type == FPA_READ_TYPE_MASK) {
-      bad = 1.0;
-    } else {
-      bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level
+    // Need to set the invalid (unread) pixels appropriately, and to read the mask bits
+    float bad = 0;                      // Bad level
+    switch (type) {
+      case FPA_READ_TYPE_MASK: {
+          pmHDU *phu = pmHDUGetHighest(cell->parent->parent, cell->parent, cell); // Primary header
+          if (!pmConfigMaskReadHeader(config, phu->header)) {
+              psError(PS_ERR_IO, false, "Unable to determine mask bits");
+              return false;
+          }
+          bad = pmConfigMaskGet("BAD", config);
+          break;
+      }
+      case FPA_READ_TYPE_IMAGE:
+      case FPA_READ_TYPE_VARIANCE:
+        bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD");
+        break;
+      default:
+        psAbort("Unrecognised type: %x", type);
     }
 
@@ -721 +732 @@
             return NULL;
         }
+
+        if (type == FPA_READ_TYPE_VARIANCE && hdu->covariances) {
+            psArray *covariances = hdu->covariances; // Covariances in HDU
+            for (int i = 0; i < covariances->n; i++) {
+                pmHDUCovariances *covar = covariances->data[i]; // Covariance information
+
         psFree(readout);                // Drop reference
     }
@@ -852 +869 @@
     float bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.BAD is not set --- assuming zero.\n");
+        psWarning("CELL.BAD is not set --- assuming zero.\n");
         bad = 0.0;
     }