Changeset 21264 for branches/pap_branch_20090128/psModules/src/camera/pmHDU.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/pmHDU.c (modified) (3 diffs)

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

@@ -12 +12 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+
+#define COVARIANCE_INDICATOR "PS_COVAR" // FITS keyword to indicate if covariance matrices are present
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -160 +162 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
-    return hduRead(hdu, &hdu->variances, fits);
+    if (!hduRead(hdu, &hdu->variances, fits)) {
+        return false;
+    }
+
+    return true;
 }
 
@@ -240 +246 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
+    pmHDUCovariancesWriteHeader(hdu);
+
     psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Value to mask
-    return hduWrite(hdu, hdu->variances, hdu->masks, maskVal, fits);
-}
+    if (!hduWrite(hdu, hdu->variances, hdu->masks, maskVal, fits)) {
+        return false;
+    }
+    pmHDUCovarianceClearHeader(hdu);
+
+    if (!pmHDUCovarianceWrite(hdu, fits)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to write covariance");
+        return false;
+    }
+
+    return true;
+}