Changeset 28781 for branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceFitPCM.c

Timestamp:

Jul 29, 2010, 2:35:46 PM (16 years ago)

Author:

eugene

Message:

attempting to get a better starting guess; attempting to downweight neighbor detections

File:

• branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceFitPCM.c (modified) (3 diffs)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceFitPCM.c

@@ -107 +107 @@
 bool pmSourceModelGuessPCM (pmPCMdata *pcm, pmSource *source, psImageMaskType maskVal, psImageMaskType markVal) {
 
-    pcm->modelConv->modelGuess(pcm->modelConv, source);
+    if (!pcm->modelConv->modelGuess(pcm->modelConv, source)) {
+        return false;
+    }
+    return true;
 
     // generate copy of the model
@@ -114 +117 @@
 
     // XXX test : modify the Io, SXX, SYY terms based on the psf SXX, SYY terms:
+    // SXX,SYY in model parameters are sqrt(2) * shape.Sxx,Syy
     psEllipseShape psfShape;
     psfShape.sx  = source->modelPSF->params->data.F32[PM_PAR_SXX] / M_SQRT2;
     psfShape.sxy = source->modelPSF->params->data.F32[PM_PAR_SXY];
     psfShape.sy  = source->modelPSF->params->data.F32[PM_PAR_SYY] / M_SQRT2;
+
     psEllipseAxes psfAxes = psEllipseShapeToAxes (psfShape, 20.0);
+    if (!isfinite(psfAxes.major)) return false;
+    if (!isfinite(psfAxes.minor)) return false;
+    if (!isfinite(psfAxes.theta)) return false;
 
     // XXX test : modify the Io, SXX, SYY terms based on the psf SXX, SYY terms:
@@ -125 +133 @@
     extShape.sxy = pcm->modelConv->params->data.F32[PM_PAR_SXY];
     extShape.sy  = pcm->modelConv->params->data.F32[PM_PAR_SYY] / M_SQRT2;
+
     psEllipseAxes extAxes = psEllipseShapeToAxes (extShape, 20.0);
+    if (!isfinite(extAxes.major)) return false;
+    if (!isfinite(extAxes.minor)) return false;
+    if (!isfinite(extAxes.theta)) return false;
 
     // decrease the initial guess ellipse by psf_minor axis:
     psEllipseAxes extAxesMod;
-    extAxesMod.major = sqrt (PS_MAX (1.0, PS_SQR(extAxes.major) - PS_SQR(psfAxes.minor)));
-    extAxesMod.minor = sqrt (PS_MAX (1.0, PS_SQR(extAxes.minor) - PS_SQR(psfAxes.minor)));
+    extAxesMod.major = sqrt (PS_MAX (0.25, PS_SQR(extAxes.major) - PS_SQR(psfAxes.minor)));
+    extAxesMod.minor = sqrt (PS_MAX (0.25, PS_SQR(extAxes.minor) - PS_SQR(psfAxes.minor)));
     extAxesMod.theta = extAxes.theta;
 
     psEllipseShape extShapeMod = psEllipseAxesToShape (extAxesMod);
+    if (!isfinite(extShapeMod.sx))  return false;
+    if (!isfinite(extShapeMod.sy))  return false;
+    if (!isfinite(extShapeMod.sxy)) return false;
+
     pcm->modelConv->params->data.F32[PM_PAR_SXX] = extShapeMod.sx * M_SQRT2;
     pcm->modelConv->params->data.F32[PM_PAR_SXY] = extShapeMod.sxy;