Changeset 35468 for trunk/psphot

Timestamp:

May 1, 2013, 4:10:17 PM (13 years ago)

Author:

eugene

Message:

min radial aperture; do not unflag satstar; delete 2 smallest aps

Location:

trunk/psphot/src

Files:

• psphotEvalPSF.c (modified) (3 diffs)
• psphotRadialApertures.c (modified) (3 diffs)

trunk/psphot/src/psphotEvalPSF.c

@@ -67 +67 @@
             psTrace ("psphot", 5, "satstar failed fit");
         }
+        return false;
+    }
+
+    // unless we prove otherwise, this object is a star.
+    source->type = PM_SOURCE_TYPE_STAR;
+
+    // the following source->mode information pertains to modelPSF:
+    source->mode |= PM_SOURCE_MODE_PSFMODEL;
+
+    // if the object has fitted peak above saturation, label as SATSTAR
+    // this is a valid PSF object, but ignore the other quality tests
+    // remember: fit does not use saturated pixels (masked)
+    // XXX no extended object can saturate and stay extended...
+
+    // XXX this test is wrong : it should add back in the local sky from the model to test
+    // against saturation the local sky is saved in source->sky after psphotMagnitudes is called
+    if (model->params->data.F32[PM_PAR_I0] >= SATURATION) {
+        if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
+            psLogMsg ("psphot", 5, "PSFSTAR marked SATSTAR\n");
+        }
+        source->mode |=  PM_SOURCE_MODE_SATSTAR;
+        return true;
+    } 
+
+    // if the object has a fitted peak below 0.02, the source is not viable
+    // perhaps the fit did not converge cleanly
+    if (model->params->data.F32[PM_PAR_I0] <= 0.02) {
+        source->mode |= PM_SOURCE_MODE_FAIL;
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+            psTrace ("psphot", 5, "satstar failed fit (peak below 0)");
+        }
+        return false;
+    } 
+
+    // if the source was predicted to be a SATSTAR, but it fitted below saturation, 
+    // make a note to the user.
+    // XXX do not do this until we have a local measure of the sky in place
+    if (false && (source->mode & PM_SOURCE_MODE_SATSTAR)) {
+        psLogMsg ("psphot", 5, "SATSTAR marked normal (fitted peak below saturation)\n");
+        source->mode &= ~PM_SOURCE_MODE_SATSTAR;
+    }
+
+    SN  = model->params->data.F32[PM_PAR_I0]/model->dparams->data.F32[PM_PAR_I0];
+    Chi = model->chisqNorm / model->nDOF;
+
+    // assign PM_SOURCE_MODE_GOODSTAR to bright objects within PSF region of dparams[]
+    keep = TRUE;
+    keep &= (SN > PSF_MIN_SN);
+    keep &= (Chi < PSF_MAX_CHI);
+
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+        psTrace ("psphot", 5, "satstar fit results: %f, %f  %d :  SN: %f  Chisq: %f\n", 
+                     model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], keep, SN, Chi);
+    }
+
+    if (keep) {
+        if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
+            psTrace ("psphot", 7, "PSFSTAR kept (%f, %f  :  SN: %f Chisq: %f)\n", 
+                     model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
+        }
+        return true;
+    }
+
+    // this source is not a star, warn if it was a PSFSTAR
+    if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
+        psTrace ("psphot", 5, "PSFSTAR demoted based on fit quality   (%f, %f  :  SN: %f  Chisq: %f)\n", 
+                  model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
+    } else {
+        psTrace ("psphot", 5, "fails PSF fit (%f, %f  :  SN: %f  Chisq: %f)\n", 
+                  model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
+    }
+
+    // poor-quality fit; only keep if nothing else works...
+    source->mode |= PM_SOURCE_MODE_POOR;
+    return false;
+}       
+
+// examine the model->status, fit parameters, etc and decide if the model succeeded
+// set the source->type and source->mode appropriately
+bool psphotEvalDBL (pmSource *source, pmModel *model) { 
+
+    // do we actually have a valid PSF model?
+    if (model == NULL) {
+        source->mode &= ~PM_SOURCE_MODE_FITTED;
+        return false;
+    }
+
+    // was the model actually fitted?
+    if (!(model->flags & PM_MODEL_STATUS_FITTED)) {
+        source->mode &= ~PM_SOURCE_MODE_FITTED; 
+        return false;
+    }
+    // did the model fit fail for one or another reason?
+    if (model->flags & (PM_MODEL_STATUS_BADARGS | 
+                        PM_MODEL_STATUS_NONCONVERGE | 
+                        PM_MODEL_STATUS_OFFIMAGE)) {
+        source->mode |= PM_SOURCE_MODE_FAIL;
         return false;
     }
@@ -88 +185 @@
     } 
 
-    // if the object has a fitted peak below 0.02, the source is not viable
-    // perhaps the fit did not converge cleanly
+    // if the object has a fitted peak below 0, the fit did not converge cleanly
     if (model->params->data.F32[PM_PAR_I0] <= 0.02) {
         source->mode |= PM_SOURCE_MODE_FAIL;
-        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
-            psTrace ("psphot", 5, "satstar failed fit (peak below 0)");
-        }
         return false;
     } 
