Changeset 36347

Timestamp:

Dec 4, 2013, 2:28:32 PM (13 years ago)

Author:

eugene

Message:

if we thing something is a star, use the PSF model when subtracting (even if we fitted ext models)

Location:

branches/eam_branches/ipp-20130904/psphot/src

Files:

• psphotExtendedSourceFits.c (modified) (1 diff)
• psphotSourceSize.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

@@ -597 +597 @@
         }
 
+        // we are allowed to fit both stars and non-stars here -- if we have fitted
+        // something which we think is a star, we should use that model to subtract the
+        // object from the image.
+        if (source->type == PM_SOURCE_TYPE_STAR) {
+          // ensure the modelPSF is cached
+          pmSourceCacheModel (source, maskVal);
+          pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
+          continue;
+        }
+
         // evaluate the relative quality of the models, choose one
+        // the PSF model might be the best fit : allow it to succeed
         float minChisq = NAN;
         int minModel = -1;

branches/eam_branches/ipp-20130904/psphot/src/psphotSourceSize.c

@@ -605 +605 @@
             psTrace("psphotSourceClassRegion.EXT",4,"CLASS: %g %g\t%g %g\t%g %g\t%g %g\t%g EXT\n",
                     source->peak->xf, source->peak->yf, Mminor, kMag, dMag, nSigmaMAG, options->sizeLimitCR, options->magLimitCR, options->nSigmaApResid);
+            source->type = PM_SOURCE_TYPE_EXTENDED;
             source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
             source->tmpFlags |= PM_SOURCE_TMPF_SIZE_MEASURED;
@@ -624 +625 @@
                     source->peak->xf, source->peak->yf, Mminor, kMag, dMag, nSigmaMAG, options->sizeLimitCR, options->magLimitCR, options->nSigmaApResid,
                     momentRatioVeres,options->altDiffExtThresh);
+            source->type = PM_SOURCE_TYPE_EXTENDED;
             source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
             source->tmpFlags |= PM_SOURCE_TMPF_SIZE_MEASURED;