Changeset 14989 for branches/eam_branch_20070921/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Sep 23, 2007, 5:00:44 PM (19 years ago)

Author:

eugene

Message:

converted pmPSF to use pmTrend2D to represent psf parameters; updated PSF I/O to handle full pmTrend2D

File:

• branches/eam_branch_20070921/psModules/src/objects/pmSourcePhotometry.c (modified) (4 diffs)

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

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 02:46:46 $
+ *  @version $Revision: 1.31.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 03:00:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
     // we must have a valid model
     model = pmSourceGetModel (&isPSF, source);
-    if (model == NULL)
-        return false;
+    if (model == NULL) {
+        psTrace ("psModules.objects", 3, "fail mag : no valid model");
+        return false;
+    }
 
     if (model->dparams->data.F32[PM_PAR_I0] > 0) {
@@ -109 +111 @@
     // measure EXT model photometry
     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?
+    if ((mode & PM_SOURCE_PHOT_APCORR) && isPSF && psf && psf->ApTrend) {
         source->psfMag += pmTrend2DEval (psf->ApTrend, x, y);
     }
 
-    if (!isfinite(SN) || (SN < AP_MIN_SN))
-        return false;
+    if (!isfinite(SN) || (SN < AP_MIN_SN)) {
+        psTrace ("psModules.objects", 3, "fail mag : bad SN: %f (limit: %f)", SN, AP_MIN_SN);
+        return false;
+    }
 
     // replace source flux
@@ -209 +213 @@
     status = pmSourcePhotometryAper  (&source->apMag, model, flux, source->maskObj, maskVal);
     if (!status) {
+        psTrace ("psModules.objects", 3, "fail mag : bad Ap Mag");
         psErrorCode last = psErrorCodeLast();
         if (last == PM_ERR_PHOTOM) {