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

Timestamp:

Dec 4, 2013, 2:00:29 PM (13 years ago)

Author:

eugene

Message:

rules for performing the extended source fits and petrosian analysis are defined in psphotChooseAnalysisOptions.c; only the model-specific limits are applied here

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceAnalysis.c (modified) (15 diffs)

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

@@ -2 +2 @@
 void psphotRadialProfileShowSkips ();
 
-// measure the elliptical radial profile and use this to measure the petrosian parameters for the sources
+// measure the petrosian parameters for the sources
 
 // for now, let's store the detections on the readout->analysis for each readout
@@ -16 +16 @@
     psAssert (recipe, "missing recipe?");
 
-    // perform full non-linear fits / extended source analysis?
-    if (!psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANALYSIS")) {
+    // measure petrosians?
+    if (!psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN")) {
         psLogMsg ("psphot", PS_LOG_INFO, "skipping extended source measurements\n");
         return true;
@@ -42 +42 @@
 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; }
@@ -57 +49 @@
 
     bool status;
-    int NfaintEXT = 0;
-    int NfaintPSF = 0;
-
     int Next = 0;
     int Npetro = 0;
@@ -131 +120 @@
             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
@@ -154 +141 @@
             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
@@ -182 +165 @@
                 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);
@@ -196 +175 @@
     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);
@@ -204 +182 @@
     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 ();
@@ -217 +187 @@
     psphotVisualShowResidualImage (readout, false);
 
-    bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
-    if (doPetrosian) {
-        psphotVisualShowPetrosians (sources);
-    }
+    psphotVisualShowPetrosians (sources);
 
     return true;
@@ -228 +195 @@
 
     bool status;
-
-    int NfaintEXT = 0;
-    int NfaintPSF = 0;
 
     int Next = 0;
@@ -244 +208 @@
     float skynoise          = PS_SCALAR_VALUE(job->args->data[4],F32);
 
-    // S/N limit to perform full non-linear fits
-    float SN_LIM = psMetadataLookupF32 (&status, recipe, "EXTENDED_SOURCE_SN_LIM");
-
-    // which extended source analyses should we perform?
-    bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
-    bool doAnnuli       = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
-    bool doPetroStars   = psMetadataLookupBool (&status, recipe, "PETROSIAN_FOR_STARS");
-
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
     psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
@@ -263 +219 @@
         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) 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) 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) SKIP (Nskip6);
-
-        // optionally allow non-extended objects to get petrosians as well
-        if (!doPetroStars) {
-            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)
-        }
-
-        // limit selection to some SN limit
-        // assert (source->peak); // how can a source not have a peak?
-        // limit selection to some SN limit
-        bool skipSource = false;
-        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);
-            NfaintPSF ++;
-        }
-        if (skipSource) SKIP (Nskip9);
-
-        // limit selection by analysis region (this automatically apply
-        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:
+        // rules for measuring petrosian parameters for specific objects are set in
+        // psphotChooseAnalysisOptions.c
+        if (!(source->tmpFlags & PM_SOURCE_TMPF_PETRO)) SKIP (Nskip1);
+
+        // limit selection by analysis region (XXX move this into psphotChooseAnalysisOption?)
+        if (source->peak->x < region->x0) SKIP (Nskip2);
+        if (source->peak->y < region->y0) SKIP (Nskip3);
+        if (source->peak->x > region->x1) SKIP (Nskip4);
+        if (source->peak->y > region->y1) SKIP (Nskip5);
 
         // replace object in image
@@ -317 +242 @@
         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 || 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);
-                pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-                SKIP (Nskip14);
-            }
-            Nannuli ++;
-            source->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
-        }
+        // measure the radial profile
+        if (!psphotRadialProfile (source, recipe, skynoise, maskVal)) {
+          // 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);
+          SKIP (Nskip6);
+        }
+
+        Nannuli ++;
+        source->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
 
         // Petrosian Mags
-        if (doPetrosian) {
-            if (!psphotPetrosian (source, recipe, skynoise, maskVal)) {
-                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);
-                Npetro ++;
-                source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
-            }
+        if (!psphotPetrosian (source, recipe, skynoise, maskVal)) {
+          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);
+          Npetro ++;
+          source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
         }
 
@@ -362 +283 @@
     scalar->data.S32 = Nannuli;
 
-    scalar = job->args->data[8];
-    scalar->data.S32 = NfaintEXT;
-
-    scalar = job->args->data[9];
-    scalar->data.S32 = NfaintPSF;
-
     return true;
 }