Changeset 36351 for branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceAnalysis.c

Timestamp:

Dec 4, 2013, 3:41:02 PM (13 years ago)

Author:

eugene

Message:

(re)add doAnnuli / EXTENDED_SOURCE_ANNULI to request radial annuli in the output

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceAnalysis.c (modified) (3 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceAnalysis.c

@@ -16 +16 @@
     psAssert (recipe, "missing recipe?");
 
+    bool doPetrosian = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
+    bool doAnnuli    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
+
     // measure petrosians?
-    if (!psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN")) {
+    if (!doPetrosian && !doAnnuli) {
         psLogMsg ("psphot", PS_LOG_INFO, "skipping extended source measurements\n");
         return true;
@@ -208 +211 @@
     float skynoise          = PS_SCALAR_VALUE(job->args->data[4],F32);
 
+    bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
+
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
     psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
@@ -254 +259 @@
 
         // Petrosian Mags
-        if (!psphotPetrosian (source, recipe, skynoise, maskVal)) {
-          psTrace ("psphot", 5, "FAILED petrosian flux & radius for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-        } else {
-          psTrace ("psphot", 5, "measured petrosian flux & radius for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-          Npetro ++;
-          source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
+        if (doPetrosian) {
+          if (!psphotPetrosian (source, recipe, skynoise, maskVal)) {
+            psTrace ("psphot", 5, "FAILED petrosian flux & radius for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
+          } else {
+            psTrace ("psphot", 5, "measured petrosian flux & radius for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
+            Npetro ++;
+            source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
+          }
         }