Changeset 25755 for trunk/psphot/src/psphotExtendedSourceAnalysis.c

Timestamp:

Oct 2, 2009, 3:12:47 PM (17 years ago)

Author:

eugene

Message:

check in changes from gene@development branch : extensive changes to moments calculation, psf model generation, aperture residuals; improvements to extended source analysis

Location:

trunk/psphot/src

Files:

• . (modified) (1 prop)
• psphotExtendedSourceAnalysis.c (modified) (8 diffs)

trunk/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

trunk/psphot/src/psphotExtendedSourceAnalysis.c

@@ -21 +21 @@
     }
 
-    // option to limit analysis to a specific region
-    char *region = psMetadataLookupStr (&status, recipe, "ANALYSIS_REGION");
-    psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
-    if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
+    // XXX require petrosian analysis for non-linear fits? 
+
+    // XXX temporary user-supplied systematic sky noise measurement (derive from background model)
+    float skynoise = psMetadataLookupF32 (&status, recipe, "SKY.NOISE");
+
+# if (0)
+    // if backModel or backStdev are missing, the values of sky and/or skyErr will be set to NAN
+    // XXX use this to set skynoise
+    pmReadout *backModel = psphotSelectBackground (config, view);
+    pmReadout *backStdev = psphotSelectBackgroundStdev (config, view);
+# endif
 
     // S/N limit to perform full non-linear fits
@@ -38 +45 @@
     sources = psArraySort (sources, pmSourceSortBySN);
 
-    // XXX some init functions for the extended source recipe options?
+    // option to limit analysis to a specific region
+    char *region = psMetadataLookupStr (&status, recipe, "ANALYSIS_REGION");
+    psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
+    if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
 
     // choose the sources of interest
@@ -49 +59 @@
         if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
+        if (source->mode & PM_SOURCE_MODE_DEFECT) continue;
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) continue;
+        if (!(source->mode & PM_SOURCE_MODE_EXT_LIMIT)) continue;
 
         // limit selection to some SN limit
@@ -68 +81 @@
         // if we request any of these measurements, we require the radial profile
         if (doPetrosian || doIsophotal || doAnnuli || doKron) {
-            if (!psphotRadialProfile (source, recipe, maskVal)) {
+            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);
                 pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-                source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
                 continue;
             }
@@ -79 +91 @@
         }
 
+        // Petrosian Mags
+        if (doPetrosian) {
+            if (!psphotPetrosian (source, recipe, skynoise, maskVal)) {
+                psTrace ("psphot", 5, "measured 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 (0)
         // Isophotal Mags
         if (doIsophotal) {
@@ -89 +113 @@
             }
         }
-
-        // Petrosian Mags
-        if (doPetrosian) {
-            if (!psphotPetrosian (source, recipe, maskVal)) {
-                psTrace ("psphot", 5, "measured 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;
-            }
-        }
-
         // Kron Mags
         if (doKron) {
@@ -111 +123 @@
             }
         }
-
-        // Radial Annuli
-        if (doAnnuli) {
-            if (!psphotAnnuli (source, recipe, maskVal)) {
-                psError(PSPHOT_ERR_UNKNOWN, false, "failure in Annuli analysis");
-                return false;
-            } 
-            psTrace ("psphot", 5, "measured annuli for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-            Nannuli ++;
-            source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
-        }
+# endif
 
         // re-subtract the object, leave local sky
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-        source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+
+        if (source->extpars) {
+            pmSourceRadialProfileFreeVectors(source->extpars->profile);
+        }
     }
 
@@ -133 +138 @@
     psLogMsg ("psphot", PS_LOG_INFO, "  %d annuli\n", Nannuli);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d kron\n", Nkron);
+
+    psphotVisualShowResidualImage (readout);
+
+    if (doPetrosian) {
+        psphotVisualShowPetrosians (sources);
+    }
+
     return true;
 }

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy