Changeset 32924 for branches/eam_branches/ipp-20111122/psphot/src/psphotStackReadout.c

Timestamp:

Dec 11, 2011, 1:42:35 PM (15 years ago)

Author:

eugene

Message:

fix forced photometry of matched objects (psf model only) : needed to generate a guess model, which meant re-working psphotGuessModels to apply to only the unguessed objects in the allSources detections, not the newSources, so they could be applied to the matched objects

File:

• branches/eam_branches/ipp-20111122/psphot/src/psphotStackReadout.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/psphot/src/psphotStackReadout.c

@@ -160 +160 @@
     }
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
-    psphotGuessModels (config, view, STACK_SRC);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, STACK_SRC);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -248 +249 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, STACK_SRC); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -260 +257 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, STACK_SRC); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, STACK_SRC);
     }
 
@@ -269 +270 @@
     objects = psphotMatchSources (config, view, STACK_SRC);
     psMemDump("matchsources");
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     psphotStackObjectsUnifyPosition (objects);