Changeset 6964 for trunk/psphot

Timestamp:

Apr 22, 2006, 3:20:29 PM (20 years ago)

Author:

eugene

Message:

squashing leaks

Location:

trunk/psphot/src

Files:

• psphotChoosePSF.c (modified) (1 diff)
• psphotCleanup.c (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)
• psphotReadout.c (modified) (5 diffs)
• psphotSourceFits.c (modified) (4 diffs)

trunk/psphot/src/psphotChoosePSF.c

@@ -146 +146 @@
     psMetadataAdd (recipe, PS_LIST_TAIL, "ANGLE",  PS_DATA_F32 | PS_META_REPLACE, "PSF angle",           axes.theta);
     
+    psFree (modelEXT);
+    psFree (modelPSF);
+
     return true;
 }

trunk/psphot/src/psphotCleanup.c

@@ -6 +6 @@
     psMemCheckCorruption (true);
     pmModelGroupCleanup ();
-//    psphotOutputCleanup ();
     psTimeFinalize ();
     pmConceptsDone ();
+    pmConfigDone ();
     fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "psphot");
     // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "psphot");

trunk/psphot/src/psphotParseCamera.c

@@ -75 +75 @@
         }
     }
+    psFree (chips);
 
     psTrace(__func__, 1, "Done with psphotParseCamera...\n");

trunk/psphot/src/psphotReadout.c

@@ -3 +3 @@
 bool psphotReadout (pmConfig *config, pmFPAview *view) {
 
-    psArray     *sources  = NULL;
-    psArray     *peaks    = NULL;
-    pmPSF       *psf      = NULL;
-    bool         status;
-
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PSPHOT");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSPHOT");
 
     // find the currently selected readout
@@ -28 +23 @@
 
     // find the peaks in the image
-    peaks = psphotFindPeaks (readout, recipe);
+    psArray *peaks = psphotFindPeaks (readout, recipe);
 
     // construct sources and measure basic stats
     // limit moments analysis by S/N?
-    sources = psphotSourceStats (readout, recipe, peaks);
+    psArray *sources = psphotSourceStats (readout, recipe, peaks);
 
     // classify sources based on moments, brightness
@@ -42 +37 @@
 
     // use bright stellar objects to measure PSF
-    psf = psphotChoosePSF (readout, sources, recipe);
+    pmPSF *psf = psphotChoosePSF (readout, sources, recipe);
     psphotPSFstats (readout, recipe, psf);
 
@@ -76 +71 @@
 
     // save the results of the analysis 
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,    "psphot sources", sources);
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA, "header stats", header);
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF",     PS_DATA_UNKNOWN,  "psphot psf", psf);
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,    "psphot sources", sources);
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA, "header stats", header);
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF",     PS_DATA_UNKNOWN,  "psphot psf", psf);
 
     // remove internal pmFPAfiles, if created
@@ -85 +80 @@
 
     // free up the local copies of the data
+    psFree (peaks);
+    psFree (sources);
     psFree (psf);
     psFree (header);
-    psFree (sources);
-    psFree (peaks);
     return true;
 }

trunk/psphot/src/psphotSourceFits.c

@@ -95 +95 @@
     okDBL  = psphotEvalDBL (tmpSrc, DBL->data[0]);
     okDBL &= psphotEvalDBL (tmpSrc, DBL->data[1]);
+    // XXX should I keep / save the flags set in the eval functions?
 
     // correct first model chisqs for flux trend
@@ -100 +101 @@
     chiTrend = psPolynomial1DEval (psf->ChiTrend, ONE->params->data.F32[1]);
     ONE->chisqNorm = ONE->chisq / chiTrend;
-    // ONE->chisqNorm = ONE->chisq;
 
     // save chisq for double-star/galaxy comparison
@@ -109 +109 @@
     chiTrend = psPolynomial1DEval (psf->ChiTrend, ONE->params->data.F32[1]);
     ONE->chisqNorm = ONE->chisq / chiTrend;
-    // ONE->chisqNorm = ONE->chisq;
-
-    psFree (tmpSrc); // XXX should I keep / save the flags set in the eval functions?
+
+    psFree (tmpSrc); 
 
     if (okEXT && okDBL) {
@@ -195 +194 @@
 
     modelSet = psArrayAlloc (2);
-    // DROP modelSet->n = 0;
+    modelSet->n = 2;
 
     DBL = pmModelCopy (PSF);