Changeset 4901 for trunk/psphot/src/apply_psf_model.c

Timestamp:

Aug 29, 2005, 5:44:55 PM (21 years ago)

Author:

eugene

Message:

various psphot updates

File:

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

trunk/psphot/src/apply_psf_model.c

@@ -14 +14 @@
     int   Niter = 0;
 
+    psMemoryId id = psMemGetId ();
     psTimerStart ("psphot");
 
@@ -33 +34 @@
 
     for (int i = 0; i < sources->n; i++) {
+
         psSource *source = sources->data[i];
 
@@ -39 +41 @@
         if (source->type == PS_SOURCE_SATURATED) continue;
 
-        // do I even need to test?
-        if (source->modelPSF != NULL) {
-          psFree (source->modelPSF);
-        }
-
         // use the source moments, etc to guess basic model parameters
-        psModel *model  = pmSourceModelGuess (source, psf->type); 
+        psModel *modelFLT  = pmSourceModelGuess (source, psf->type); 
 
         // set PSF parameters for this model
-        model  = psModelFromPSF (model, psf);
+        psModel *model  = psModelFromPSF (modelFLT, psf);
         x = model->params->data.F32[2];
         y = model->params->data.F32[3];
+        psFree (modelFLT);
 
         // set the fit radius based on the object flux limit and the model
@@ -72 +70 @@
           psLogMsg ("psphot", 3, "PSF fit failed for %f, %f (%d iterations)\n", x, y, model->nIter);
           source->type = PS_SOURCE_FAIL_FIT_PSF;  // better choice?
+          psFree (model);
           continue;
         }