Changeset 25497 for branches/eam_branches/20090715/psphot/src/psphotChoosePSF.c

Timestamp:

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

Author:

eugene

Message:

psf model ap radius different from fit radius; both set based on results of moments analysis

File:

• branches/eam_branches/20090715/psphot/src/psphotChoosePSF.c (modified) (2 diffs)

branches/eam_branches/20090715/psphot/src/psphotChoosePSF.c

@@ -73 +73 @@
     // get the fixed PSF fit radius
     // XXX check that PSF_FIT_RADIUS < SKY_OUTER_RADIUS
-    options->radius = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS");
-    assert (status);
+    // options->radius = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS");
+    // assert (status);
+
+    // XXX we have calculated a Gaussian window function, use that for both the PSF fit radius
+    // and the aperture radius (scaling SIGMA)
+    // XXX put the scale factors into the recipe
+    float gaussSigma = psMetadataLookupF32(&status, recipe, "MOMENTS_GAUSS_SIGMA");
+    float fitScale = psMetadataLookupF32(&status, recipe, "PSF_FIT_RADIUS_SCALE");
+    float apScale = psMetadataLookupF32(&status, recipe, "PSF_APERTURE_SCALE");
+    options->fitRadius = (int)(fitScale*gaussSigma);
+    options->apRadius = (int)(apScale*gaussSigma);
 
     // XXX ROBUST seems to be too agressive given the small numbers.
@@ -289 +298 @@
     // XXX test dump of psf star data and psf-subtracted image
     if (psTraceGetLevel("psphot.psfstars") > 5) {
-        psphotDumpPSFStars (readout, try, options->radius, maskVal, markVal);
+        psphotDumpPSFStars (readout, try, options->fitRadius, maskVal, markVal);
     }