Changeset 32157 for branches/eam_branches/ipp-20110710/psphot/src/psphotKronMasked.c

Timestamp:

Aug 21, 2011, 10:44:17 AM (15 years ago)

Author:

eugene

Message:

distinguish window used for moment calculation and window used for model fitting more clearly; re-generate the cached model after PCM fitting using new function (instead of caching the fit models); add function to set window which shrinks as well as expands as needed

Location:

branches/eam_branches/ipp-20110710/psphot/src

Files:

• . (modified) (1 prop)
• psphotKronMasked.c (modified) (3 diffs)

branches/eam_branches/ipp-20110710/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/eam_branches/ipp-20110710/psphot/src/psphotKronMasked.c

@@ -96 +96 @@
         if (!source->moments) continue;
 
+        float windowRadius = RADIUS;
+        if (source->moments->KronFlux / source->moments->KronFluxErr > 10.0) {
+            windowRadius = PS_MAX (RADIUS, 10*source->moments->Mrf);
+        }
+
+        // re-allocate image, weight, mask arrays for each peak with box big enough to fit BIG_RADIUS
+        pmSourceRedefinePixels (source, readout, source->peak->x, source->peak->y, windowRadius + 2);
+
+        pmMoments psfMoments = *source->moments;
+
         // replace object in image
         if (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED) {
@@ -101 +111 @@
         }
 
-        psphotKronMag (source, RADIUS, MIN_KRON_RADIUS, maskVal);
+        psphotKronMag (source, windowRadius, MIN_KRON_RADIUS, maskVal);
 
         // re-subtract the object, leave local sky
@@ -136 +146 @@
         }
     }           
+
     // psphotSaveImage (NULL, kronMask, "kronmask.fits");
     psLogMsg ("psphot.kron", PS_LOG_DETAIL, "measure masked kron magnitudes : %f sec for %ld objects\n", psTimerMark ("psphot.kron"), sources->n);

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest