Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackConvolve.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackConvolve.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppStack/src

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackConvolve.c

@@ -112 +112 @@
 
         // Write the temporary convolved files
-        if (options->convolve) {
-            pmHDU *hdu = readout->parent->parent->parent->hdu; // HDU for convolved image
-            assert(hdu);
-            ppStackWriteImage(options->imageNames->data[i], hdu->header, readout->image, config);
-            psMetadata *maskHeader = psMetadataCopy(NULL, hdu->header); // Copy of header, for mask
-            pmConfigMaskWriteHeader(config, maskHeader);
-            ppStackWriteImage(options->maskNames->data[i], maskHeader, readout->mask, config);
-            psFree(maskHeader);
-            psImageCovarianceTransfer(readout->variance, readout->covariance);
-            ppStackWriteImage(options->varianceNames->data[i], hdu->header, readout->variance, config);
+        pmHDU *hdu = readout->parent->parent->parent->hdu; // HDU for convolved image
+        assert(hdu);
+        ppStackWriteImage(options->imageNames->data[i], hdu->header, readout->image, config);
+        psMetadata *maskHeader = psMetadataCopy(NULL, hdu->header); // Copy of header, for mask
+        pmConfigMaskWriteHeader(config, maskHeader);
+        ppStackWriteImage(options->maskNames->data[i], maskHeader, readout->mask, config);
+        psFree(maskHeader);
+        psImageCovarianceTransfer(readout->variance, readout->covariance);
+        ppStackWriteImage(options->varianceNames->data[i], hdu->header, readout->variance, config);
 #ifdef TESTING
-            {
-                psString name = NULL;
-                psStringAppend(&name, "covariance_%d.fits", i);
-                ppStackWriteImage(name, hdu->header, readout->covariance->image, config);
-                pmStackVisualPlotTestImage(readout->covariance->image, name);
-                psFree(name);
-            }
+        {
+            psString name = NULL;
+            psStringAppend(&name, "covariance_%d.fits", i);
+            ppStackWriteImage(name, hdu->header, readout->covariance->image, config);
+            pmStackVisualPlotTestImage(readout->covariance->image, name);
+            psFree(name);
+        }
 #endif
-        }
 
         pmCell *inCell = readout->parent; // Input cell

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h