Changeset 34838 for branches/eam_branches/ipp-20121130/psphot/src

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/psphotOutput.c (modified) (4 diffs)
• src/psphotSourceMatch.c (modified) (4 diffs)
• src/psphotSourceSize.c (modified) (3 diffs)
• src/psphotStackImageLoop.c (modified) (1 prop)

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

@@ -201 +201 @@
     int nCR  = 0;
     int nEXT = 0;
+    int nForced = 0;
+    int nDetections = sources != NULL ? sources->n : 0;
 
     // count the number of sources which will be written and other sub-types
     for (int i = 0; (sources != NULL) && (i < sources->n); i++) {
         pmSource *source = (pmSource *) sources->data[i];
+        if (source->mode2 & PM_SOURCE_MODE2_MATCHED) {
+            nForced ++;
+        }
         pmModel *model = pmSourceGetModel (NULL, source);
         if (model == NULL)
@@ -217 +222 @@
     }
 
+    // XXX: This loop cauess nSrc to be twice as large as it should be. This is kept
+    // for compatability
     for (int i = 0; (sources != NULL) && (i < sources->n); i++) {
         pmSource *source = (pmSource *) sources->data[i];
@@ -226 +233 @@
 
     psMetadataAddS32 (header, PS_LIST_TAIL, "NSTARS",   PS_META_REPLACE, "Number of sources", nSrc);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "NDET",     PS_META_REPLACE, "Number of detections", nDetections);
     psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_EXT", PS_META_REPLACE, "Number of extended sources", nEXT);
     psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_CR",  PS_META_REPLACE, "Number of cosmic rays", nCR);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_FRC", PS_META_REPLACE, "Number of Forced detections", nForced);
     return true;
 }
@@ -306 +315 @@
     psMetadataItemSupplement (&status, header, analysis, "NSTARS");
 
+    psMetadataItemSupplement (&status, header, analysis, "NDET");
     psMetadataItemSupplement (&status, header, analysis, "NDET_EXT");
     psMetadataItemSupplement (&status, header, analysis, "NDET_CR");
+    psMetadataItemSupplement (&status, header, analysis, "NDET_FRC");
 
     psMetadataItemSupplement (&status, header, analysis, "PSPHOT.PSF.APRESID");

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);

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

@@ -11 +11 @@
     float nSigmaMoments;
     float nSigmaCR;
+    bool altDiffExt;
+    float altDiffExtThresh;
     float soft;
     int grow;
@@ -120 +122 @@
     assert (status);
 
+    // Optional extended source measurement algorithm to improve diff image trails
+    options.altDiffExt = psMetadataLookupBool(&status, recipe, "PSPHOT.EXT.DIFF.ALTERNATE");
+    assert (status);
+    // Threshold for this alternate method
+    options.altDiffExtThresh = psMetadataLookupF32(&status, recipe, "PSPHOT.EXT.DIFF.ALTERNATE.THRESH");
+    assert (status);
+    
     // location of a single test source
     options.xtest = psMetadataLookupS32 (&status, recipe, "PSPHOT.CRMASK.XTEST");
@@ -601 +610 @@
             continue;
         }
-
+        // Alternate extended source limit calculation
+        if (options->altDiffExt) {
+          // ratio of major to minor axes
+          // MRV = Major / Minor
+          // MRV = (0.5 * (Mxx + Myy) + 0.5 * sqrt( (Mxx + Myy)^2 + 4 Mxy^2)) /
+          //       (0.5 * (Mxx + Myy) - 0.5 * sqrt( (Mxx + Myy)^2 + 4 Mxy^2))
+          // MRV = (2 * 0.5 * (Mxx + Myy) - Minor) / Minor
+          float momentRatioVeres = (Mxx + Myy - Mminor) / Mminor;
+          bool  isAltEXT = (momentRatioVeres > options->altDiffExtThresh);
+          if (isAltEXT) {
+            psTrace("psphotSourceClassRegion.EXT",4,"CLASS: %g %g\t%g %g\t%g %g\t%g %g\t%g ALTEXT\t%g %g\n",
+                    source->peak->xf, source->peak->yf, Mminor, kMag, dMag, nSigmaMAG, options->sizeLimitCR, options->magLimitCR, options->nSigmaApResid,
+                    momentRatioVeres,options->altDiffExtThresh);
+            source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
+            source->tmpFlags |= PM_SOURCE_TMPF_SIZE_MEASURED;
+            Next ++;
+            continue;
+          }
+        }
+        
         // Everything else should just be treated as a PSF
         psTrace("psphotSourceClassRegion.PSF",4,"CLASS: %g %g\t%g %g\t%g %g\t%g %g\t%g PSF\n",