Changeset 26894 for trunk/psphot/src/psphotRadiusChecks.c

Timestamp:

Feb 10, 2010, 7:36:29 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201 (substantially changes to the psphotReadout APIs to support future stack photometry; improvements to the CR masking code)

File:

• trunk/psphot/src/psphotRadiusChecks.c (modified) (1 diff)

trunk/psphot/src/psphotRadiusChecks.c

@@ -4 +4 @@
 static float PSF_FIT_NSIGMA;
 static float PSF_FIT_PADDING;
+static float PSF_APERTURE = 0;  // radius to use in PSF aperture mags
 static float PSF_FIT_RADIUS = 0;        // radius to use in fitting (ignored if <= 0,
                                         // and a per-object radius is calculated)
 
-static float PSF_APERTURE = 0;  // radius to use in PSF aperture mags
-
-
-bool psphotInitRadiusPSF(const psMetadata *recipe, const pmModelType type) {
+bool psphotInitRadiusPSF(const psMetadata *recipe, const psMetadata *analysis, const pmModelType type) {
 
     bool status = true;
 
-    PSF_FIT_NSIGMA  = psMetadataLookupF32(&status, recipe, "PSF_FIT_NSIGMA");
+    PSF_FIT_NSIGMA = psMetadataLookupF32(&status, recipe, "PSF_FIT_NSIGMA");
     PSF_FIT_PADDING = psMetadataLookupF32(&status, recipe, "PSF_FIT_PADDING");
-    PSF_FIT_RADIUS  =  psMetadataLookupF32(&status, recipe, "PSF_FIT_RADIUS");
-    PSF_APERTURE    =  psMetadataLookupF32(&status, recipe, "PSF_APERTURE");
+
+    PSF_FIT_RADIUS =  psMetadataLookupF32(&status, analysis, "PSF_FIT_RADIUS");
+    if (!status) {
+        PSF_FIT_RADIUS = psMetadataLookupF32(&status, recipe, "PSF_FIT_RADIUS");
+    }
+
+    PSF_APERTURE =  psMetadataLookupF32(&status, analysis, "PSF_APERTURE");
+    if (!status) {
+        PSF_APERTURE =  psMetadataLookupF32(&status, recipe, "PSF_APERTURE");
+    }
 
     return true;