Changeset 25497 for branches/eam_branches/20090715/psphot/src/psphotRadiusChecks.c

Timestamp:

Sep 23, 2009, 11:17:41 AM (17 years ago)

Author:

eugene

Message:

psf model ap radius different from fit radius; both set based on results of moments analysis

File:

• branches/eam_branches/20090715/psphot/src/psphotRadiusChecks.c (modified) (3 diffs)

branches/eam_branches/20090715/psphot/src/psphotRadiusChecks.c

@@ -35 +35 @@
         }
     }
-    model->radiusFit = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
+    model->fitRadius = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
 
-    if (isnan(model->radiusFit)) psAbort("error in radius");
+    if (isnan(model->fitRadius)) psAbort("error in radius");
         
     if (source->mode & PM_SOURCE_MODE_SATSTAR) {
-        model->radiusFit *= 2;
+        model->fitRadius *= 2;
     }
 
-    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit);
+    source->apRadius = model->fitRadius;
+    // XXX for now, use the same radius for aperture and fit
+    // XXX to use different radii, we will need to set the apRadius mask with a call to
+    // psImageKeepCircle in the function psphotMagnitudes_Threaded 
+
+    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
 
     // set the mask to flag the excluded pixels
-    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit, "OR", markVal);
+    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, "OR", markVal);
     return status;
 }
@@ -58 +63 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radiusFit = (RADIUS_TYPE) (model->modelRadius (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
-    if (isnan(model->radiusFit)) psAbort("error in radius");
+    model->fitRadius = (RADIUS_TYPE) (model->modelRadius (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
+    if (isnan(model->fitRadius)) psAbort("error in radius");
         
     if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-        model->radiusFit *= 2;
+        model->fitRadius *= 2;
     }
 
-    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit);
+    source->apRadius = model->fitRadius;
+    // XXX for now, use the same radius for aperture and fit
+    // XXX to use different radii, we will need to set the apRadius mask with a call to
+    // psImageKeepCircle in the function psphotMagnitudes_Threaded 
+
+    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
 
     // set the mask to flag the excluded pixels
-    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit, "OR", markVal);
+    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, "OR", markVal);
     return status;
 }
@@ -141 +151 @@
     float rawRadius = model->modelRadius (model->params, EXT_FIT_NSIGMA*moments->dSky);
 
-    model->radiusFit = rawRadius + EXT_FIT_PADDING;
-    if (isnan(model->radiusFit)) psAbort("error in radius");
+    model->fitRadius = rawRadius + EXT_FIT_PADDING;
+    if (isnan(model->fitRadius)) psAbort("error in radius");
+
+    // XXX this make the psf photometry for extended sources inconsistent with the other psf sources
+    // XXX for now, use the same radius for aperture and fit
+    // XXX to use different radii, we will need to set the apRadius mask with a call to
+    // psImageKeepCircle in the function psphotMagnitudes_Threaded 
 
     // redefine the pixels if needed
-    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit);
+    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
 
     // set the mask to flag the excluded pixels
-    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->radiusFit, "OR", markVal);
+    psImageKeepCircle (source->maskObj, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, "OR", markVal);
     return status;
 }