Changeset 5980 for trunk/psphot/src/psphotMagnitudes.c

Timestamp:

Jan 13, 2006, 8:24:10 PM (21 years ago)

Author:

eugene

Message:

substantial work on the aperture residuals

File:

• trunk/psphot/src/psphotMagnitudes.c (modified) (3 diffs)

trunk/psphot/src/psphotMagnitudes.c

@@ -17 +17 @@
         model = source->modelPSF;
         if (model == NULL) return NULL;
-        radius = apRadius;
+        radius = (apRadius > 0) ? apRadius : model->radius;
         isPSF = true;
         break;
@@ -46 +46 @@
     // for PSFs, correct both apMag and fitMag to same system, consistent with infinite flux star in aperture RADIUS
     if (isPSF && (psf != NULL)) {
+      if (psf->growth != NULL) {
+          source->apMag += pmGrowthCurveCorrect (psf->growth, model->radius);
+      }
+
       rflux   = pow (10.0, 0.4*source->fitMag);
-      source->apMag  -= rflux * psf->skyBias * (M_PI * PS_SQR(apRadius));
-      source->fitMag += psPolynomial3DEval (psf->ApTrend, x, y, 0.0);
+      source->apMag  -= PS_SQR(model->radius)*rflux * psf->skyBias + psf->skySat / rflux;
+      source->fitMag += psPolynomial4DEval (psf->ApTrend, x, y, 0.0, 0.0);
     }
+
+    // unmask aperture
+    psImageKeepCircle (source->mask, x, y, radius, "AND", ~PSPHOT_MASK_MARKED);
 
     // subtract object, leave local sky
     pmSourceSubModel (source->pixels, source->mask, model, false, false);
-
-    // unmask aperture
-    psImageKeepCircle (source->mask, x, y, radius, "AND", ~PSPHOT_MASK_MARKED);
 
     if (!status) return NULL;
@@ -62 +66 @@
 
 /*
-aprMag' - fitMag = rflux*skyBias + ApTrend(x,y)
-(aprMag - rflux*skyBias) - fitMAg = ApTrend(x,y)
-(aprMag - rflux*skyBias) = fitMAg + ApTrend(x,y)
+aprMag' - fitMag = flux*skySat + r^2*rflux*skyBias + ApTrend(x,y)
+(aprMag - flux*skySat - r^2*rflux*skyBias) - fitMAg = ApTrend(x,y)
+(aprMag - flux*skySat - r^2*rflux*skyBias) = fitMAg + ApTrend(x,y)
+
 */