Changeset 21269 for branches/pap_branch_20090128/psModules/src/camera/pmHDU.c

Timestamp:

Feb 2, 2009, 2:37:06 PM (17 years ago)

Author:

Paul Price

Message:

Reverting to writing covariance matrices per chip/cell. This allows simple visualisation of the covariance matrix, and a simpler system for reading and writing them.

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
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -162 +160 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
-    if (!hduRead(hdu, &hdu->variances, fits)) {
-        return false;
-    }
-
-    return true;
+    return hduRead(hdu, &hdu->variances, fits);
 }
 
@@ -246 +240 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
-    pmHDUCovariancesWriteHeader(hdu);
-
     psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Value to mask
-    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;
-}
+    return hduWrite(hdu, hdu->variances, hdu->masks, maskVal, fits);
+}