Changeset 30228

Timestamp:

Jan 9, 2011, 12:46:38 PM (15 years ago)

Author:

eugene

Message:

save the covariance when writing the temporary variance images

Location:

branches/eam_branches/ipp-20101205/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackConvolve.c (modified) (1 diff)
• ppStackFiles.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/ppStack/src/ppStack.h

@@ -192 +192 @@
     );
 
+bool ppStackWriteVariance(const char *name, // Name of image
+                          psMetadata *header, // Header
+                          const psImage *variance, // Variance
+                          const psImage *covariance, // Variance
+                          pmConfig *config // Configuration
+    );
+
 /// Return an appropriate exit code based on the error code
 psExit ppStackExitCode(psExit exitValue);

branches/eam_branches/ipp-20101205/ppStack/src/ppStackConvolve.c

@@ -171 +171 @@
         }
         psFree(maskHeader);
-        if (!ppStackWriteImage(options->convVariances->data[i], hdu->header, readout->variance, config)) {
+        if (!ppStackWriteVariance(options->convVariances->data[i], hdu->header, readout->variance, readout->covariance->image, config)) {
             psError(PPSTACK_ERR_IO, false, "Unable to write convolved variance %d", i);
             psFree(fpaList);

branches/eam_branches/ipp-20101205/ppStack/src/ppStackFiles.c

@@ -200 +200 @@
     return true;
 }
+
+// Write an image to a FITS file
+bool ppStackWriteVariance(const char *name, // Name of image
+                          psMetadata *header, // Header
+                          const psImage *variance, // Variance
+                          const psImage *covariance, // Variance
+                          pmConfig *config // Configuration
+    )
+{
+    assert(name);
+    assert(variance);
+
+    psString resolved = pmConfigConvertFilename(name, config, true, true); // Resolved file name
+    psFits *fits = psFitsOpen(resolved, "w");
+    if (!fits) {
+        psError(PPSTACK_ERR_IO, false, "Unable to open FITS file %s to write image.", resolved);
+        psFree(resolved);
+        return false;
+    }
+    if (!psFitsWriteImage(fits, header, variance, 0, NULL)) {
+        psError(PPSTACK_ERR_IO, false, "Unable to write FITS image %s.", resolved);
+        psFitsClose(fits);
+        psFree(resolved);
+        return false;
+    }
+    if (covariance) {
+        psMetadata *tmphead = psMetadataAlloc();
+        psMetadataAddS32(tmphead, PS_LIST_TAIL, "COVARIANCE.CENTRE.X", PS_META_REPLACE, "center", (int)(covariance->numCols / 2));
+        psMetadataAddS32(tmphead, PS_LIST_TAIL, "COVARIANCE.CENTRE.Y", PS_META_REPLACE, "center", (int)(covariance->numRows / 2));
+        if (!psFitsWriteImage(fits, tmphead, covariance, 0, "COVAR_SkyChip_SkyCell")) {
+            psError(PPSTACK_ERR_IO, false, "Unable to write FITS image %s.", resolved);
+            psFitsClose(fits);
+            psFree(resolved);
+            return false;
+        }
+    }
+    if (!psFitsClose(fits)) {
+        psError(PPSTACK_ERR_IO, false, "Unable to close FITS image %s.", resolved);
+        psFree(resolved);
+        return false;
+    }
+    psFree(resolved);
+    return true;
+}