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

Timestamp:

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

Author:

eugene

Message:

adding pmObjects stuff

File:

• trunk/psphot/src/psphotApplyPSF.c (modified) (3 diffs)

trunk/psphot/src/psphotApplyPSF.c

@@ -31 +31 @@
 
     // this function specifies the radius at this the model hits the given flux
-    psModelRadius modelRadius = psModelRadius_GetFunction (psf->type);
+    pmModelRadius modelRadius = pmModelRadius_GetFunction (psf->type);
 
     for (int i = 0; i < sources->n; i++) {
 
-        psSource *source = sources->data[i];
+        pmSource *source = sources->data[i];
 
         // skip non-astronomical objects (very likely defects)
@@ -43 +43 @@
 
         // use the source moments, etc to guess basic model parameters
-        psModel *modelFLT = pmSourceModelGuess (source, psf->type); 
+        pmModel *modelFLT = pmSourceModelGuess (source, psf->type); 
 
         // set PSF parameters for this model
-        psModel *model = psModelFromPSF (modelFLT, psf);
+        pmModel *model = pmModelFromPSF (modelFLT, psf);
         x = model->params->data.F32[2];
         y = model->params->data.F32[3];
@@ -66 +66 @@
 
         // fit PSF model (set/unset the pixel mask)
-        psImageKeepCircle (source->mask, x, y, model->radius, OR, PSPHOT_MASK_KEEP);
+        psImageKeepCircle (source->mask, x, y, model->radius, "or", PSPHOT_MASK_KEEP);
         status = pmSourceFitModel (source, model, true);
-        psImageKeepCircle (source->mask, x, y, model->radius, AND, ~PSPHOT_MASK_KEEP);
+        psImageKeepCircle (source->mask, x, y, model->radius, "and", ~PSPHOT_MASK_KEEP);
         if (!status || (model->params->data.F32[1] < 0)) {
           psLogMsg ("psphot", 3, "PSF fit failed for %f, %f (%d iterations)\n", x, y, model->nIter);