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

Timestamp:

May 2, 2010, 11:32:52 AM (16 years ago)

Author:

eugene

Message:

updates to psphotVisual mandated by kapa API changes; added psphotRadialBins; fixed up petrosian calculations (now correctly generate petRad, petMag, petR50, and petR90); updates to psphotPetrosianVisual to handle structure changes; option to use elliptical or circular profiles for radial flux and petrosians

File:

• trunk/psphot/src/psphotExtendedSourceAnalysis.c (modified) (6 diffs)

trunk/psphot/src/psphotExtendedSourceAnalysis.c

@@ -39 +39 @@
     int Nkron = 0;
 
+    psTimerStart ("psphot.extended");
+
     // find the currently selected readout
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
@@ -66 +68 @@
     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
     float SN_LIM = psMetadataLookupF32 (&status, recipe, "EXTENDED_SOURCE_SN_LIM");
@@ -81 +76 @@
     bool doAnnuli       = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
     bool doKron         = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_KRON");
+
+# 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
 
     // source analysis is done in S/N order (brightest first)
@@ -119 +121 @@
         Next ++;
 
+        // force source image to be a bit larger...
+        float radius = source->peak->xf - source->pixels->col0;
+        radius = PS_MAX (radius, source->peak->yf - source->pixels->row0);
+        radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
+        radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
+        pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
+
         // if we request any of these measurements, we require the radial profile
         if (doPetrosian || doIsophotal || doAnnuli || doKron) {
@@ -134 +143 @@
         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);
+                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);
@@ -169 +178 @@
 
         if (source->extpars) {
-            pmSourceRadialProfileFreeVectors(source->extpars->profile);
+            psFree(source->extpars->radFlux);
+            psFree(source->extpars->ellipticalFlux);
         }
     }
 
-    psLogMsg ("psphot", PS_LOG_INFO, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot"), Next);
+    psLogMsg ("psphot", PS_LOG_INFO, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot.extended"), Next);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d petrosian\n", Npetro);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d isophotal\n", Nisophot);