Changeset 25496 for branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c

Timestamp:

Sep 23, 2009, 11:16:52 AM (17 years ago)

Author:

eugene

Message:

add some additional psf model visualization, adjustments to existing visuals; allow independent aperture and fit radii; return to psfMag - apMag for psf fit metric; use psf fit metric to test 2D order

File:

• branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c (modified) (5 diffs)

branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c

@@ -67 +67 @@
             continue;
         }
-        source->modelPSF->radiusFit = options->radius;
-        // XXXX use a different radius for the aperture magnitude than for the PSF fit?
+        // PSF fit and aperture mags use different radii
+        source->modelPSF->fitRadius = options->fitRadius;
+        source->apRadius = options->apRadius;
 
-        // set object mask to define valid pixels
-        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "OR", markVal);
+        // set object mask to define valid pixels for PSF model fit
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->fitRadius, "OR", markVal);
 
         // fit the PSF model to the source
@@ -78 +79 @@
         // skip poor fits
         if (!status) {
-            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->fitRadius, "AND", PS_NOT_IMAGE_MASK(markVal));
             psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] = PSFTRY_MASK_PSF_FAIL;
             psTrace ("psModules.objects", 4, "dropping %d (%d,%d) : failed PSF fit\n", i, source->peak->x, source->peak->y);
@@ -84 +85 @@
         }
 
-        // XXX this function calculates the aperture magnitude, but we now use the moments->Sum as the flux
+        // set object mask to define valid pixels for APERTURE magnitude
+        if (options->fitRadius < options->apRadius) {
+            // this is not really a recommended situation...
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->fitRadius, "AND", PS_NOT_IMAGE_MASK(markVal));
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->apRadius, "OR", markVal);
+        }
+        if (options->fitRadius > options->apRadius) {
+            // ensure the aperture is defined
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->apRadius, "OR", markVal);
+        }
+
+        // This function calculates the psf and aperture magnitudes
         status = pmSourceMagnitudes (source, psfTry->psf, PM_SOURCE_PHOT_INTERP, maskVal);
         if (!status || isnan(source->apMag)) {
-            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->apRadius, "AND", PS_NOT_IMAGE_MASK(markVal));
             psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] = PSFTRY_MASK_BAD_PHOT;
             psTrace ("psModules.objects", 4, "dropping %d (%d,%d) : poor photometry\n", i, source->peak->x, source->peak->y);
@@ -94 +106 @@
 
         // clear object mask to define valid pixels
-        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->apRadius, "AND", PS_NOT_IMAGE_MASK(markVal));
 
         psfTry->fitMag->data.F32[i] = source->psfMag;
-        psfTry->metric->data.F32[i] = -2.5*log10(source->moments->Sum) - source->psfMag;
+        // psfTry->metric->data.F32[i] = -2.5*log10(source->moments->Sum) - source->psfMag;
+        psfTry->metric->data.F32[i] = source->apMag - source->psfMag;
         psfTry->metricErr->data.F32[i] = source->errMag;
 
@@ -104 +117 @@
     }
     psfTry->psf->nPSFstars = Npsf;
+
+    // XXX test code:
+    pmSourceVisualShowModelFits (psfTry->psf, psfTry->sources, maskVal);
 
     psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n);