Changeset 33437

Timestamp:

Mar 7, 2012, 11:32:49 AM (14 years ago)

Author:

bills

Message:

Fix the psphotStack failure to find stamps problem.
A bug deep in psModules caused an infinite value for the aperture
correction to be calculated which caused all AP_MAGs to be NULL.
Work around this problem in pmSubtractionStamps by checking apMag raw
if !finite(apMag)

Location:

tags/ipp-20120216/psModules/src

Files:

• extras/psVectorBracket.c (modified) (1 diff)
• imcombine/pmSubtractionStamps.c (modified) (1 diff)

tags/ipp-20120216/psModules/src/extras/psVectorBracket.c

@@ -51 +51 @@
         }
     }
-    // at this point, index[Nhi] >= key > index[Nlo]
-    N = Nhi;
+    N = (Nhi >= index->n) ? Nhi - 1 : Nhi;
+    // at this point, index[N] >= key > index[Nlo]
     while ((index->data.F32[N] >= key) && (N > Nlo)) {
         N--;

tags/ipp-20120216/psModules/src/imcombine/pmSubtractionStamps.c

@@ -1208 +1208 @@
         // XXX this is somewhat arbitrary...
         if (source->psfMagErr > 0.05) continue;
-        if (fabs(source->psfMag - source->apMag) > 0.5) continue;
+        if (isfinite(source->apMag)) {
+            if (fabs(source->psfMag - source->apMag) > 0.5) continue;
+        } else if (isfinite(source->apMagRaw)) {
+            if (fabs(source->psfMag - source->apMagRaw) > 0.5) continue;
+        } else {
+            // XXX: Should we carry on or drop this source?
+            // drop it for now
+            continue;
+        }
 
         if (source->modelPSF) {