Changeset 31313 for branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Apr 18, 2011, 8:55:26 AM (15 years ago)

Author:

eugene

Message:

raise bit for PASS1 detections; set MODE_PSFMODEL in linear fit as well as nonlinear fit; move flags for fitting results into pmSourceFits not the calling function (more explicitly sets the bits in the right cases); adding test MaskedKron function

File:

• branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c (modified) (3 diffs)

branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c

@@ -164 +164 @@
 
         // check the integral of the model : is it large enough?
+        // apply mask?
         float modelSum = 0.0;
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
@@ -171 +172 @@
         }
         if (modelSum < 0.5) continue; // skip sources with no model constraint (somewhat arbitrary limit)
-        // if (modelSum < 0.01) continue; // skip sources with no model constraint (somewhat arbitrary limit)
         if (modelSum < 0.8) {
             fprintf (stderr, "low-sig model @ %f, %f (%f sum, %f peak)\n",
@@ -177 +177 @@
         }
 
-        pmModel *model = pmSourceGetModel (NULL, source);
+        bool isPSF = false;
+        pmModel *model = pmSourceGetModel (&isPSF, source);
 
         psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
         psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, model->fitRadius, "OR", markVal);
 
-        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+        // we call this function multiple times. for the first time, we have only PSF models for all objects
+        // the second time has extended sources.  If we ever fit the PSF model, we should raise this bit
+        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+        if (isPSF) {
+            source->mode |= PM_SOURCE_MODE_PSFMODEL;
+        }           
+        
         psArrayAdd (fitSources, 100, source);
     }