Changeset 33418

Timestamp:

Mar 5, 2012, 7:27:02 PM (14 years ago)

Author:

bills

Message:

Fix another psphotStack assertion failure

Location:

tags/ipp-20120216/psModules

Files:

• . (modified) (1 prop)
• src/detrend (modified) (1 prop)
• src/objects/models/pmModel_QGAUSS.c (modified) (1 diff)
• src/objects/pmModelUtils.c (modified) (1 diff)

tags/ipp-20120216/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -402 +402 @@
     assert (psf->params->n > PM_PAR_YPOS);
     assert (psf->params->n > PM_PAR_XPOS);
+
+    if (! isfinite(Io)) {
+        fprintf(stderr, "non-finite Io passed to PM_MODEL_PARAMS_FROM_PSF\n");
+        return false;
+    }
 
     PAR[PM_PAR_SKY]  = 0.0;

tags/ipp-20120216/psModules/src/objects/pmModelUtils.c

@@ -144 +144 @@
 
     *Io = source->peak->rawFlux;
+
+#ifndef ALLOW_NONFINITE_PEAK
+    // Gene says fail of peak !finite
+    if (!isfinite(*Io)) return false;
+#else 
+    // This is the way it used to be. Somtimes an infinite value Io made it's way down the pipeline
+    // causing assertion failures
     if (!isfinite(*Io) && !source->moments) return false;
 
     *Io = source->moments->Peak;
     if (!isfinite(*Io)) return false;
+#endif
 
     return true;