Changeset 6379 for trunk/psphot/src/psphotEnsemblePSF.c

Timestamp:

Feb 7, 2006, 8:52:03 PM (20 years ago)

Author:

eugene

Message:

extensive cleanup of memory handling : no more leaks!

File:

• trunk/psphot/src/psphotEnsemblePSF.c (modified) (6 diffs)

trunk/psphot/src/psphotEnsemblePSF.c

@@ -1 +1 @@
 # include "psphot.h"
 
+// 2006.02.07 : no leaks!
+// fit all reasonable sources with the linear PSF model
 bool psphotEnsemblePSF (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky) { 
 
@@ -6 +8 @@
     float x;
     float y;
+    float f;
 
     psTimerStart ("psphot");
@@ -28 +31 @@
     bool UseAnalysisRegion = false;
     psRegion AnalysisRegion = {0, 0, 0, 0};
-    char *region = psMetadataLookupPtr (&status, config, "ANALYSIS_REGION");
+    char *region = psMetadataLookupStr (&status, config, "ANALYSIS_REGION");
     if (status) {
         UseAnalysisRegion = true;
@@ -126 +129 @@
         index->data.U32[models->n] = i;
         psArrayAdd (models, 100, otSource);
+        psFree (otSource);
     }
     psLogMsg ("psphot.emsemble", 4, "built models: %f (%d objects)\n", psTimerMark ("psphot"), sources->n);
     
-    float f;
-
     // fill out the sparse matrix
     psSparse *sparse = psSparseAlloc (models->n, 100);
@@ -173 +175 @@
         pmSource *Mi = models->data[i];
 
-        Fi->modelPSF = Mi->modelPSF;
+        // need to increment counter so we can free models here and sources above
+        Fi->modelPSF = psMemCopy (Mi->modelPSF);
 
         // assign linearly-fitted normalization
@@ -183 +186 @@
         Fi->mode |= PM_SOURCE_TEMPSUB;
     }
-
-    // XXX EAM : need to free up many things here
+    psFree (index);
+    psFree (sparse);
+    psFree (models);
+    psFree (norm);
 
     psLogMsg ("psphot.emsemble", 3, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot"));