Changeset 29548 for trunk/psphot/src/psphotExtendedSourceAnalysisByObject.c

Timestamp:

Oct 25, 2010, 3:16:58 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

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

trunk/psphot/src/psphotExtendedSourceAnalysisByObject.c

@@ -38 +38 @@
     // which extended source analyses should we perform?
     bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
-    bool doIsophotal    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ISOPHOTAL");
     bool doAnnuli       = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
-    bool doKron         = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_KRON");
 
     // number of images used to define sources
@@ -117 +115 @@
 
             // if we request any of these measurements, we require the radial profile
-            if (doPetrosian || doIsophotal || doAnnuli || doKron) {
+            if (doPetrosian || doAnnuli) {
                 if (!psphotRadialProfile (source, recipe, skynoise, maskVal)) {
                     // all measurements below require the radial profile; skip them all
                     // re-subtract the object, leave local sky
-                    psTrace ("psphot", 5, "failed to extract radial profile for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
+                    psTrace ("psphot", 5, "FAILED radial profile for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
                     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
                     continue;
+                } else {
+                    psTrace ("psphot", 5, "measured radial profile for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
+                    Nannuli ++;
+                    source->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
                 }
-                source->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
             }
 
@@ -138 +139 @@
                 }
             }
-
 
             // re-subtract the object, leave local sky