Changeset 31606 for branches/czw_branch/20110406/psphot/src/psphotMakeGrowthCurve.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotMakeGrowthCurve.c (modified) (2 diffs)

branches/czw_branch/20110406/psphot/src/psphotMakeGrowthCurve.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotMakeGrowthCurve (pmReadout *readout, psMetadata *recipe, pmPSF *psf) {
+bool psphotMakeGrowthCurve (pmReadout *readout, psMetadata *recipe, pmPSF *psf, psArray *sources) {
 
     bool status;
@@ -22 +22 @@
 
     // measure the aperture loss as a function of radius for PSF
-    bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
     float REF_RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_REF_RADIUS");
     float PSF_FIT_PAD   = psMetadataLookupF32 (&status, recipe, "PSF_FIT_PADDING");
+    
+    float gaussSigma = psMetadataLookupF32(&status, readout->analysis, "MOMENTS_GAUSS_SIGMA");
+    if (!status) {
+        gaussSigma = psMetadataLookupF32(&status, recipe, "MOMENTS_GAUSS_SIGMA");
+    }
+    float apScale = psMetadataLookupF32(&status, recipe, "PSF_APERTURE_SCALE");
+    float PSF_APERTURE = (int)(apScale*gaussSigma);
 
     psf->growth = pmGrowthCurveAlloc (PSF_FIT_PAD, 100.0, REF_RADIUS);
 
-    if (!pmGrowthCurveGenerate (readout, psf, IGNORE_GROWTH, maskVal, markVal)) {
-        psError(PSPHOT_ERR_APERTURE, false, "Fitting aperture corrections");
-        psFree(psf->growth); psf->growth = NULL;
-        return false;
+    bool GROWTH_FROM_SOURCES = psMetadataLookupBool (&status, recipe, "GROWTH_FROM_SOURCES");
+    if (!status) GROWTH_FROM_SOURCES = false;
+
+    if (GROWTH_FROM_SOURCES) {
+        bool INTERPOLATE_AP = psMetadataLookupBool (&status, recipe, "INTERPOLATE_AP");
+        if (!pmGrowthCurveGenerateFromSources (readout, psf, sources, INTERPOLATE_AP, maskVal, markVal)) {
+            psError(PSPHOT_ERR_APERTURE, false, "Fitting aperture corrections");
+            psFree(psf->growth); psf->growth = NULL;
+            return false;
+        }
+
+    } else {
+        bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
+        if (!pmGrowthCurveGenerate (readout, psf, IGNORE_GROWTH, maskVal, markVal)) {
+            psError(PSPHOT_ERR_APERTURE, false, "Fitting aperture corrections");
+            psFree(psf->growth); psf->growth = NULL;
+            return false;
+        }
     }
 
     psLogMsg ("psphot", PS_LOG_MINUTIA, "built growth curve: %f sec\n", psTimerMark ("psphot.growth"));
 
+    float offset = pmGrowthCurveCorrect (psf->growth, PSF_APERTURE);
+    psLogMsg ("psphot", PS_LOG_DETAIL, "correction from %f to %f: %f mags\n", PSF_APERTURE, REF_RADIUS, offset);
+
     return true;
 }