Changeset 5993 for trunk/psphot/src/psphotFitGalaxies.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/psphotFitGalaxies.c (modified) (5 diffs)

trunk/psphot/src/psphotFitGalaxies.c

@@ -1 +1 @@
 # include "psphot.h"
 
-bool psphotFitGalaxies (eamReadout *imdata, psMetadata *config, psArray *sources, psStats *skyStats) 
+bool psphotFitExtended (eamReadout *imdata, psMetadata *config, psArray *sources, psStats *skyStats)
 { 
     bool  status;
@@ -12 +12 @@
     psTimerStart ("psphot");
 
-    float GAL_MIN_SN       = psMetadataLookupF32 (&status, config, "GAL_MIN_SN");
-    float GAL_MOMENTS_RAD  = psMetadataLookupF32 (&status, config, "GAL_MOMENTS_RADIUS");
-    char       *modelName  = psMetadataLookupPtr (&status, config, "GAL_MODEL");
+    float EXT_MIN_SN       = psMetadataLookupF32 (&status, config, "EXT_MIN_SN");
+    float EXT_MOMENTS_RAD  = psMetadataLookupF32 (&status, config, "EXT_MOMENTS_RADIUS");
+    char       *modelName  = psMetadataLookupPtr (&status, config, "EXT_MODEL");
     pmModelType modelType  = pmModelSetType (modelName);
 
-    psphotInitRadiusFLT (config, skyStats, modelType);
+    psphotInitRadiusEXT (config, skyStats, modelType);
 
     for (int i = 0; i < sources->n; i++) {
@@ -23 +23 @@
 
         // only fit suspected extended sources
-        if (source->type != PM_SOURCE_GALAXY) continue;
+        if (source->type != PM_SOURCE_EXTENDED) continue;
         if (source->mode  & PM_SOURCE_BLEND) continue; 
 
         // skip possible extended sources below fit threshold
-        if (source->moments->SN < GAL_MIN_SN) continue;
+        if (source->moments->SN < EXT_MIN_SN) continue;
 
-        // recalculate the source moments using the larger galaxy moments radius
-        status = pmSourceMoments (source, GAL_MOMENTS_RAD);
+        // recalculate the source moments using the larger extended-source moments radius
+        status = pmSourceMoments (source, EXT_MOMENTS_RAD);
         if (!status) {
           source->mode |= PM_SOURCE_FAIL;  // better choice?
@@ -38 +38 @@
         // use the source moments, etc to guess basic model parameters
         pmModel  *model  = pmSourceModelGuess (source, modelType); 
-        source->modelFLT = model;
+        source->modelEXT = model;
         x = model->params->data.F32[2];
         y = model->params->data.F32[3];
 
         // sets the model radius (via source->model) and adjusts pixels as needed
-        psphotCheckRadiusFLT (imdata, source, model);
+        psphotCheckRadiusEXT (imdata, source, model);
 
-        // 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, model->radius, "OR", PSPHOT_MASK_MARKED);
         pmSourceFitModel (source, model, false);
@@ -61 +61 @@
         }
     }
-    psLogMsg ("psphot", 3, "fit GAL models: %f sec for %d galaxies (%d total iterations)\n", psTimerMark ("psphot"), Nfit, Niter);
-    psLogMsg ("psphot", 4, "subtracted %d GAL models\n", Nsub);
+    psLogMsg ("psphot", 3, "fit EXT models: %f sec for %d objects (%d total iterations)\n", psTimerMark ("psphot"), Nfit, Niter);
+    psLogMsg ("psphot", 4, "subtracted %d EXT objects\n", Nsub);
     return (true);
 }