Changeset 25027 for branches/pap/psModules/src/objects/pmSourceMatch.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceMatch.c (modified) (9 diffs)

branches/pap/psModules/src/objects/pmSourceMatch.c

@@ -45 +45 @@
                          psVector **x, psVector **y, // Coordinate vectors to return
                          psVector **mag, psVector **magErr, // Magnitude and error vectors to return
+                         psVector **indices, // Indices for sources
                          const psArray *sources // Input sources
     )
@@ -58 +59 @@
     *mag = psVectorRecycle(*mag, numSources, PS_TYPE_F32);
     *magErr = psVectorRecycle(*magErr, numSources, PS_TYPE_F32);
+    *indices = psVectorRecycle(*indices, numSources, PS_TYPE_S32);
     float xMin = INFINITY, xMax = -INFINITY, yMin = INFINITY, yMax = -INFINITY; // Bounds of sources
     long num = 0;                       // Number of valid sources
     for (long i = 0; i < numSources; i++) {
         pmSource *source = sources->data[i]; // Source of interest
-        if (!source) continue;
-        if (source->mode & SOURCE_MASK) continue;
-        if (!isfinite(source->psfMag)) continue;
-        if (!isfinite(source->errMag)) continue;
-        if (source->psfMag > SOURCE_FAINTEST) continue;
+        if (!source || (source->mode & SOURCE_MASK) || !isfinite(source->psfMag) ||
+            !isfinite(source->errMag) || source->psfMag > SOURCE_FAINTEST) {
+            continue;
+        }
 
         float xSrc, ySrc;               // Coordinates of source
@@ -78 +79 @@
         (*y)->data.F32[num] = ySrc;
         (*mag)->data.F32[num] = source->psfMag;
-        (*magErr)->data.F32[num] = source->errMag ;
+        (*magErr)->data.F32[num] = source->errMag;
+        (*indices)->data.S32[num] = i;
         num++;
     }
@@ -85 +87 @@
     (*mag)->n = num;
     (*magErr)->n = num;
+    (*indices)->n = num;
 
     if (*bounds) {
@@ -175 +178 @@
         psVector *xImage = NULL, *yImage = NULL; // Coordinates of sources
         psVector *magImage = NULL, *magErrImage = NULL; // Magnitude and mag
-
-        int numSources = sourcesParse(&boundsImage, &xImage, &yImage, &magImage, &magErrImage,
+        psVector *indices = NULL;     // Indices for sources
+
+        int numSources = sourcesParse(&boundsImage, &xImage, &yImage, &magImage, &magErrImage, &indices,
                                       sources); // Number of sources
 
@@ -187 +191 @@
             for (int j = 0; j < numSources; j++) {
                 pmSourceMatch *match = pmSourceMatchAlloc(); // Match data
-                pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j], i, j);
+                pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j],
+                                 i, indices->data.S32[j]);
                 matches->data[j] = match;
             }
@@ -206 +211 @@
             for (int j = 0, k = numMaster; j < numSources; j++, k++) {
                 pmSourceMatch *match = pmSourceMatchAlloc(); // Match data
-                pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j], i, j);
+                pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j],
+                                 i, indices->data.S32[j]);
                 matches->data[k] = match;
             }
@@ -231 +237 @@
                     // Record the match
                     pmSourceMatch *match = matches->data[index]; // Match data
-                    pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j], i, j);
+                    pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j],
+                                     i, indices->data.S32[j]);
                     numMatch++;
                 } else {
                     // Add to the master list
                     pmSourceMatch *match = pmSourceMatchAlloc(); // Match data
-                    pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j], i, j);
+                    pmSourceMatchAdd(match, magImage->data.F32[j], magErrImage->data.F32[j],
+                                     i, indices->data.S32[j]);
                     xMaster->data.F32[numMaster] = xImage->data.F32[j];
                     yMaster->data.F32[numMaster] = yImage->data.F32[j];
@@ -469 +477 @@
 
     if (!psVectorStats(stats, trans, NULL, badImage, 0xFF)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to perform statistics on transparencies.");
+        psFree(stats);
+        return -1;
+    }
+    // XXX handle this case better:
+    if (isnan(stats->clippedMean))  {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform statistics on transparencies.");
         psFree(stats);