Changeset 36663

Timestamp:

Apr 15, 2014, 10:27:50 AM (12 years ago)

Author:

bills

Message:

don't fail if we fail to choose PSF

File:

• trunk/psphot/src/psphotFullForceReadout.c (modified) (2 diffs)

trunk/psphot/src/psphotFullForceReadout.c

@@ -78 +78 @@
     psphotMergeSources (config, view, filerule);
 
-
     // generate a psf model for any readouts which need one
     // psphotFullForcePSF (config, view, filerule);
@@ -84 +83 @@
     // sources; we should mark with a flag bit the ones we actually want to use as PSF
     // stars (this means we need to supply this info in the load).
-    psphotChoosePSF (config, view, filerule, false);
+    if (!psphotChoosePSF (config, view, filerule, false)) {
+        // PSPHOT_ERR_DATA causes this program to exit gracefully
+        psError (PSPHOT_ERR_DATA, false, "failed to construct psf model");
+        return  psphotReadoutCleanup (config, view, filerule);
+    }
 
     // Construct an initial model for each object, set the radius to fitRadius, set circular