Changeset 6753 for trunk/psphot/src/psphotRadiusChecks.c

Timestamp:

Mar 31, 2006, 4:58:31 PM (20 years ago)

Author:

eugene

Message:

fixed up low-level issues with sky levels, sky bias

File:

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

trunk/psphot/src/psphotRadiusChecks.c

@@ -1 +1 @@
 # include "psphot.h"
+# define RADIUS_TYPE float
 
 static float PSF_FIT_NSIGMA;
@@ -23 +24 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radius = modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + PSF_FIT_PADDING;
-    if (isnan(model->radius)) psAbort ("apply_psf_model", "error in radius");
+    model->radiusTMP = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + PSF_FIT_PADDING);
+    if (isnan(model->radiusTMP)) psAbort ("apply_psf_model", "error in radius");
         
-    if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-        model->radius *= 2;
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+        model->radiusTMP *= 2;
     }
 
-    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radius);
+    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     return status;
 }
@@ -40 +41 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radius = modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING;
-    if (isnan(model->radius)) psAbort ("apply_psf_model", "error in radius");
+    model->radiusTMP = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
+    if (isnan(model->radiusTMP)) psAbort ("apply_psf_model", "error in radius");
         
     if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-        model->radius *= 2;
+        model->radiusTMP *= 2;
     }
 
-    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radius);
+    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     return status;
 }
@@ -73 +74 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radius = modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING;
-    if (isnan(model->radius)) psAbort (__func__, "error in radius");
+    model->radiusTMP = (RADIUS_TYPE) (modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
+    if (isnan(model->radiusTMP)) psAbort (__func__, "error in radius");
 
     // redefine the pixels if needed
-    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radius);
+    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     return status;
 }