Changeset 5828 for trunk/psphot/src/psphotEvalPSF.c

Timestamp:

Dec 22, 2005, 4:20:27 PM (21 years ago)

Author:

eugene

Message:

various cleanups, fixes, additions...

File:

• trunk/psphot/src/psphotEvalPSF.c (modified) (3 diffs)

trunk/psphot/src/psphotEvalPSF.c

@@ -46 +46 @@
 // examine the model->status, fit parameters, etc and decide if the model succeeded
 // set the source->type and source->mode appropriately
-bool psphotEvalPSF (pmSource *source) { 
+bool psphotEvalPSF (pmSource *source, pmModel *model) { 
 
     int keep;
     float dSX, dSY, SX, SY, SN;
     float nSx, nSy, Chi;
-
-    pmModel *model = source->modelPSF;
 
     // do we actually have a valid PSF model?
@@ -127 +125 @@
     // this source is not a star, warn if it was a PSFSTAR
     if (source->mode & PM_SOURCE_PSFSTAR) {
-        psphotSaveImage (NULL, source->pixels, "failpx.fits");
-        psphotSaveImage (NULL, source->mask, "failmk.fits");
-        psphotSaveImage (NULL, source->weight, "failwt.fits");
         psLogMsg ("psphot", 5, "PSFSTAR demoted based on fit quality   (%f, %f  :  %f %f %f %f)\n", 
+                  model->params->data.F32[2], model->params->data.F32[3], nSx, nSy, SN, Chi);
+    } else {
+        psLogMsg ("psphot", 5, "fails PSF fit (%f, %f  :  %f %f %f %f)\n", 
                   model->params->data.F32[2], model->params->data.F32[3], nSx, nSy, SN, Chi);
     }
@@ -150 +148 @@
     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_FITTED;
+        return false;
+    }
+
+    // did the model fit fail for one or another reason?
+    switch (model->status) {
+      case PM_MODEL_SUCCESS:
+        break;
+      case PM_MODEL_UNTRIED:
+        source->mode &= ~PM_SOURCE_FITTED; 
+        return false;
+      case PM_MODEL_BADARGS:
+      case PM_MODEL_NONCONVERGE:
+      case PM_MODEL_OFFIMAGE:
+      default:
+        source->mode |= PM_SOURCE_FAIL;
+        return false;
+    }
+
+    // unless we prove otherwise, this object is a star.
+    source->type = PM_SOURCE_STAR;
+
+    // the following source->mode information pertains to modelPSF:
+    source->mode |= PM_SOURCE_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[1] >= SATURATION) {
+        if (source->mode & PM_SOURCE_PSFSTAR) {
+            psLogMsg ("psphot", 5, "PSFSTAR marked SATSTAR\n");
+        }
+        source->mode |=  PM_SOURCE_SATSTAR;
+        return true;
+    } 
+
+    // if the object has a fitted peak below 0, the fit did not converge cleanly
+    if (model->params->data.F32[1] <= 0) {
+        source->mode |= PM_SOURCE_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_SATSTAR) {
+        psLogMsg ("psphot", 5, "SATSTAR marked normal (fitted peak below saturation)\n");
+        source->mode &= ~PM_SOURCE_SATSTAR;
+    }
+    return true;
+}