Changeset 17954

Timestamp:

Jun 5, 2008, 4:02:08 PM (18 years ago)

Author:

Paul Price

Message:

Adding recipe value PSF.FAKE.ALLOW which specifies whether fake PSFs are allowed (when fitting the PSF fails).

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (2 diffs)
• psphotChoosePSF.c (modified) (2 diffs)

trunk/psphot/src/psphot.h

@@ -12 +12 @@
 
 #define PSPHOT_RECIPE "PSPHOT" // Name of the recipe to use
+
+#define PSPHOT_RECIPE_PSF_FAKE_ALLOW "PSF.FAKE.ALLOW" // Name for recipe component permitting fake PSFs
+
 
 // top-level psphot functions
@@ -126 +129 @@
 
 bool            psphotRadialProfile (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool            psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool            psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool            psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool            psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
 
 // structures & functions to support psf-convolved model fitting

trunk/psphot/src/psphotChoosePSF.c

@@ -106 +106 @@
     // generate a psf model using the first selection
     if (stars->n == 0) {
-        // XXX optionally give up here
         psError(PSPHOT_ERR_PSF, false, "Failed to fit any models when choosing PSF");
-        psErrorStackPrint (stderr, "Using guess PSF model");
-        psErrorClear ();
+        bool mdok;                      // Status of MD lookup
+        if (!psMetadataLookupBool(&mdok, recipe, PSPHOT_RECIPE_PSF_FAKE_ALLOW)) {
+            return false;
+        }
+        psErrorStackPrint(stderr, "Using guess PSF model");
+        psErrorClear();
 
         psFree(options);
@@ -175 +178 @@
         psFree (stars);
 
-        // XXX optionally give up here
-        // test for PSPHOT.recipe & return false on failure.
-
+        psError(PSPHOT_ERR_PSF, false, "Failed to fit any models when choosing PSF");
+        bool mdok;                      // Status of MD lookup
+        if (!psMetadataLookupBool(&mdok, recipe, PSPHOT_RECIPE_PSF_FAKE_ALLOW)) {
+            return false;
+        }
         // generate a psf model using the first selection
-        psError(PSPHOT_ERR_PSF, false, "Failed to fit any models when choosing PSF");
         psErrorStackPrint (stderr, "Using guess PSF model");
-        psErrorClear ();
+        psErrorClear();
 
         psFree(options);