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

Timestamp:

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

Author:

eugene

Message:

various psphot updates

File:

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

trunk/psphot/src/pspsf.c

@@ -1 +1 @@
 # include "psphot.h"
+
+static void pmPSFFree (pmPSF *psf) {
+
+  if (psf == NULL) return;
+
+  psFree (psf->params);
+  return;
+}
 
 // a PSF always has 4 parameters fewer than the equivalent model
@@ -16 +24 @@
         return(NULL);
     }      
+
     psf->params = psArrayAlloc (Nparams - 4);
     for (int i = 0; i < psf->params->n; i++) {
@@ -21 +30 @@
         psf->params->data[i] = Polynomial2DAlloc(1, 1, PS_POLYNOMIAL_ORD);
     }
-    // set the destructors
+
+    p_psMemSetDeallocator(psf, (psFreeFcn) pmPSFFree);
     return(psf);
+}
+
+static void pmPSF_TestFree (pmPSF_Test *test) {
+
+  if (test == NULL) return;
+
+  psFree (test->psf);
+  psFree (test->sources);
+  psFree (test->modelFLT);
+  psFree (test->modelPSF);
+  psFree (test->metric);
+  psFree (test->fitMag);
+  psFree (test->mask);
+  return;
 }
 
@@ -32 +56 @@
     test->modelType   = psModelSetType (modelName);
     test->psf         = pmPSFAlloc (test->modelType);
-    test->sources     = sources;
+    test->sources     = psMemCopy(sources);
     test->modelFLT    = psArrayAlloc (sources->n);
     test->modelPSF    = psArrayAlloc (sources->n);
@@ -49 +73 @@
         test->fitMag->data.F64[i] = 0;
     }   
-    // set the destructors
-
+
+    p_psMemSetDeallocator(test, (psFreeFcn) pmPSF_TestFree);
     return (test);
 }
@@ -74 +98 @@
     psTimerStart ("fit");
     for (int i = 0; i < test->sources->n; i++) {
+
         psSource *source = test->sources->data[i];
         psModel  *model  = pmSourceModelGuess (source, test->modelType); 
@@ -88 +113 @@
         if (!status) {
           test->mask->data.U8[i] = 2;
+          psFree (model);
           continue;
         }
@@ -122 +148 @@
         if (!status) {
             test->mask->data.U8[i] = 3;
+            psFree (modelPSF);
             goto next_source;
         }
@@ -154 +181 @@
     psLogMsg ("psphot.pspsf", 3, "test model %s, ap-fit: %f +/- %f, sky bias: %f\n", 
               modelName, test->ApResid, test->dApResid, test->skyBias);
+
     return (test);
 }
@@ -223 +251 @@
   float dBin;
   int   nKeep, nSkip;
-  
 
   // the measured (aperture - fit) magnitudes (dA == test->metric)
@@ -280 +307 @@
     if (tmp->n < 2) {
       maskB->data.U8[i] = 1;
+      psFree (tmp);
       continue;
     } 
@@ -327 +355 @@
   test->skyBias = poly->coeff[1] / (M_PI * PS_SQR(RADIUS));
 
-  psFree (maskB);
+  psFree (rflux);
   psFree (rfBin);
   psFree (daBin);
+  psFree (maskB);
   psFree (daBinFit);
   psFree (daResid);