Changeset 14655 for trunk/psphot/src/psphotPSFResiduals.c

Timestamp:

Aug 23, 2007, 2:40:16 PM (19 years ago)

Author:

eugene

Message:

* updates from branch eam_branch_20070817

• changed pmIsFoo to pmFooTest
• changed pmModelGroup to pmModelClass
• added offsets to pmSourceOp
• changed pmModel.params_NEW to pmModel.params
• use new APIs to define a pmModel from a pmPSF at X,Y (pmModelFromPSFforXY)
• use pmModel member functions instead of _GetFunction functions
• added modelParamsFromPSF for STRAIL and TEST1
• move output psf model from readout->analysis to chip->analysis

File:

• trunk/psphot/src/psphotPSFResiduals.c (modified) (1 diff)

trunk/psphot/src/psphotPSFResiduals.c

@@ -12 +12 @@
     if (!(source->mode & PM_SOURCE_MODE_PSFSTAR)) continue;
 
-    // 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?
-
-    // use the source moments, etc to guess basic model parameters
-    pmModel *modelEXT = pmSourceModelGuess (source, psf->type);
-    
-    // XXX put this in a function of its own..
-    if (modelEXT == NULL) {
-        psErrorClear (); // XXX need to clear the error from failing the model
-        modelEXT = pmModelAlloc(psf->type);
-        psF32 *PAR = modelEXT->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;
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+        Xo = source->moments->x;
+        Yo = source->moments->y;
+        Io = source->peak->flux;
     } else {
-        // 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->x;
-            modelEXT->params->data.F32[PM_PAR_YPOS] = source->moments->y;
-        } 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;
+        Io = source->peak->flux;
     }
 
     // set PSF parameters for this model (apply 2D shape model)
-    pmModel *modelPSF = pmModelFromPSF (modelEXT, psf);
-    psFree (modelEXT);
+    pmModel *modelPSF = pmModelFromPSFforXY (psf, Xo, Yo, Io);
 
     // XXX need to define the guess flux?