Changeset 13900 for trunk/psphot/src/psphotSourceFits.c

Timestamp:

Jun 19, 2007, 4:40:44 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested with psModules (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels. For
this reason, I have left the "gutter" pixels (cell gaps) set to 0
instead of NAN in pmFPAMosaic.

File:

• trunk/psphot/src/psphotSourceFits.c (modified) (18 diffs)

trunk/psphot/src/psphotSourceFits.c

@@ -16 +16 @@
 bool psphotFitSummary () {
 
-    fprintf (stderr, "fitted %5d psf, %5d blend, %5d ext, %5d dbl : %6.2f sec\n", 
-             NfitPSF, NfitBlend, NfitEXT, NfitDBL, psTimerMark ("psphot.fits"));
-    return true;
-}
-
-bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf) {
+    fprintf (stderr, "fitted %5d psf, %5d blend, %5d ext, %5d dbl : %6.2f sec\n",
+             NfitPSF, NfitBlend, NfitEXT, NfitDBL, psTimerMark ("psphot.fits"));
+    return true;
+}
+
+bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal) {
 
     float x, y, dR;
@@ -27 +27 @@
     // if this source is not a possible blend, just fit as PSF
     if ((source->blends == NULL) || (source->mode & PM_SOURCE_MODE_SATSTAR)) {
-        bool status = psphotFitPSF (readout, source, psf);
+        bool status = psphotFitPSF (readout, source, psf, maskVal);
         return status;
     }
@@ -65 +65 @@
         model->params->data.F32[PM_PAR_YPOS] = blend->peak->yf;
 
-        // these should never be invalid values
-        // XXX drop these tests eventually
+        // these should never be invalid values
+        // XXX drop these tests eventually
         if (isnan(model->params->data.F32[PM_PAR_I0]))   psAbort("nan in blend fit");
         if (isnan(model->params->data.F32[PM_PAR_XPOS])) psAbort("nan in blend fit");
@@ -83 +83 @@
 
     // fit PSF model (set/unset the pixel mask)
-    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
+    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF, maskVal);
 
     // correct model chisq for flux trend
@@ -109 +109 @@
         psTrace ("psphot", 5, "fitted blend as PSF\n");
 
-        // build cached model and subtract
-        pmSourceCacheModel (blend);
-        pmSourceSub (blend, PM_MODEL_OP_FULL);
+        // build cached model and subtract
+        pmSourceCacheModel (blend, maskVal);
+        pmSourceSub (blend, PM_MODEL_OP_FULL, maskVal);
         blend->mode |=  PM_SOURCE_MODE_SUBTRACTED;
         blend->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -121 +121 @@
         psTrace ("psphot", 4, "failed on blend 0 of %ld\n", modelSet->n);
         psFree (PSF);
-        psFree (modelSet);
-        psFree (sourceSet);
+        psFree (modelSet);
+        psFree (sourceSet);
         return false;
     }
@@ -134 +134 @@
 
     // build cached model and subtract
-    pmSourceCacheModel (source);
-    pmSourceSub (source, PM_MODEL_OP_FULL);
+    pmSourceCacheModel (source, maskVal);
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
     source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -141 +141 @@
 }
 
-bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf) {
+bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal) {
 
     double chiTrend;
@@ -155 +155 @@
 
     // fit PSF model (set/unset the pixel mask)
-    pmSourceFitModel (source, PSF, PM_SOURCE_FIT_PSF);
+    pmSourceFitModel (source, PSF, PM_SOURCE_FIT_PSF, maskVal);
 
     // correct model chisq for flux trend
@@ -173 +173 @@
 
     // build cached model and subtract
-    pmSourceCacheModel (source);
-    pmSourceSub (source, PM_MODEL_OP_FULL);
+    pmSourceCacheModel (source, maskVal);
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
     source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -201 +201 @@
 }
 
-bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf) {
+bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, psMaskType maskVal) {
 
     bool okEXT, okDBL;
@@ -222 +222 @@
     pmSource *tmpSrc = pmSourceAlloc ();
 
-    pmModel *EXT = psphotFitEXT (readout, source);
+    pmModel *EXT = psphotFitEXT (readout, source, maskVal);
     okEXT = psphotEvalEXT (tmpSrc, EXT);
     chiEXT = EXT->chisq / EXT->nDOF;
 
-    psArray *DBL = psphotFitDBL (readout, source);
+    psArray *DBL = psphotFitDBL (readout, source, maskVal);
     okDBL  = psphotEvalDBL (tmpSrc, DBL->data[0]);
     okDBL &= psphotEvalDBL (tmpSrc, DBL->data[1]);
@@ -269 +269 @@
 
     // build cached model and subtract
-    pmSourceCacheModel (source);
-    pmSourceSub (source, PM_MODEL_OP_FULL);
+    pmSourceCacheModel (source, maskVal);
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[PM_PAR_XPOS], EXT->params->data.F32[PM_PAR_YPOS]);
 
@@ -294 +294 @@
 
     // build cached models and subtract
-    pmSourceCacheModel (source);
-    pmSourceSub (source, PM_MODEL_OP_FULL);
-    pmSourceCacheModel (newSrc);
-    pmSourceSub (newSrc, PM_MODEL_OP_FULL);
+    pmSourceCacheModel (source, maskVal);
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
+    pmSourceCacheModel (newSrc, maskVal);
+    pmSourceSub (newSrc, PM_MODEL_OP_FULL, maskVal);
     psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[PM_PAR_XPOS], ONE->params->data.F32[PM_PAR_YPOS]);
 
@@ -307 +307 @@
 
 // fit a double PSF source to an extended blob
-psArray *psphotFitDBL (pmReadout *readout, pmSource *source) {
+psArray *psphotFitDBL (pmReadout *readout, pmSource *source, psMaskType maskVal) {
 
     float dx, dy;
@@ -348 +348 @@
 
     // fit PSF model (set/unset the pixel mask)
-    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
+    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF, maskVal);
     return (modelSet);
 }
 
-pmModel *psphotFitEXT (pmReadout *readout, pmSource *source) {
+pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, psMaskType maskVal) {
 
     NfitEXT ++;
@@ -359 +359 @@
     pmModel *EXT = pmSourceModelGuess (source, modelTypeEXT);
     PS_ASSERT (EXT, NULL);
-        
+
     // if (isnan(EXT->params->data.F32[1])) psAbort("nan in ext fit");
 
@@ -369 +369 @@
 
     // fit EXT (not PSF) model (set/unset the pixel mask)
-    pmSourceFitModel (source, EXT, PM_SOURCE_FIT_EXT);
+    pmSourceFitModel (source, EXT, PM_SOURCE_FIT_EXT, maskVal);
     return (EXT);
 }