@@ -104 +197 @@
         source->mode &= ~PM_SOURCE_MODE_SATSTAR;
     }
-
-    SN  = model->params->data.F32[PM_PAR_I0]/model->dparams->data.F32[PM_PAR_I0];
-    Chi = model->chisqNorm / model->nDOF;
-
-    // assign PM_SOURCE_MODE_GOODSTAR to bright objects within PSF region of dparams[]
-    keep = TRUE;
-    keep &= (SN > PSF_MIN_SN);
-    keep &= (Chi < PSF_MAX_CHI);
-
-    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
-        psTrace ("psphot", 5, "satstar fit results: %f, %f  %d :  SN: %f  Chisq: %f\n", 
-                     model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], keep, SN, Chi);
-    }
-
-    if (keep) {
-        if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
-            psTrace ("psphot", 7, "PSFSTAR kept (%f, %f  :  SN: %f Chisq: %f)\n", 
-                     model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
-        }
-        return true;
-    }
-
-    // this source is not a star, warn if it was a PSFSTAR
-    if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
-        psTrace ("psphot", 5, "PSFSTAR demoted based on fit quality   (%f, %f  :  SN: %f  Chisq: %f)\n", 
-                  model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
-    } else {
-        psTrace ("psphot", 5, "fails PSF fit (%f, %f  :  SN: %f  Chisq: %f)\n", 
-                  model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS], SN, Chi);
-    }
-
-    // poor-quality fit; only keep if nothing else works...
-    source->mode |= PM_SOURCE_MODE_POOR;
-    return false;
-}       
-
-// examine the model->status, fit parameters, etc and decide if the model succeeded
-// set the source->type and source->mode appropriately
-bool psphotEvalDBL (pmSource *source, pmModel *model) { 
-
-    // do we actually have a valid PSF model?
-    if (model == NULL) {
-        source->mode &= ~PM_SOURCE_MODE_FITTED;
-        return false;
-    }
-
-    // was the model actually fitted?
-    if (!(model->flags & PM_MODEL_STATUS_FITTED)) {
-        source->mode &= ~PM_SOURCE_MODE_FITTED; 
-        return false;
-    }
-    // did the model fit fail for one or another reason?
-    if (model->flags & (PM_MODEL_STATUS_BADARGS | 
-                        PM_MODEL_STATUS_NONCONVERGE | 
-                        PM_MODEL_STATUS_OFFIMAGE)) {
-        source->mode |= PM_SOURCE_MODE_FAIL;
-        return false;
-    }
-
-    // unless we prove otherwise, this object is a star.
-    source->type = PM_SOURCE_TYPE_STAR;
-
-    // the following source->mode information pertains to modelPSF:
-    source->mode |= PM_SOURCE_MODE_PSFMODEL;
-
-    // if the object has fitted peak above saturation, label as SATSTAR
-    // this is a valid PSF object, but ignore the other quality tests
-    // remember: fit does not use saturated pixels (masked)
-    // XXX no extended object can saturate and stay extended...
-    if (model->params->data.F32[PM_PAR_I0] >= SATURATION) {
-        if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
-            psLogMsg ("psphot", 5, "PSFSTAR marked SATSTAR\n");
-        }
-        source->mode |=  PM_SOURCE_MODE_SATSTAR;
-        return true;
-    } 
-
-    // if the object has a fitted peak below 0, the fit did not converge cleanly
-    if (model->params->data.F32[PM_PAR_I0] <= 0.02) {
-        source->mode |= PM_SOURCE_MODE_FAIL;
-        return false;
-    } 
-
-    // if the source was predicted to be a SATSTAR, but it fitted below saturation, 
-    // make a note to the user
-    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
-        psLogMsg ("psphot", 5, "SATSTAR marked normal (fitted peak below saturation)\n");
-        source->mode &= ~PM_SOURCE_MODE_SATSTAR;
-    }
     return true;
 }       

trunk/psphot/src/psphotRadialApertures.c

@@ -47 +47 @@
 static float outerRadius = NAN;
 static float SN_LIM = NAN;
+static int RADIAL_AP_MIN = 5;
 static psImageMaskType maskVal = 0;
 
@@ -115 +116 @@
     // S/N limit to perform full non-linear fits
     SN_LIM = psMetadataLookupF32 (&status, recipe, "RADIAL_APERTURES_SN_LIM");
+
+    // S/N limit to perform full non-linear fits
+    RADIAL_AP_MIN = psMetadataLookupS32 (&status, recipe, "RADIAL.ANNULAR.BINS.MIN");
+    if (!status) {
+      RADIAL_AP_MIN = 5;
+    }
 
     // source analysis is done in S/N order (brightest first)
@@ -310 +317 @@
 
     // find the largest aperture of interest (use only apertures with inner radii <=
-    // source->skyRadius)
+    // source->skyRadius, as long as i >= RADIAL_AP_MIN
     int lastAp = aperRadii->n;
-    for (int i = 0; i < aperRadii->n; i++) {
-        if (aperRadii->data.F32[i] < source->skyRadius) continue;
+    for (int i = RADIAL_AP_MIN; i < aperRadii->n; i++) {
+        if (aperRadii->data.F32[i] < source->skyRadius) continue; // measure out to this radius
         lastAp = i + 1;
         break;