Changeset 12957 for branches/eam_02_branch/psphot/src/psphotBlendFit.c

Timestamp:

Apr 22, 2007, 5:39:10 PM (19 years ago)

Author:

eugene

Message:

changed PM_MODEL_ADD_.. to PM_MODEL_OP_..; added pmSourceAdd/Sub; adding modelFlux and maskView/maskObj to pmSource

File:

• branches/eam_02_branch/psphot/src/psphotBlendFit.c (modified) (3 diffs)

branches/eam_02_branch/psphot/src/psphotBlendFit.c

@@ -43 +43 @@
 
         // limit selection to some SN limit
+        // XXX this should use peak?
         if (source->moments == NULL) continue;
         if (source->moments->SN < FIT_SN_LIM) continue;
 
+        // XXX this should use peak?
         if (source->moments->x < AnalysisRegion.x0) continue;
         if (source->moments->y < AnalysisRegion.y0) continue;
@@ -65 +67 @@
         // replace object in image
         if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
-          // XXX we will need to remove the existing source->modelFlux if we do 
-          // a non-linear fit
-          // pmSourceSub (!NORM, -)
-            pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
+            pmSourceAdd (source, PM_MODEL_OP_FULL);
         }
         Nfit ++;
 
         // try fitting PSFs, then try extended sources
+        // these functions subtract the resulting fitted source (XXX and update the modelFlux?)
         if (psphotFitBlend (readout, source, psf)) { 
             psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
@@ -87 +87 @@
         Nfail ++;
 
-        // re-subtract PSF for object, leave local sky
-        pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
+        // re-subtract the object, leave local sky
+        pmSourceSub (source, PM_MODEL_OP_FULL);
         source->mode |= PM_SOURCE_MODE_SUBTRACTED;
         source->mode |= PM_SOURCE_MODE_TEMPSUB;