Changeset 26832 for branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

Timestamp:

Feb 9, 2010, 6:15:15 PM (16 years ago)

Author:

Paul Price

Message:

Fix SEGV in measuring the PSF FWHM. I'm guessing this is from the PSF not being defined at the centre of the image, so now I measure it over the various areas of the image and take the average.

File:

• branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c (modified) (3 diffs)

branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

@@ -178 +178 @@
         bool redoPhot = psMetadataLookupBool(NULL, recipe, "PHOT");
 
-        pmDetections *detections = NULL;
+        pmDetections *detections = NULL;
         if (options->convolve || options->matchZPs || options->photometry || redoPhot) {
             pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
@@ -186 +186 @@
                 return NULL;
             }
-            psAssert (detections->allSources, "missing sources?");
-            
+            psAssert (detections->allSources, "missing sources?");
+
             options->sourceLists->data[index] = psMemIncrRefCounter(detections->allSources);
         }
@@ -238 +238 @@
         }
         havePSFs = true;
-        float fwhm = pmPSFtoFWHM(psf, 0.5 * numCols, 0.5 * numRows); // FWHM for image
-        psStringAppend(&log, "Input %d: %f\n", i, fwhm);
-        options->inputSeeing->data.F32[i] = fwhm;
+
+        double sumFWHM = 0.0;           // FWHM for image
+        int numFWHM = 0;                // Number of FWHM measurements
+        for (int y = 0; y < psf->trendNy; y++) {
+            float yPos = ((float)y + 0.5) / (float)psf->trendNy * numRows;
+            for (int x = 0; x < psf->trendNx; x++) {
+                float xPos = ((float)x + 0.5) / (float)psf->trendNx * numCols;
+                float fwhm = pmPSFtoFWHM(psf, xPos, yPos); // FWHM for image
+                if (isfinite(fwhm)) {
+                    sumFWHM += fwhm;
+                    numFWHM++;
+                }
+            }
+        }
+        if (numFWHM == 0) {
+            options->inputSeeing->data.F32[i] = NAN;
+            options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = PPSTACK_MASK_PSF;
+            psLogMsg("ppStack", PS_LOG_INFO, "Unable to measure PSF FWHM for image %d --- rejected.", i);
+        } else {
+            options->inputSeeing->data.F32[i] = sumFWHM / (float)numFWHM;
+        }
+        psStringAppend(&log, "Input %d: %f\n", i, options->inputSeeing->data.F32[i]);
     }
     if (havePSFs) {