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

Timestamp:

Oct 9, 2013, 4:14:19 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20130904/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotExtendedSourceAnalysis.c (modified) (11 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
+void psphotRadialProfileShowSkips ();
 
 // measure the elliptical radial profile and use this to measure the petrosian parameters for the sources
@@ -33 +34 @@
 }
 
+/*** for the moment, this test code : it is not thread safe ***/
+int    Nall = 0;
+int  Nskip1 = 0;
+int  Nskip2 = 0;
+int  Nskip3 = 0;
+int  Nskip4 = 0;
+int  Nskip5 = 0;
+int  Nskip6 = 0;
+int  Nskip7 = 0;
+int  Nskip8 = 0;
+int  Nskip9 = 0;
+int Nskip10 = 0;
+int Nskip11 = 0;
+int Nskip12 = 0;
+int Nskip13 = 0;
+int Nskip14 = 0;
+
+# define SKIP(VALUE) { VALUE++; continue; }
+
 // aperture-like measurements for extended sources
 bool psphotExtendedSourceAnalysisReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe) {
 
     bool status;
+    int NfaintEXT = 0;
+    int NfaintPSF = 0;
+
     int Next = 0;
     int Npetro = 0;
@@ -108 +131 @@
             PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for Npetro
             PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for Nannuli
+            PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for NfaintEXT
+            PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for NfaintPSF
 
 // set this to 0 to run without threading
-# if (1)            
+# if (0)            
             if (!psThreadJobAddPending(job)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
@@ -129 +154 @@
             scalar = job->args->data[7];
             Nannuli += scalar->data.S32;
+            scalar = job->args->data[8];
+            NfaintEXT += scalar->data.S32;
+            scalar = job->args->data[9];
+            NfaintPSF += scalar->data.S32;
             psFree(job);
 # endif
@@ -153 +182 @@
                 scalar = job->args->data[7];
                 Nannuli += scalar->data.S32;
+                scalar = job->args->data[8];
+                NfaintEXT += scalar->data.S32;
+                scalar = job->args->data[9];
+                NfaintPSF += scalar->data.S32;
             }
             psFree(job);
@@ -163 +196 @@
     psLogMsg ("psphot", PS_LOG_INFO, "  %d petrosian\n", Npetro);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d annuli\n", Nannuli);
+    psLogMsg ("psphot", PS_LOG_INFO, "  skipped: %d EXT, %d PSF\n", NfaintEXT, NfaintPSF);
+
+    fprintf (stderr, "ext analysis skipped @ 1  : %d\n", Nskip1);
+    fprintf (stderr, "ext analysis skipped @ 2  : %d\n", Nskip2);
+    fprintf (stderr, "ext analysis skipped @ 3  : %d\n", Nskip3);
+    fprintf (stderr, "ext analysis skipped @ 4  : %d\n", Nskip4);
+    fprintf (stderr, "ext analysis skipped @ 5  : %d\n", Nskip5);
+    fprintf (stderr, "ext analysis skipped @ 6  : %d\n", Nskip6);
+    fprintf (stderr, "ext analysis skipped @ 7  : %d\n", Nskip7);
+    fprintf (stderr, "ext analysis skipped @ 8  : %d\n", Nskip8);
+    fprintf (stderr, "ext analysis skipped @ 9  : %d\n", Nskip9);
+    fprintf (stderr, "ext analysis skipped @ 10 : %d\n", Nskip10);
+    fprintf (stderr, "ext analysis skipped @ 11 : %d\n", Nskip11);
+    fprintf (stderr, "ext analysis skipped @ 12 : %d\n", Nskip12);
+    fprintf (stderr, "ext analysis skipped @ 13 : %d\n", Nskip13);
+    fprintf (stderr, "ext analysis skipped @ 14 : %d\n", Nskip14);
+
+    psphotRadialProfileShowSkips ();
 
     psphotVisualShowResidualImage (readout, false);
@@ -177 +228 @@
 
     bool status;
+
+    int NfaintEXT = 0;
+    int NfaintPSF = 0;
 
     int Next = 0;
@@ -207 +261 @@
         pmSource *source = sources->data[i];
 
+        Nall ++;
+
         // if we have checked the source validity on the basis of the object set, then 
         // we either skip these tests below or we skip the source completely
-        if (source->tmpFlags & PM_SOURCE_TMPF_PETRO_SKIP) continue;
+        if (source->tmpFlags & PM_SOURCE_TMPF_PETRO_SKIP) SKIP (Nskip1);
         if (source->tmpFlags & PM_SOURCE_TMPF_PETRO_KEEP) goto keepSource;
 
         // skip PSF-like and non-astronomical objects
-        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->type == PM_SOURCE_TYPE_DEFECT) SKIP (Nskip2);
+        if (source->type == PM_SOURCE_TYPE_SATURATED) SKIP (Nskip3);
+        if (source->mode & PM_SOURCE_MODE_DEFECT) SKIP (Nskip4);
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) SKIP (Nskip5);
 
         // skip saturated stars modeled with a radial profile 
-        if (source->mode2 & PM_SOURCE_MODE2_SATSTAR_PROFILE) continue;
+        if (source->mode2 & PM_SOURCE_MODE2_SATSTAR_PROFILE) SKIP (Nskip6);
 
         // optionally allow non-extended objects to get petrosians as well
         if (!doPetroStars) {
-            if (!(source->mode & PM_SOURCE_MODE_EXT_LIMIT)) continue;
-            if (source->type == PM_SOURCE_TYPE_STAR) continue;
+            if (!(source->mode & PM_SOURCE_MODE_EXT_LIMIT)) SKIP (Nskip7);
+            // if (source->type == PM_SOURCE_TYPE_STAR) SKIP (Nskip8); -- XXX this might be set for input lists (instead of EXT_LIMIT)
         }
 
@@ -233 +289 @@
         if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
             skipSource = (source->moments->KronFlux < SN_LIM * source->moments->KronFluxErr);
+            NfaintEXT ++;
         } else {
             skipSource = (sqrt(source->peak->detValue) < SN_LIM);
-        }
-        if (skipSource) continue;
+            NfaintPSF ++;
+        }
+        if (skipSource) SKIP (Nskip9);
 
         // limit selection by analysis region (this automatically apply
-        if (source->peak->x < region->x0) continue;
-        if (source->peak->y < region->y0) continue;
-        if (source->peak->x > region->x1) continue;
-        if (source->peak->y > region->y1) continue;
+        if (source->peak->x < region->x0) SKIP (Nskip10);
+        if (source->peak->y < region->y0) SKIP (Nskip11);
+        if (source->peak->x > region->x1) SKIP (Nskip12);
+        if (source->peak->y > region->y1) SKIP (Nskip13);
 
     keepSource:
@@ -266 +324 @@
                 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);
-                continue;
+                SKIP (Nskip14);
             }
             Nannuli ++;
@@ -304 +362 @@
     scalar->data.S32 = Nannuli;
 
+    scalar = job->args->data[8];
+    scalar->data.S32 = NfaintEXT;
+
+    scalar = job->args->data[9];
+    scalar->data.S32 = NfaintPSF;
+
     return true;
 }