Changeset 25496 for branches/eam_branches/20090715/psModules/src/objects/pmPSFtryMakePSF.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/pmPSFtryMakePSF.c (modified) (5 diffs)

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

@@ -184 +184 @@
     // we run 'clipIter' cycles clipping in each of x and y, with only one iteration each.
     // This way, the parameters masked by one of the fits will be applied to the others
-    for (int i = 0; i < psf->psfTrendStats->clipIter; i++) {
+    // NOTE : trend->stats (below) points to the same data as psfTrendStats; set the value to 1
+    // to limit the iteration within the loop
+    int nIter = psf->psfTrendStats->clipIter;
+    psf->psfTrendStats->clipIter = 1;
+    for (int i = 0; i < nIter; i++) {
         // XXX we are using the same stats structure on each pass: do we need to re-init it?
         // XXX we hardwire this to SAMPLE stats above (psphotChoosePSF.c), hardwire here instead?
@@ -203 +207 @@
         psTrace ("psModules.objects", 4, "clipped E0 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e0->n);
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
-        // pmSourceVisualPSFModelResid (trend, x, y, e0, srcMask);
+        pmSourceVisualPSFModelResid (trend, x, y, e0, srcMask);
 
         trend = psf->params->data[PM_PAR_E1];
@@ -212 +216 @@
         psTrace ("psModules.objects", 4, "clipped E1 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e1->n);
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
-        // pmSourceVisualPSFModelResid (trend, x, y, e1, srcMask);
+        pmSourceVisualPSFModelResid (trend, x, y, e1, srcMask);
 
         trend = psf->params->data[PM_PAR_E2];
@@ -221 +225 @@
         psTrace ("psModules.objects", 4, "clipped E2 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e2->n);
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
-        // pmSourceVisualPSFModelResid (trend, x, y, e2, srcMask);
+        pmSourceVisualPSFModelResid (trend, x, y, e2, srcMask);
 
         if (!status) {
@@ -228 +232 @@
         }
     }
+    psf->psfTrendStats->clipIter = nIter;
 
     // test dump of the psf parameters