Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ppSub/src/ppSubMatchPSFs.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppSub/src/ppSubMatchPSFs.c (modified) (3 diffs)

branches/eam_branches/ps2-tc3-20130727/ppSub/src/ppSubMatchPSFs.c

@@ -57 +57 @@
     if (!pmFPACopy(photFile->fpa, ro->parent->parent->parent)) {
         psError(PPSUB_ERR_CONFIG, false, "Unable to copy FPA for photometry");
-        return false;
+        return NAN;
     }
 
@@ -76 +76 @@
         psWarning("Unable to determine PSF.");
         psFree(view);
-        return true;
+        return NAN;
     }
     psFree(view);
@@ -156 +156 @@
     psLogMsg("ppSub", PS_LOG_INFO, "Input FWHM: %f\nReference FWHM: %f\n", inFWHM, refFWHM);
     if (!isfinite(inFWHM) || !isfinite(refFWHM)) {
+#ifdef SET_QUALITY_INSTEAD_OF_ERROR
+        psErrorStackPrint(stderr, "Cannot determine FHWM for images, giving up.");
+        int error = psErrorCodeLast(); // Error code
+        ppSubDataQuality(data, error, PPSUB_FILES_ALL);
+        return true;
+#else
         psError(PPSUB_ERR_DATA, false, "Cannot determine FHWM for images, giving up.");
         return false;
+#endif
     }