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

Timestamp:

Sep 8, 2008, 11:05:47 AM (18 years ago)

Author:

Paul Price

Message:

Fixing SEGV when !inRO (e.g., convolution fails, readout rejected out of hand).

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (1 diff)

trunk/ppStack/src/ppStackLoop.c

@@ -795 +795 @@
             ppStackThread *thread = stack->threads->data[0]; // Representative stack
             pmReadout *inRO = thread->readouts->data[i]; // Template readout
-            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;
+            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.");
                 } else {
-                    if (!outHDU->header) {
-                        outHDU->header = psMetadataAlloc();
-                    }
-                    if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
+                    if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) {
                         psErrorClear();
-                        psWarning("Unable to write WCS astrometry to output FPA.");
+                        psWarning("Unable to read WCS astrometry from input 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;
+                        }
                     }
                 }