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

Timestamp:

Jan 15, 2006, 8:30:16 AM (21 years ago)

Author:

eugene

Message:

API cleanup, removed old test files, some re-organization, changed FLT/GAL to EXT

File:

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

trunk/psphot/src/psphotRadiusChecks.c

@@ -31 +31 @@
     }
 
-# if (1)
     bool status = psphotRedefinePixels (source, imdata, model->params->data.F32[2], model->params->data.F32[3], model->radius);
     return status;
-
-# else
-
-    if (model->radius > PSF_OUTER_RADIUS) {
-        // (re)-allocate image, weight, mask arrays for each peak (square of radius OUTER)
-        psphotDefinePixels (source, imdata, model->params->data.F32[2], model->params->data.F32[3], model->radius);
-        return true;
-    } else {
-        fprintf (stderr, "skipping %f,%f\n", model->params->data.F32[2], model->params->data.F32[3]);
-    }
-    return false;
-# endif
 }
 
+static float EXT_OUTER_RADIUS;
+static float EXT_FIT_PADDING;
+static float EXT_FLUX_LIMIT;
+static pmModelRadius modelRadiusEXT;
 
-static float GAL_OUTER_RADIUS;
-static float GAL_FIT_PADDING;
-static float GAL_FLUX_LIMIT;
-static pmModelRadius modelRadiusGAL;
-
-bool psphotInitRadiusFLT (psMetadata *config, psStats *sky, pmModelType type) {
+bool psphotInitRadiusEXT (psMetadata *config, psStats *sky, pmModelType type) {
 
     bool status;
 
-    float GAL_FIT_NSIGMA = psMetadataLookupF32 (&status, config, "GAL_FIT_NSIGMA");
-    GAL_OUTER_RADIUS     = psMetadataLookupF32 (&status, config, "GAL_OUTER_RADIUS");
-    GAL_FIT_PADDING      = psMetadataLookupF32 (&status, config, "GAL_FIT_PADDING");
-    GAL_FLUX_LIMIT       = GAL_FIT_NSIGMA * sky->sampleStdev;
+    float EXT_FIT_NSIGMA = psMetadataLookupF32 (&status, config, "EXT_FIT_NSIGMA");
+    EXT_OUTER_RADIUS     = psMetadataLookupF32 (&status, config, "EXT_OUTER_RADIUS");
+    EXT_FIT_PADDING      = psMetadataLookupF32 (&status, config, "EXT_FIT_PADDING");
+    EXT_FLUX_LIMIT       = EXT_FIT_NSIGMA * sky->sampleStdev;
 
     // this function specifies the radius at this the model hits the given flux
-    modelRadiusGAL       = pmModelRadius_GetFunction (type);
+    modelRadiusEXT       = pmModelRadius_GetFunction (type);
     return true;
 }
 
-bool psphotCheckRadiusFLT (eamReadout *imdata, pmSource *source, pmModel *model) {
+bool psphotCheckRadiusEXT (eamReadout *imdata, pmSource *source, pmModel *model) {
 
     // set the fit radius based on the object flux limit and the model
-    model->radius = modelRadiusGAL (model->params, GAL_FLUX_LIMIT) + GAL_FIT_PADDING;
-    if (isnan(model->radius)) psAbort ("fit_galaxies", "error in radius");
+    model->radius = modelRadiusEXT (model->params, EXT_FLUX_LIMIT) + EXT_FIT_PADDING;
+    if (isnan(model->radius)) psAbort (__func__, "error in radius");
 
-# if (1)
     // redefine the pixels if needed
     bool status = psphotRedefinePixels (source, imdata, model->params->data.F32[2], model->params->data.F32[3], model->radius);
     return status;
-
-# else
-
-    // check if we need to redefine the pixels
-    if (model->radius > GAL_OUTER_RADIUS) {
-        // (re)-allocate image, weight, mask arrays for each peak (square of radius OUTER)
-        // do I need to save the old pixel and mask data?
-        psphotDefinePixels (source, imdata, model->params->data.F32[2], model->params->data.F32[3], model->radius);
-        return true;
-    }
-    return false;
-# endif
 }