Changeset 31606 for branches/czw_branch/20110406/psphot/src/psphotApResid.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/psphotApResid.c (modified) (6 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
-// # define DEBUG
+# define DEBUG
 
 # define SKIPSTAR(MSG) { psTrace ("psphot", 3, "invalid : %s", MSG); continue; }
@@ -206 +206 @@
 
         // XXX make this user-configurable?
-        if (source->errMag > 0.01) continue;
+        if (source->psfMagErr > 0.01) continue;
 
         // aperture residual for this source
@@ -222 +222 @@
                  source->peak->xf, source->peak->yf,
                  source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS],
-                 source->psfMag, source->apMag, source->errMag,
+                 source->psfMag, source->apMag, source->psfMagErr,
                  source->modelPSF->params->data.F32[PM_PAR_I0],
                  source->modelPSF->params->data.F32[PM_PAR_SXX], source->modelPSF->params->data.F32[PM_PAR_SXY], source->modelPSF->params->data.F32[PM_PAR_SYY],
@@ -228 +228 @@
 # endif
         if (!isfinite(source->psfMag)) psAbort ("nan in psfMag");
-        if (!isfinite(source->errMag)) psAbort ("nan in errMag");
+        if (!isfinite(source->psfMagErr)) psAbort ("nan in psfMagErr");
         if (!isfinite(source->apMag)) psAbort ("nan in apMag");
         if (!isfinite(model->params->data.F32[PM_PAR_XPOS])) psAbort ("nan in xPos");
@@ -234 +234 @@
 
         psVectorAppend (mag, source->psfMag);
-        psVectorAppend (dMag,source->errMag);
+        psVectorAppend (dMag,source->psfMagErr);
         psVectorAppend (apResid, dap);
         psVectorAppend (xPos, model->params->data.F32[PM_PAR_XPOS]);
@@ -328 +328 @@
     psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "DAPMIFIT", PS_META_REPLACE, "ap residual scatter", psf->dApResid);
     psMetadataAddS32 (readout->analysis, PS_LIST_TAIL, "NAPMIFIT", PS_META_REPLACE, "number of apresid stars", psf->nApResid);
-    psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "APLOSS",   PS_META_REPLACE, "aperture loss (mag)", psf->growth ? psf->growth->apLoss : NAN);
+
+    // curve-of-growth offset
+    if (psf->growth) {
+        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);
+        
+        float offset = pmGrowthCurveCorrect (psf->growth, PSF_APERTURE);
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "APLOSS",   PS_META_REPLACE, "aperture loss (mag)", psf->growth->apLoss);
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "APREFOFF", PS_META_REPLACE, "offset to ref aperture", offset);
+    } else {
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "APLOSS",   PS_META_REPLACE, "aperture loss (mag)", NAN);
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "APREFOFF", PS_META_REPLACE, "offset to ref aperture", NAN);
+    }
 
     psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "aperture residual: %f +/- %f\n", psf->ApResid, psf->dApResid);