Changeset 19565 for trunk/ppStack/src/ppStackLoop.c

Timestamp:

Sep 15, 2008, 3:28:49 PM (18 years ago)

Author:

Paul Price

Message:

Wrong sense of mask.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (2 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -844 +844 @@
     float totExposure = 0.0;            // Total exposure time
     for (int i = 0; i < num; i++) {
-        if (!inputMask->data.U8[i]) {
+        if (inputMask->data.U8[i]) {
             continue;
         }
@@ -854 +854 @@
             // Copy astrometry over
             wcsDone = true;
-            if (inRO) {
-                pmHDU *inHDU = pmHDUFromCell(inRO->parent); // Template HDU
-                pmHDU *outHDU = pmHDUFromCell(outRO->parent); // Output HDU
-                pmChip *outChip = outRO->parent->parent; // Output chip
-                pmFPA *outFPA = outChip->parent; // Output FPA
-                if (!outHDU || !inHDU) {
-                    psWarning("Unable to find HDU at FPA level to copy astrometry.");
+            pmHDU *inHDU = pmHDUFromCell(inRO->parent); // Template HDU
+            pmHDU *outHDU = pmHDUFromCell(outRO->parent); // Output HDU
+            pmChip *outChip = outRO->parent->parent; // Output chip
+            pmFPA *outFPA = outChip->parent; // Output FPA
+            if (!outHDU || !inHDU) {
+                psWarning("Unable to find HDU at FPA level to copy astrometry.");
+            } else {
+                if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) {
+                    psErrorClear();
+                    psWarning("Unable to read WCS astrometry from input FPA.");
+                    wcsDone = false;
                 } else {
-                    if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) {
+                    if (!outHDU->header) {
+                        outHDU->header = psMetadataAlloc();
+                    }
+                    if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
                         psErrorClear();
-                        psWarning("Unable to read WCS astrometry from input FPA.");
+                        psWarning("Unable to write WCS astrometry to output FPA.");
                         wcsDone = false;
-                    } else {
-                        if (!outHDU->header) {
-                            outHDU->header = psMetadataAlloc();
-                        }
-                        if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
-                            psErrorClear();
-                            psWarning("Unable to write WCS astrometry to output FPA.");
-                            wcsDone = false;
-                        }
                     }
                 }