Changeset 31327 for branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Apr 20, 2011, 10:52:17 AM (15 years ago)

Author:

eugene

Message:

count pixels actually used for apertures; remove deprecated sky bias correction code

File:

• branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c (modified) (5 diffs)

branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c

@@ -102 +102 @@
     bool isPSF;
     float x, y;
-    float rflux;
     float SN;
     pmModel *model;
@@ -246 +245 @@
             // XXX correct the apFlux?
         }
-        if (mode & PM_SOURCE_PHOT_APCORR) {
-            // XXX this should be removed -- we no longer fit for the 'sky bias'
-            // XXX is this happening???
-            rflux   = pow (10.0, 0.4*source->psfMag);
-            psAssert (psf->skyBias == 0.0, "sky bias not 0");
-            psAssert (psf->skySat == 0.0, "sky sat not 0");
-            source->apMag -= PS_SQR(source->apRadius)*rflux * psf->skyBias + psf->skySat / rflux;
-        }
     }
     if (mode & PM_SOURCE_PHOT_INTERP) {
@@ -309 +300 @@
 
     bool status;
-    status = pmSourcePhotometryAper(&source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal);
+    int nPix = 0;
+    status = pmSourcePhotometryAper(&nPix, &source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal);
     if (status) {
         source->mode |= PM_SOURCE_MODE_AP_MAGS;
     }
-
     return status;
 }
 
 // return source aperture magnitude
-bool pmSourcePhotometryAper (float *apMag, float *apFluxOut, float *apFluxErr, pmModel *model, psImage *image, psImage *variance, psImage *mask, psImageMaskType maskVal)
+bool pmSourcePhotometryAper (int *nPixOut, float *apMag, float *apFluxOut, float *apFluxErr, pmModel *model, psImage *image, psImage *variance, psImage *mask, psImageMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(apMag, false);
@@ -331 +322 @@
     float apFlux = 0;
     float apFluxVar = 0;
+    int nPix = 0;
 
     if (DO_SKY) {
@@ -348 +340 @@
             apFlux += imData[iy][ix] - sky;
             apFluxVar += varData[iy][ix];
-        }
-    }
+            nPix ++;
+        }
+    }
+    
     if (apFluxOut) *apFluxOut = apFlux;
     if (apFluxErr) *apFluxErr = sqrt(fabs(apFluxVar));
+    if (nPixOut) *nPixOut = nPix;
 
     if (apFlux <= 0) {