Changeset 24876

Timestamp:

Jul 21, 2009, 10:46:14 AM (17 years ago)

Author:

eugene

Message:

drop deprecated unthreaded code (had been ifdefed away); replace pmModelFromPSF calls with pmModelFromPSFforXY; drop wildGuess, replace with better logic on moments vs peaks

File:

• trunk/psphot/src/psphotGuessModels.c (modified) (4 diffs)

trunk/psphot/src/psphotGuessModels.c

@@ -6 +6 @@
 // 2) loop over the sources once and associate them with their cell
 // 3) define the threaded function to work with sources for a given cell
-
-// A guess for when the moments aren't available
-static pmModel *wildGuess(pmSource *source, // Source for which to guess
-                          pmPSF *psf    // The point-spread function
-    )
-{
-    pmModel *model = pmModelAlloc(psf->type);
-    psF32 *PAR = model->params->data.F32;
-    PAR[PM_PAR_SKY]  = 0;
-    // XXX get this from the image pixels
-    PAR[PM_PAR_I0]   = source->peak->flux;
-    PAR[PM_PAR_XPOS] = source->peak->xf;
-    PAR[PM_PAR_YPOS] = source->peak->yf;
-    return model;
-}
 
 // construct an initial PSF model for each object
@@ -81 +66 @@
             }
             psFree(job);
-
-# if (0)                
-                if (!psphotGuessModel_Unthreaded (readout, cells->data[j], psf, maskVal, markVal)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
-                    return false;
-                }
-# endif
         }
 
@@ -152 +130 @@
         nSrc ++;
         
-        // XXX if a source is faint, it will not have moments measured.
-        // it must be modelled as a PSF.  In this case, we need to use
-        // the peak centroid to get the coordinates and get the peak flux
-        // from the image?
-        pmModel *modelEXT;
-        if (!source->moments) {
-            modelEXT = wildGuess(source, psf);
+        // the guess central intensity comes from the peak:
+        float Io = source->peak->flux;
+
+        // We have two options to get a guess for the object position: the position from the
+        // peak and the position from the moments.  Use the peak position if (a) there are no
+        // moments and (b) the sources is not saturated
+
+        bool useMoments = false;
+        useMoments = (source->mode & PM_SOURCE_MODE_SATSTAR);  // we only want to try if SATSTAR is set, but..
+        useMoments = (useMoments && source->moments);          // can't if there are no moments
+        useMoments = (useMoments && source->moments->nPixels); // can't if the moments were not measured
+        useMoments = (useMoments && !(source->mode && PM_SOURCE_MODE_MOMENTS_FAILURE)); // can't if the moments failed...
+
+        float Xo, Yo;
+        if (useMoments) {
+            Xo = source->moments->Mx;
+            Yo = source->moments->My;
         } else {
-            // use the source moments, etc to guess basic model parameters
-            modelEXT = pmSourceModelGuess (source, psf->type); // ALLOC X5
-            if (!modelEXT) {
-                modelEXT = wildGuess(source, psf);
-            }
-            // these valuse are set in pmSourceModelGuess, should this rule be in there as well?
-            if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->moments->Mx;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->moments->My;
-            } else {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->peak->xf;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->peak->yf;
-            }
+            Xo = source->peak->xf;
+            Yo = source->peak->yf;
         }
 
-        // set PSF parameters for this model (apply 2D shape model)
-        pmModel *modelPSF = pmModelFromPSF (modelEXT, psf); // ALLOC X5
+        // set PSF parameters for this model (apply 2D shape model to coordinates Xo, Yo)
+        pmModel *modelPSF = pmModelFromPSFforXY(psf, Xo, Yo, Io);
+
         if (modelPSF == NULL) {
-            psWarning ("Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
-                    source->peak->y, source->peak->x);
+            psWarning ("Failed to determine PSF model at (%f,%f); trying image center", Xo, Yo);
 
-            // Try the center of the image
-            modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
-            modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
-            modelPSF = pmModelFromPSF (modelEXT, psf);
+            float Xc = 0.5*readout->image->numCols;
+            float Yc = 0.5*readout->image->numRows;
+            pmModel *modelPSF = pmModelFromPSFforXY(psf, Xc, Yc, Io);
             if (modelPSF == NULL) {
                 psError(PSPHOT_ERR_PSF, false, "Failed to determine PSF model at center of image");
-                psFree(modelEXT);
                 return false;
             }
+
+            // Now set the object position at the expected location:
+            modelPSF->params->data.F32[PM_PAR_XPOS] = Xo;
+            modelPSF->params->data.F32[PM_PAR_YPOS] = Yo;
             source->mode |= PM_SOURCE_MODE_BADPSF;
         }
-        psFree (modelEXT); // FREE (x3)
 
-        // XXX need to define the guess flux?
         // set the fit radius based on the object flux limit and the model
         // this function affects the mask pixels
@@ -209 +186 @@
     return true;
 }
-
-# if (0)
-// construct models only for sources in the specified region
-bool psphotGuessModel_Unthreaded (pmReadout *readout, psArray *sources, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) {
-
-    int nSrc = 0;
-
-    for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
-
-        // XXXX this is just for a test: use this to mark sources for which the model is measured
-        // check later that all are used.
-        source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
-
-        // skip non-astronomical objects (very likely defects)
-        if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
-        if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
-        if (!source->peak) continue;
-
-        nSrc ++;
-        
-        // XXX if a source is faint, it will not have moments measured.
-        // it must be modelled as a PSF.  In this case, we need to use
-        // the peak centroid to get the coordinates and get the peak flux
-        // from the image?
-        pmModel *modelEXT;
-        if (!source->moments) {
-            modelEXT = wildGuess(source, psf);
-        } else {
-            // use the source moments, etc to guess basic model parameters
-            modelEXT = pmSourceModelGuess (source, psf->type); // ALLOC
-            if (!modelEXT) {
-                modelEXT = wildGuess(source, psf);
-            }
-            // these valuse are set in pmSourceModelGuess, should this rule be in there as well?
-            if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->moments->Mx;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->moments->My;
-            } else {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->peak->xf;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->peak->yf;
-            }
-        }
-
-        // set PSF parameters for this model (apply 2D shape model)
-        pmModel *modelPSF = pmModelFromPSF (modelEXT, psf); // ALLOC
-        if (modelPSF == NULL) {
-            psError(PSPHOT_ERR_PSF, false,
-                    "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
-                    source->peak->y, source->peak->x);
-            //
-            // Try the centre of the image
-            //
-            modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
-            modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
-            modelPSF = pmModelFromPSF (modelEXT, psf);
-            if (modelPSF == NULL) {
-                psError(PSPHOT_ERR_PSF, false,
-                        "Failed to determine PSF model at centre of image");
-                psFree(modelEXT);
-                return false;
-            }
-
-            source->mode |= PM_SOURCE_MODE_BADPSF;
-        }
-        psFree (modelEXT);
-
-        // XXX need to define the guess flux?
-        // set the fit radius based on the object flux limit and the model
-        // this function affects the mask pixels
-        psphotCheckRadiusPSF (readout, source, modelPSF, markVal);
-
-        // set the source PSF model
-        source->modelPSF = modelPSF;
-        source->modelPSF->residuals = psf->residuals;
-
-        pmSourceCacheModel (source, maskVal);
-
-    }
-
-    return true;
-}
-# endif