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

Timestamp:

Apr 17, 2006, 7:10:08 AM (20 years ago)

Author:

magnier

Message:

fixed up object output file functions, small speed improvements

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-14 21:43:59 $
+ *  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 17:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 
 // XXX EAM : masked region should be (optionally) elliptical
-// XXX curve of growth is corrected to
-pmModel *pmSourceMagnitudes (pmSource *source, pmPSF *psf, bool growthCorr, bool apTrendCorr)
-{
-
-    int status;
+bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode)
+{
+
+    int status = false;
     bool isPSF;
     float x, y;
@@ -67 +66 @@
     pmModel *model;
 
+    source->psfMag = 99.0;
+    source->extMag = 99.0;
+    source->errMag = 99.0;
+    source->apMag  = 99.0;
+
     switch (source->type) {
     case PM_SOURCE_TYPE_STAR:
         model = source->modelPSF;
         if (model == NULL)
-            return NULL;
+            return false;
         isPSF = true;
         break;
@@ -78 +82 @@
         model = source->modelEXT;
         if (model == NULL)
-            return NULL;
+            return false;
         isPSF = false;
         break;
 
     default:
-        return NULL;
+        return false;
     }
 
@@ -96 +100 @@
     y = model->params->data.F32[3];
 
+    // measure object model photometry
+    status = pmSourcePhotometryModel (&source->psfMag, source->modelPSF);
+    status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
+    // for PSFs, correct both apMag and psfMag to same system, consistent with infinite flux star in aperture RADIUS
+    if ((mode & PM_SOURCE_PHOT_APCORR) && isPSF && psf) {
+        // convert to the equivalent 2D model?
+        source->psfMag += psPolynomial4DEval (psf->ApTrend, x, y, 0.0, 0.0);
+    }
+
+    if (SN < AP_MIN_SN)
+        return false;
+
     // replace source flux
     // XXX test to see if source has been subtracted?
@@ -103 +119 @@
     psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
 
-    // measure object model photometry
-    status = pmSourcePhotometryModel (&source->psfMag, source->modelPSF);
-    status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
-
     // measure the weight of included pixels
-    status = pmSourcePixelWeight (&source->pixWeight, model, source->pixels, source->mask);
+    if (mode & PM_SOURCE_PHOT_WEIGHT) {
+        pmSourcePixelWeight (&source->pixWeight, model, source->pixels, source->mask);
+    }
 
     // measure object aperture photometry
-    if (SN > AP_MIN_SN) {
-        status = pmSourcePhotometryAper  (&source->apMag, model, source->pixels, source->mask);
-    } else {
-        source->apMag = 99.0;
-    }
+    status = pmSourcePhotometryAper  (&source->apMag, model, source->pixels, source->mask);
 
     // for PSFs, correct both apMag and psfMag to same system, consistent with infinite flux star in aperture RADIUS
-    if (isPSF && (psf != NULL)) {
-        if (SN > AP_MIN_SN) {
-            if ((psf->growth != NULL) && growthCorr) {
-                source->apMag += pmGrowthCurveCorrect (psf->growth, model->radiusTMP);
-            }
-            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);
+    if (status && isPSF && psf) {
+        if (psf->growth && (mode & PM_SOURCE_PHOT_GROWTH)) {
+            source->apMag += pmGrowthCurveCorrect (psf->growth, model->radiusTMP);
+        }
+        if (mode & PM_SOURCE_PHOT_APCORR) {
+            rflux   = pow (10.0, 0.4*source->psfMag);
+            source->apMag  -= PS_SQR(model->radiusTMP)*rflux * psf->skyBias + psf->skySat / rflux;
         }
     }
@@ -139 +144 @@
     pmModelSub (source->pixels, source->mask, model, false, false);
 
-    if (!status)
-        return NULL;
-    return model;
+    return status;
 }