Changeset 15090

Timestamp:

Sep 28, 2007, 2:15:51 PM (19 years ago)

Author:

eugene

Message:

handle errors in pmTrend2DEval

File:

• trunk/psModules/src/objects/pmSourcePhotometry.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-24 21:27:58 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-29 00:15:51 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99 +99 @@
     if (psf->FluxScale) {
         double fluxScale = pmTrend2DEval (psf->FluxScale, x, y);
-        if (isfinite(fluxScale) && (fluxScale > 0.0)) {
-            source->psfMag = -2.5*log10(fluxScale * source->modelPSF->params->data.F32[PM_PAR_I0]);
+        if (!isfinite(fluxScale)) {
+            // XXX objects on the edge can be slightly outside -- if we get an 
+            // error, use the full fit.
+            psErrorClear();
+            status = pmSourcePhotometryModel (&source->psfMag, source->modelPSF);
         } else {
-            source->psfMag = NAN;
+            if (isfinite(fluxScale) && (fluxScale > 0.0)) {
+                source->psfMag = -2.5*log10(fluxScale * source->modelPSF->params->data.F32[PM_PAR_I0]);
+            } else {
+                source->psfMag = NAN;
+            }
         }
     } else {
@@ -214 +221 @@
         psTrace ("psModules.objects", 3, "fail mag : bad Ap Mag");
         psErrorCode last = psErrorCodeLast();
+        // XXX flag the object?
         if (last == PM_ERR_PHOTOM) {
             // the aper mag was undefined (flux < 0).  bad object, but