Changeset 4642 for trunk/psphot/src/choose_psf_model.c

Timestamp:

Jul 28, 2005, 7:04:10 AM (21 years ago)

Author:

eugene

Message:

cleanup memory leaks

File:

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

trunk/psphot/src/choose_psf_model.c

@@ -34 +34 @@
         modelName = psMetadataLookupPtr (&status, config, key);
         tests->data[i] = pmPSF_TestModel (stars, modelName, RADIUS);
+        psFree (modelName);
 
-        sprintf (filename, "metric.%d.dat", i);
-        DumpPSFTestData (tests->data[i], filename);
+        // make this an option:
+        // sprintf (filename, "metric.%d.dat", i);
+        // DumpPSFTestData (tests->data[i], filename);
     }
+    psFree (stars);
 
     // select the best of the test models
@@ -46 +49 @@
     for (int i = 1; i < Ntest; i++) {
         test = tests->data[i];
-        int M = test->dApResid;
+        float M = test->dApResid;
         if (M < bestM) {
             bestM = M;
@@ -55 +58 @@
     modelName = psModelGetType (test->modelType);
     psLogMsg ("psphot.pspsf", 3, "selected psf model %s, ApResid: %f +/- %f\n", modelName, test->ApResid, test->dApResid);
+    psFree (modelName);
 
+    // we are keeping the modelPSF fits from the PSF test, 
+    // but we replace these later on (apply_psf_model)
     // set source->model based on best psf model fit
     for (int i = 0; i < test->sources->n; i++) {
@@ -67 +73 @@
         }
     }
-    return (test->psf);
+    pmPSF *psf = test->psf;
+
+    // free unused test models:
+    psFree (test);
+    psFree (stars);
+
+    return (psf);
 }