Changeset 33640 for branches/eam_branches/ipp-20111122/psphot/src/psphotForcedReadout.c

Timestamp:

Mar 30, 2012, 2:54:17 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotForcedReadout.c (modified) (1 diff)

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

@@ -55 +55 @@
     psphotLoadExtSources (config, view, filerule);
 
+    // merge the newly selected sources into the existing list
+    // NOTE: merge OLD and NEW
+    psphotMergeSources (config, view, filerule);
+
     // 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, filerule);
-
-    // merge the newly selected sources into the existing list
-    // NOTE: merge OLD and NEW
-    psphotMergeSources (config, view, filerule);
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)