Changeset 19881 for trunk/psphot/src/psphotBlendFit.c

Timestamp:

Oct 3, 2008, 11:00:18 AM (18 years ago)

Author:

eugene

Message:

converted pmMoments elements to Mxx, Myy, Mxxx, etc; using pmPeak position in most cases instead of moments

File:

• trunk/psphot/src/psphotBlendFit.c (modified) (4 diffs)

trunk/psphot/src/psphotBlendFit.c

@@ -55 +55 @@
 
         // limit selection to some SN limit
-        // XXX this should use peak?
-        if (source->moments == NULL) continue;
-        if (source->moments->SN < FIT_SN_LIM) continue;
+        if (source->peak->SN < FIT_SN_LIM) continue;
 
         // XXX this should use peak?
-        if (source->moments->x < AnalysisRegion.x0) continue;
-        if (source->moments->y < AnalysisRegion.y0) continue;
-        if (source->moments->x > AnalysisRegion.x1) continue;
-        if (source->moments->y > AnalysisRegion.y1) continue;
+        if (source->peak->xf < AnalysisRegion.x0) continue;
+        if (source->peak->yf < AnalysisRegion.y0) continue;
+        if (source->peak->xf > AnalysisRegion.x1) continue;
+        if (source->peak->yf > AnalysisRegion.y1) continue;
 
         // if model is NULL, we don't have a starting guess
@@ -95 +93 @@
             if (psphotFitBlob (readout, source, sources, psf, maskVal, markVal)) {
                 source->type = PM_SOURCE_TYPE_EXTENDED;
-                psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->moments->x, source->moments->y);
+                psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->peak->xf, source->peak->yf);
                 Next ++;
                 continue;
@@ -102 +100 @@
             if (psphotFitBlend (readout, source, psf, maskVal, markVal)) {
                 source->type = PM_SOURCE_TYPE_STAR;
-                psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
+                psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->peak->xf, source->peak->yf);
                 Npsf ++;
                 continue;
@@ -108 +106 @@
         }
 
-        psTrace ("psphot", 5, "source at %7.1f, %7.1f failed", source->moments->x, source->moments->y);
+        psTrace ("psphot", 5, "source at %7.1f, %7.1f failed", source->peak->xf, source->peak->yf);
         Nfail ++;