Changeset 30867

Timestamp:

Mar 10, 2011, 5:25:59 PM (15 years ago)

Author:

eugene

Message:

only use the moments-centroid for the source position guess if the moments and peak agree by 1.5 pixels or if the object is saturated

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotGuessModels.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/psphot/src/psphotGuessModels.c

@@ -189 +189 @@
 # endif
 
-        useMoments = (useMoments && source->moments);          // can't if there are no moments
-        useMoments = (useMoments && source->moments->nPixels); // can't if the moments were not measured
-        useMoments = (useMoments && !(source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE)); // can't if the moments failed...
+        float dX = source->moments->Mx - source->peak->xf;
+        float dY = source->moments->My - source->peak->yf;
+        float dR = hypot(dX, dY);
+
+        useMoments = useMoments && source->moments;          // can't if there are no moments
+        useMoments = useMoments && source->moments->nPixels; // can't if the moments were not measured
+        useMoments = useMoments && !(source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE); // can't if the moments failed...
+        useMoments = useMoments && ((dR < 1.5) || (source->mode & PM_SOURCE_MODE_SATSTAR));
+        // only use the moments position if the moment-peak offset is small or the star is saturated
 
         float Xo, Yo;