Changeset 34838 for branches/eam_branches/ipp-20121130/psphot/src/psphotSourceMatch.c

Timestamp:

Dec 18, 2012, 5:56:48 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotSourceMatch.c (modified) (4 diffs)

branches/eam_branches/ipp-20121130/psphot/src/psphotSourceMatch.c

@@ -7 +7 @@
     int     order;
     bool    matchAll;
+    long    nSources;
+    float   yRatioMax;
     char    filterID[MATCH_INFO_FILTER_STR_LEN];
 } psphotStackMatchInfo;
@@ -218 +220 @@
         pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
         psAssert (detections, "missing detections?");
+        psAssert (detections->allSources, "all sources not defined?");
 
         detArrays->data[i] = psMemIncrRefCounter(detections);
         readouts->data[i] = psMemIncrRefCounter(readout);
+    }
+
+    // We are having a problem with large number of false y band detections causing large numbers of
+    // matched detections to be created.
+    // The matchInfo recipe each entry contains a value for Y.RATIO.MAX. For each filter with a non-zero value
+    // we compare the ratio of the number of y detections to the number of detections in that filter to Y.RATIO.MAX.
+    // If the ratio in all filters with a non-zero is above its limit we consider the y band stack to
+    // be suspect and so disable the y band matchAll recipe (if set)
+
+    int iy = -1;
+    // note now we are looping over matchInfo
+    for (int i = 0; i < nImages; i++) {
+        // Remember which input is y
+        if (!strcmp(matchInfo[i].filterID, "y")) {
+            iy = i;
+        }
+        pmDetections *detections = detArrays->data[matchInfo[i].inputNum];
+        matchInfo[i].nSources = detections->allSources->n;
+    }
+
+    if (iy >= 0) {
+        int nCut = 0;
+        int nTry = 0;
+        for (int i = 0; i < nImages; i++) {
+            if (i == iy) continue;
+            if (matchInfo[i].yRatioMax != 0.0 && matchInfo[i].nSources > 0) {
+                ++nTry;
+                float ratio = (float) matchInfo[iy].nSources / (float) matchInfo[i].nSources;
+                psLogMsg ("psphot", PS_LOG_DETAIL, "nSrc_y / nSrc_%s: %6.3f max: %6.3f", matchInfo[i].filterID, ratio,
+                    matchInfo[i].yRatioMax);
+                if (ratio > matchInfo[i].yRatioMax) {
+                    // This one is above it's threshold
+                    ++nCut;
+                }
+            }
+        }
+        if (nTry > 0 && nCut == nTry) {
+            // All filters with a cut were above the threshold. Disable matchAll for y band
+            psLogMsg ("psphot", PS_LOG_INFO, "Clearing y band matchAll because y ratio was too high in %d filters", nTry);
+            matchInfo[iy].matchAll = false;
+        }
     }
 
@@ -516 +560 @@
             bool matchAll = (strcasecmp("true", matchAllStr) == 0);
 
+            psString yRatioStr = psMetadataLookupStr (&status, item->data.md, "Y.RATIO.MAX");
+            psF32 yRatioMax = atof(yRatioStr);
+
             // look for this filter in the inputs
             for (int i = 0; i < num; i++) {
@@ -524 +571 @@
                     matchInfo[i].order = order;
                     matchInfo[i].matchAll = matchAll;
+                    matchInfo[i].yRatioMax = yRatioMax;
+                    matchInfo[i].nSources = 0;
                     psLogMsg ("psphot", PS_LOG_DETAIL, "input: %d %s match order: %d match all: %d\n",
                                                                i, thisFilter, order, matchAll);