Changeset 5048 for trunk/psphot/src/psphotFitGalaxies.c

Timestamp:

Sep 13, 2005, 3:35:20 PM (21 years ago)

Author:

eugene

Message:

substantial work to match with psLib v.7

File:

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

trunk/psphot/src/psphotFitGalaxies.c

@@ -31 +31 @@
         // sources which should not be fitted
         // skip all valid stars
-        if (source->type == PS_SOURCE_PSFSTAR) continue;
-        if (source->type == PS_SOURCE_SATSTAR) continue;
-        if (source->type == PS_SOURCE_GOODSTAR) continue;
+        if (source->type == PM_SOURCE_PSFSTAR) continue;
+        if (source->type == PM_SOURCE_SATSTAR) continue;
+        if (source->type == PM_SOURCE_GOODSTAR) continue;
 
         // skip all likely defects
-        if (source->type == PS_SOURCE_DEFECT) continue;
-        if (source->type == PS_SOURCE_SATURATED) continue;
+        if (source->type == PM_SOURCE_DEFECT) continue;
+        if (source->type == PM_SOURCE_SATURATED) continue;
 
         // skip poorly fitted stars
-        if (source->type == PS_SOURCE_FAINTSTAR) continue;
-        if (source->type == PS_SOURCE_POOR_FIT_PSF) continue;
+        if (source->type == PM_SOURCE_FAINTSTAR) continue;
+        if (source->type == PM_SOURCE_POOR_FIT_PSF) continue;
 
         // XXX EAM when do we pick these up again?
         if (source->moments->SN < GAL_MIN_SN) {
-          source->type = PS_SOURCE_FAINT_GALAXY;  // better choice?
+          source->type = PM_SOURCE_FAINT_GALAXY;  // better choice?
           continue;
         }
 
         // recalculate the source moments using the larger galaxy moments radius
-        // XXX EAM : 0.5.0 code used _EAM version
-        // status = pmSourceMoments (source, GAL_MOMENTS_RAD);
-        status = pmSourceMoments_EAM (source, GAL_MOMENTS_RAD);
+        status = pmSourceMoments (source, GAL_MOMENTS_RAD);
         if (!status) {
-          source->type = PS_SOURCE_DROP_GALAXY;  // better choice?
+          source->type = PM_SOURCE_DROP_GALAXY;  // better choice?
           continue;
         }
@@ -84 +82 @@
           // if the fit fails, we need to change the classification
           psLogMsg ("psphot", 3, "GAL fit failed for %f, %f (%d iterations, %f radius)\n", x, y, model->nIter, model->radius);
-          source->type = PS_SOURCE_FAIL_FIT_GAL;  // better choice?
+          source->type = PM_SOURCE_FAIL_FIT_GAL;  // better choice?
           source->modelFLT = model;
           Nfail ++;
@@ -95 +93 @@
           // if the fit fails, we need to change the classification
           psLogMsg ("psphot", 3, "GAL fit poor for %f, %f (%d iterations, %f radius)\n", x, y, model->nIter, model->radius);
-          source->type = PS_SOURCE_POOR_FIT_GAL;  // better choice?
+          source->type = PM_SOURCE_POOR_FIT_GAL;  // better choice?
           source->modelFLT = model;
           Nfail ++;
@@ -102 +100 @@
 
         // accept the model
-        source->type = PS_SOURCE_GALAXY;
+        source->type = PM_SOURCE_GALAXY;
         source->modelFLT = model;
         Niter += model[0].nIter;