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

Timestamp:

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

Author:

eugene

Message:

cleanup memory leaks

File:

• trunk/psphot/src/pspsf.c (modified) (10 diffs)

trunk/psphot/src/pspsf.c

@@ -21 +21 @@
         psf->params->data[i] = Polynomial2DAlloc(1, 1, PS_POLYNOMIAL_ORD);
     }
+    // set the destructors
     return(psf);
 }
@@ -48 +49 @@
         test->fitMag->data.F64[i] = 0;
     }   
+    // set the destructors
+
     return (test);
 }
@@ -92 +95 @@
     psLogMsg ("psphot.psftest", 4, "fit flt:   %f sec for %d sources\n", psTimerMark ("fit"), sources->n);
     psTrace ("psphot.psftest", 3, "keeping %d of %d PSF candidates (FLT)\n", Nflt, sources->n);
-    DumpModelFits (test->modelFLT, "modelsFLT.dat");
+
+    // make this optional? 
+    // DumpModelFits (test->modelFLT, "modelsFLT.dat");
 
     // stage 2: construct a psf (pmPSF) from this collection of model fits
@@ -141 +146 @@
     psLogMsg ("psphot.psftest", 4, "fit psf:   %f sec for %d sources\n", psTimerMark ("fit"), sources->n);
     psTrace ("psphot.psftest", 3, "keeping %d of %d PSF candidates (PSF)\n", Npsf, sources->n);
-    DumpModelFits (test->modelPSF, "modelsPSF.dat");
+
+    // make this optional
+    // DumpModelFits (test->modelPSF, "modelsPSF.dat");
 
     // XXX this function wants aperture radius from pmSourcePhotometry
@@ -188 +195 @@
         // psPolynomial2DDump (psf->params->data[i]);
     }
+    
+    psFree (x);
+    psFree (y);
+    psFree (z);
+    psFree (dz);
     return (true);
 }
@@ -228 +240 @@
     rflux->data.F64[i] = pow(10.0, 0.4*test->fitMag->data.F64[i]);
   }
-  // psScalar *t1 = psScalar(0.4);
-  // psVector *v1 = psBinaryOp (NULL, test->fitMag, "*", t1);
-  // psVector *rflux = psUnaryOp (NULL, v1, "ten");
-  // psFree (t1);
-  // psFree (v1);
 
   // find min and max of (1/flux):
@@ -247 +254 @@
   psTrace ("psphot.metricmodel", 3, "rflux max: %g, min: %g, delta: %g\n", stats->max, stats->min, dBin);
 
+  // group data in daBin bins, measure lower 50% mean
   for (int i = 0; i < daBin->n; i++) {
 
@@ -277 +285 @@
     // dA values are contaminated with low outliers 
     // measure statistics only on upper 50% of points
+    // this would be easier if we could sort in reverse:
+    //
+    // psVectorSort (tmp, tmp);
+    // tmp->n = 0.5*tmp->n;
+    // stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
+    // psVectorStats (stats, tmp, NULL, NULL, 0);
+    // psTrace ("psphot.metricmodel", 4, "rfBin %d (%g): %d pts, %g\n", i, rfBin->data.F64[i], tmp->n, stats->sampleMedian);
+
     psVectorSort (tmp, tmp);
     nKeep = 0.5*tmp->n;
@@ -291 +307 @@
 
     daBin->data.F64[i] = stats->sampleMedian;
+
+    psFree (stats);
+    psFree (tmp);
+    psFree (tmp2);
   }
 
@@ -307 +327 @@
   test->skyBias = poly->coeff[1] / (M_PI * PS_SQR(RADIUS));
 
+  psFree (maskB);
+  psFree (rfBin);
+  psFree (daBin);
+  psFree (daBinFit);
+  psFree (daResid);
+  psFree (poly);
+  psFree (stats);
+
   return true;
 }