Changeset 17111

Timestamp:

Mar 24, 2008, 4:31:41 PM (18 years ago)

Author:

eugene

Message:

track number of measured values

File:

• trunk/psphot/src/psphotExtendedSources.c (modified) (9 diffs)

trunk/psphot/src/psphotExtendedSources.c

@@ -5 +5 @@
     bool status;
     int Next = 0;
-    int Npsf = 0;
+    int Nconvolve = 0;
+    int Npetro = 0;
+    int Nisophot = 0;
+    int Nannuli = 0;
+    int Nkron = 0;
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
@@ -11 +15 @@
     assert (maskVal);
 
-    // S/N limit to perform full non-linear fits
+    // perform full non-linear fits / extended source analysis?
     if (!psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS")) {
         psLogMsg ("psphot", PS_LOG_INFO, "skipping extended source measurements\n");
@@ -58 +62 @@
 
         // if model is NULL, we don't have a starting guess
+        // XXX this is probably not needed for objects where we only measure aperture-like terms
         if (source->modelEXT == NULL) continue;
 
@@ -73 +78 @@
             pmSourceCacheModel (source, maskVal); // XXX put this in the source model function?
             psTrace ("psphot", 5, "psf-convolved model for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
-            Npsf ++;
+            Nconvolve ++;
         }
 
@@ -90 +95 @@
             return false;
         } else {
-            psTrace ("psphot", 5, "psf-convolved model for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
-            Npsf ++;
+            psTrace ("psphot", 5, "measured petrosian flux & radius for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
+            Npetro ++;
         }
 
@@ -99 +104 @@
         } else {
             psTrace ("psphot", 5, "psf-convolved model for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
-            Npsf ++;
+            Nisophot ++;
         }
 
@@ -107 +112 @@
         } else {
             psTrace ("psphot", 5, "psf-convolved model for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
-            Npsf ++;
+            Nannuli ++;
         }
 
@@ -115 +120 @@
         } else {
             psTrace ("psphot", 5, "psf-convolved model for source at %7.1f, %7.1f", source->moments->x, source->moments->y);
-            Npsf ++;
+            Nkron ++;
         }
 
@@ -124 +129 @@
 
     psLogMsg ("psphot", PS_LOG_INFO, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot"), Next);
+    psLogMsg ("psphot", PS_LOG_INFO, "  %d convolved models\n", Nconvolve);
+    psLogMsg ("psphot", PS_LOG_INFO, "  %d petrosian\n", Npetro);
+    psLogMsg ("psphot", PS_LOG_INFO, "  %d isophotal\n", Nisophot);
+    psLogMsg ("psphot", PS_LOG_INFO, "  %d annuli\n", Nannuli);
+    psLogMsg ("psphot", PS_LOG_INFO, "  %d kron\n", Nkron);
     return true;
 }