Changeset 6751 for branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Mar 31, 2006, 4:47:20 PM (20 years ago)

Author:

magnier

Message:

fixed up low-level issues with sky levels, sky bias

File:

• branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c (modified) (11 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 03:14:23 $
+ *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-01 02:47:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 // XXX EAM : masked region should be (optionally) elliptical
 // XXX curve of growth is corrected to
-pmModel *pmSourceMagnitudes (pmSource *source, pmPSF *psf, float apRadius)
+pmModel *pmSourceMagnitudes (pmSource *source, pmPSF *psf, bool growthCorr, bool apTrendCorr)
 {
 
@@ -62 +62 @@
     float x, y;
     float rflux;
-    float radius;
     float SN;
     pmModel *model;
@@ -71 +70 @@
         if (model == NULL)
             return NULL;
-        radius = (apRadius > 0) ? apRadius : model->radius;
         isPSF = true;
         break;
@@ -79 +77 @@
         if (model == NULL)
             return NULL;
-        radius = model->radius;
         isPSF = false;
         break;
@@ -101 +98 @@
     pmModelAdd (source->pixels, source->mask, model, false, false);
 
-    // set aperture mask circle to scaled radius
-    psImageKeepCircle (source->mask, x, y, model->radius, "OR", PM_SOURCE_MASK_MARKED);
+    // set aperture mask circle to model radius
+    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
 
     // measure object model photometry
@@ -110 +107 @@
     // measure object aperture photometry
     if (SN > AP_MIN_SN) {
-        status = pmSourcePhotometryAper  (&source->apMag,  model, source->pixels, source->mask);
+        status = pmSourcePhotometryAper  (&source->apMag, model, source->pixels, source->mask);
     } else {
         source->apMag = 99.0;
@@ -118 +115 @@
     if (isPSF && (psf != NULL)) {
         if (SN > AP_MIN_SN) {
-            if (psf->growth != NULL) {
-                source->apMag += pmGrowthCurveCorrect (psf->growth, radius);
+            if ((psf->growth != NULL) && growthCorr) {
+                source->apMag += pmGrowthCurveCorrect (psf->growth, model->radiusTMP);
             }
-            rflux   = pow (10.0, 0.4*source->psfMag);
-            source->apMag  -= PS_SQR(model->radius)*rflux * psf->skyBias + psf->skySat / rflux;
-        }
-        source->psfMag += psPolynomial4DEval (psf->ApTrend, x, y, 0.0, 0.0);
+            if (apTrendCorr) {
+                rflux   = pow (10.0, 0.4*source->psfMag);
+                source->apMag  -= PS_SQR(model->radiusTMP)*rflux * psf->skyBias + psf->skySat / rflux;
+            }
+        }
+        if (apTrendCorr) {
+            source->psfMag += psPolynomial4DEval (psf->ApTrend, x, y, 0.0, 0.0);
+        }
     }
 
     // unmask aperture
-    psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PM_SOURCE_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
 
     // subtract object, leave local sky
@@ -168 +169 @@
 }
 
+# define DO_SKY 0
 // return source aperture magnitude
 bool pmSourcePhotometryAper (float *apMag, pmModel *model, psImage *image, psImage *mask)
 {
-
     float apSum = 0;
+    float sky = 0;
     *apMag = 99.0;
 
@@ -179 +181 @@
     }
 
-    float sky = model->params->data.F32[0];
+    if (DO_SKY) {
+        sky = model->params->data.F32[0];
+    } else {
+        sky = 0;
+    }
 
     // measure apMag
@@ -191 +197 @@
     if (apSum <= 0)
         return false;
+
     *apMag = -2.5*log10(apSum);
-
     return (true);
 }