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

Timestamp:

Sep 5, 2005, 8:44:00 PM (21 years ago)

Author:

eugene

Message:

adding pmObjects stuff

File:

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

trunk/psphot/src/psphotFitGalaxies.c

@@ -21 +21 @@
 
     char         *modelName   = psMetadataLookupPtr (&status, config, "GAL_MODEL");
-    psModelType   modelType   = psModelSetType (modelName);
-    psModelRadius modelRadius = psModelRadius_GetFunction (modelType);
+    pmModelType   modelType   = pmModelSetType (modelName);
+    pmModelRadius modelRadius = pmModelRadius_GetFunction (modelType);
 
     psTimerStart ("psphot");
 
     for (int i = 0; i < sources->n; i++) {
-        psSource *source = sources->data[i];
+        pmSource *source = sources->data[i];
 
         // sources which should not be fitted
@@ -50 +50 @@
 
         // recalculate the source moments using the larger galaxy moments radius
-        status = pmSourceMoments_EAM (source, GAL_MOMENTS_RAD);
+        status = pmSourceMoments (source, GAL_MOMENTS_RAD);
         if (!status) {
           source->type = PS_SOURCE_DROP_GALAXY;  // better choice?
@@ -57 +57 @@
 
         // use the source moments, etc to guess basic model parameters
-        psModel  *model  = pmSourceModelGuess (source, modelType); 
+        pmModel  *model  = pmSourceModelGuess (source, modelType); 
         x = model->params->data.F32[2];
         y = model->params->data.F32[3];
@@ -75 +75 @@
         // fit FLT (not PSF) model (set/unset the pixel mask)
         psImageKeepCircle (source->mask, x, y, model->radius, OR, PSPHOT_MASK_KEEP);
-        status = pmSourceFitModel_EAM (source, model, false);
+        status = pmSourceFitModel (source, model, false);
         psImageKeepCircle (source->mask, x, y, model->radius, AND, ~PSPHOT_MASK_KEEP);
         if (!status) {