Changeset 30932 for branches/eam_branches/ipp-20110213/psphot/src/psphotGuessModels.c

Timestamp:

Mar 16, 2011, 1:34:32 PM (15 years ago)

Author:

eugene

Message:

cull with the smoothed image; use the functinon pmSourcePositionUseMoments to check if we should use the moments or peaks for source positions

File:

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

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

@@ -182 +182 @@
         // moments
 
-# if (1)
-        bool useMoments = true;
-# else
-        bool useMoments = false;
-        useMoments = (source->mode & PM_SOURCE_MODE_SATSTAR);  // we only want to try if SATSTAR is set, but..
-# endif
-
-        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
+        bool useMoments = pmSourcePositionUseMoments(source);
 
         float Xo, Yo;