Changeset 34769 for trunk/psphot/src

Timestamp:

Dec 5, 2012, 3:52:34 PM (14 years ago)

Author:

watersc1

Message:

Implementation of Peter's moments ratio extendedness check. Off by default, but enabled along with other extended threshold changes in the DIFF psphot recipe.

File:

• trunk/psphot/src/psphotSourceSize.c (modified) (3 diffs)

trunk/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",