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

Timestamp:

Jul 15, 2008, 10:25:50 AM (18 years ago)

Author:

eugene

Message:

re-org and cleanup of the mask bits to make it consistent with the pmConfigMaskSetBits concepts; ensure mark and mask are correctly used

File:

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

trunk/psphot/src/psphotSourceFits.c

@@ -21 +21 @@
 }
 
-bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal) {
+bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal, psMaskType markVal) {
 
     float x, y, dR;
+
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
 
     // 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, maskVal);
+        bool status = psphotFitPSF (readout, source, psf, maskVal, markVal);
         return status;
     }
@@ -80 +83 @@
 
     // extend source radius as needed
-    psphotCheckRadiusPSFBlend (readout, source, PSF, dR);
+    psphotCheckRadiusPSFBlend (readout, source, PSF, markVal, dR);
 
     // fit PSF model (set/unset the pixel mask)
@@ -139 +142 @@
 }
 
-bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal) {
+bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal, psMaskType markVal) {
 
     double chiTrend;
+
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
 
     NfitPSF ++;
@@ -150 +156 @@
 
     // extend source radius as needed
-    psphotCheckRadiusPSF (readout, source, PSF);
+    psphotCheckRadiusPSF (readout, source, PSF, markVal);
 
     // fit PSF model (set/unset the pixel mask)
@@ -197 +203 @@
 }
 
-bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, psMaskType maskVal) {
+bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, psMaskType maskVal, psMaskType markVal) {
 
     bool okEXT, okDBL;
@@ -215 +221 @@
     psTrace ("psphot", 5, "trying blob...\n");
 
-    // psTraceSetLevel("psModules.objects.pmSourceFitSet", 5);
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
 
     // this temporary source is used as a place-holder by the psphotEval functions below
     pmSource *tmpSrc = pmSourceAlloc ();
 
-    pmModel *EXT = psphotFitEXT (readout, source, modelTypeEXT, maskVal);
+    pmModel *EXT = psphotFitEXT (readout, source, modelTypeEXT, maskVal, markVal);
     okEXT = psphotEvalEXT (tmpSrc, EXT);
     chiEXT = EXT->chisq / EXT->nDOF;
 
-    psArray *DBL = psphotFitDBL (readout, source, maskVal);
+    psArray *DBL = psphotFitDBL (readout, source, maskVal, markVal);
     okDBL  = psphotEvalDBL (tmpSrc, DBL->data[0]);
     okDBL &= psphotEvalDBL (tmpSrc, DBL->data[1]);
@@ -306 +313 @@
 
 // fit a double PSF source to an extended blob
-psArray *psphotFitDBL (pmReadout *readout, pmSource *source, psMaskType maskVal) {
+psArray *psphotFitDBL (pmReadout *readout, pmSource *source, psMaskType maskVal, psMaskType markVal) {
 
     float dx, dy;
@@ -317 +324 @@
     NfitDBL ++;
 
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
+
     // make a guess at the position of the two sources
     moments.x2 = source->moments->Sx;
@@ -329 +339 @@
     // save the PSF model from the Ensemble fit
     PSF = source->modelPSF;
-    psphotCheckRadiusPSFBlend (readout, source, PSF, 8.0);
+    psphotCheckRadiusPSFBlend (readout, source, PSF, markVal, 8.0);
     if (isnan(PSF->params->data.F32[1])) psAbort("nan in dbl fit");
 
@@ -351 +361 @@
 }
 
-pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal) {
+pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal, psMaskType markVal) {
 
     NfitEXT ++;
+
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
 
     // use the source moments, etc to guess basic model parameters
@@ -361 +374 @@
     // if (isnan(EXT->params->data.F32[1])) psAbort("nan in ext fit");
 
-    psphotCheckRadiusEXT (readout, source, EXT);
+    psphotCheckRadiusEXT (readout, source, EXT, markVal);
 
     if ((source->moments->Sx < 1e-3) || (source->moments->Sx < 1e-3)) {