Changeset 33640 for branches/eam_branches/ipp-20111122/psphot/src/psphotReadout.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/psphotReadout.c (modified) (2 diffs)

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

@@ -133 +133 @@
     // 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); // pass 1
+    // pass 1
+    if (!psphotGuessModels (config, view, filerule)) {
+        psLogMsg ("psphot", 3, "failure to Guess Model - pass 1");
+        return psphotReadoutCleanup (config, view, filerule);
+    }
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -155 +159 @@
     // non-linear PSF and EXT fit to brighter sources
     // replace model flux, adjust mask as needed, fit, subtract the models (full stamp)
+    // XXX: can leave faulted job in done queue
     psphotBlendFit (config, view, filerule); // pass 1 (detections->allSources)