Index: trunk/psphot/src/psphotSourceFits.c
===================================================================
--- trunk/psphot/src/psphotSourceFits.c	(revision 5828)
+++ trunk/psphot/src/psphotSourceFits.c	(revision 5993)
@@ -41,20 +41,20 @@
 
 
-static float GAL_MIN_SN;
-static float GAL_MOMENTS_RAD;
-static pmModelType modelTypeFLT;
-
-bool psphotInitLimitsFLT (psMetadata *config, psStats *sky) {
+static float EXT_MIN_SN;
+static float EXT_MOMENTS_RAD;
+static pmModelType modelTypeEXT;
+
+bool psphotInitLimitsEXT (psMetadata *config, psStats *sky) {
 
     bool status;
 
-    // galaxy model parameters
-    GAL_MIN_SN       = psMetadataLookupF32 (&status, config, "GAL_MIN_SN");
-    GAL_MOMENTS_RAD  = psMetadataLookupF32 (&status, config, "GAL_MOMENTS_RADIUS");
-
-    // 'galaxy' model descriptions
-    char *modelNameFLT = psMetadataLookupPtr (&status, config, "GAL_MODEL");
-    modelTypeFLT = pmModelSetType (modelNameFLT);
-    psphotInitRadiusFLT (config, sky, modelTypeFLT);
+    // extended source model parameters
+    EXT_MIN_SN       = psMetadataLookupF32 (&status, config, "EXT_MIN_SN");
+    EXT_MOMENTS_RAD  = psMetadataLookupF32 (&status, config, "EXT_MOMENTS_RADIUS");
+
+    // extended source model descriptions
+    char *modelNameEXT = psMetadataLookupPtr (&status, config, "EXT_MODEL");
+    modelTypeEXT = pmModelSetType (modelNameEXT);
+    psphotInitRadiusEXT (config, sky, modelTypeEXT);
 
     return true;
@@ -63,6 +63,6 @@
 bool psphotFitBlob (eamReadout *imdata, pmSource *source, psArray *sources) { 
 
-    bool okFLT, okDBL;
-    float chiFLT, chiDBL;
+    bool okEXT, okDBL;
+    float chiEXT, chiDBL;
 
     // skip the source if we don't think it is extended
@@ -70,8 +70,8 @@
     if (source->type == PM_SOURCE_DEFECT) return false;
     if (source->type == PM_SOURCE_SATURATED) return false;
-    if (source->moments->SN < GAL_MIN_SN) return false;
-
-    // recalculate the source moments using the larger galaxy moments radius
-    if (!pmSourceMoments (source, GAL_MOMENTS_RAD)) return false;
+    if (source->moments->SN < EXT_MIN_SN) return false;
+
+    // recalculate the source moments using the larger extended-source moments radius
+    if (!pmSourceMoments (source, EXT_MOMENTS_RAD)) return false;
 
     psTrace ("psphot.blend", 5, "trying blob...\n");
@@ -79,7 +79,7 @@
     pmSource *tmpSrc = pmSourceAlloc ();
 
-    pmModel *FLT = psphotFitFLT (imdata, source);
-    okFLT = psphotEvalFLT (tmpSrc, FLT);
-    chiFLT = FLT->chisq / FLT->nDOF;
+    pmModel *EXT = psphotFitEXT (imdata, source);
+    okEXT = psphotEvalEXT (tmpSrc, EXT);
+    chiEXT = EXT->chisq / EXT->nDOF;
 
     psArray *DBL = psphotFitDBL (imdata, source);
@@ -89,22 +89,22 @@
     chiDBL = ONE->chisq / ONE->nDOF;
 
-    if (okFLT && okDBL) {
-	psTrace ("psphot.blend", 5, "blob chisq: %f vs %f\n", chiFLT, chiDBL);
+    if (okEXT && okDBL) {
+	psTrace ("psphot.blend", 5, "blob chisq: %f vs %f\n", chiEXT, chiDBL);
 	// XXX EAM : a bogus bias: need to examine this better
-	if (3*chiFLT > chiDBL) goto keepDBL;
-	goto keepFLT;
-    }
-
-    if (okFLT && !okDBL) goto keepFLT;
-    if (!okFLT && okDBL) goto keepDBL;
+	if (3*chiEXT > chiDBL) goto keepDBL;
+	goto keepEXT;
+    }
+
+    if (okEXT && !okDBL) goto keepEXT;
+    if (!okEXT && okDBL) goto keepDBL;
     return false;
 
-keepFLT:
-    // sub FLT
-    pmSourceSubModel (source->pixels, source->mask, FLT, false, false);
-    psTrace ("psphot.blend", 5, "blob as FLT: %f %f\n", FLT->params->data.F32[2], FLT->params->data.F32[3]);
+keepEXT:
+    // sub EXT
+    pmSourceSubModel (source->pixels, source->mask, EXT, false, false);
+    psTrace ("psphot.blend", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[2], EXT->params->data.F32[3]);
 
     // save new model
-    source->modelFLT = FLT;
+    source->modelEXT = EXT;
     source->mode |=  PM_SOURCE_SUBTRACTED;
     source->mode &= ~PM_SOURCE_TEMPSUB;
@@ -168,5 +168,5 @@
     y = PSF->params->data.F32[3];
 
-    // fit FLT (not PSF) model (set/unset the pixel mask)
+    // fit EXT (not PSF) model (set/unset the pixel mask)
     psImageKeepCircle (source->mask, x, y, PSF->radius, "OR", PSPHOT_MASK_MARKED);
     pmSourceFitSet (source, modelSet, true);
@@ -176,22 +176,22 @@
 }
 
-pmModel *psphotFitFLT (eamReadout *imdata, pmSource *source) { 
+pmModel *psphotFitEXT (eamReadout *imdata, pmSource *source) { 
 
     float x, y;
 
     // use the source moments, etc to guess basic model parameters
-    pmModel *FLT = pmSourceModelGuess (source, modelTypeFLT); 
-
-    psphotCheckRadiusFLT (imdata, source, FLT);
-
-    x = FLT->params->data.F32[2];
-    y = FLT->params->data.F32[3];
-
-    // fit FLT (not PSF) model (set/unset the pixel mask)
-    psImageKeepCircle (source->mask, x, y, FLT->radius, "OR", PSPHOT_MASK_MARKED);
-    pmSourceFitModel (source, FLT, false);
-    psImageKeepCircle (source->mask, x, y, FLT->radius, "AND", ~PSPHOT_MASK_MARKED);
-
-    return (FLT);
+    pmModel *EXT = pmSourceModelGuess (source, modelTypeEXT); 
+
+    psphotCheckRadiusEXT (imdata, source, EXT);
+
+    x = EXT->params->data.F32[2];
+    y = EXT->params->data.F32[3];
+
+    // fit EXT (not PSF) model (set/unset the pixel mask)
+    psImageKeepCircle (source->mask, x, y, EXT->radius, "OR", PSPHOT_MASK_MARKED);
+    pmSourceFitModel (source, EXT, false);
+    psImageKeepCircle (source->mask, x, y, EXT->radius, "AND", ~PSPHOT_MASK_MARKED);
+
+    return (EXT);
 }