Changeset 8470

Timestamp:

Aug 22, 2006, 9:57:51 AM (20 years ago)

Author:

rhl

Message:

Changed all psMemCopy "calls" to psMemIncrRefCounter

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotChoosePSF.c (modified) (1 diff)
• psphotEnsemblePSF.c (modified) (1 diff)
• psphotSourceFits.c (modified) (2 diffs)
• psphotSourceStats.c (modified) (1 diff)

trunk/psphot/src/psphot.h

@@ -8 +8 @@
 
 # define PSPHOT_RECIPE "PSPHOT"
-
-# define psMemCopy(A)(psMemIncrRefCounter((A)))
 
 // top-level psphot functions

trunk/psphot/src/psphotChoosePSF.c

@@ -100 +100 @@
 
     // save only the best model;
-    psf = psMemCopy(try->psf);
+    psf = psMemIncrRefCounter(try->psf);
     psFree (models);
 

trunk/psphot/src/psphotEnsemblePSF.c

@@ -188 +188 @@
 
         // need to increment counter so we can free models here and sources above
-        Fi->modelPSF = psMemCopy (Mi->modelPSF);
+        Fi->modelPSF = psMemIncrRefCounter (Mi->modelPSF);
 
         // assign linearly-fitted normalization

trunk/psphot/src/psphotSourceFits.c

@@ -254 +254 @@
     // drop old model, save new second model...
     psFree (source->modelPSF);
-    source->modelPSF = psMemCopy (DBL->data[0]);
+    source->modelPSF = psMemIncrRefCounter (DBL->data[0]);
     source->mode    |= PM_SOURCE_MODE_SUBTRACTED;
     source->mode    |= PM_SOURCE_MODE_PAIR;
@@ -261 +261 @@
     // copy most data from the primary source (modelEXT, blends stay NULL)
     pmSource *newSrc = pmSourceAlloc ();
-    newSrc->peak     = psMemCopy (source->peak);
-    newSrc->pixels   = psMemCopy (source->pixels);
-    newSrc->weight   = psMemCopy (source->weight);
-    newSrc->mask     = psMemCopy (source->mask);
-    newSrc->moments  = psMemCopy (source->moments);
-    newSrc->modelPSF = psMemCopy (DBL->data[1]);
+    newSrc->peak     = psMemIncrRefCounter (source->peak);
+    newSrc->pixels   = psMemIncrRefCounter (source->pixels);
+    newSrc->weight   = psMemIncrRefCounter (source->weight);
+    newSrc->mask     = psMemIncrRefCounter (source->mask);
+    newSrc->moments  = psMemIncrRefCounter (source->moments);
+    newSrc->modelPSF = psMemIncrRefCounter (DBL->data[1]);
     newSrc->type     = source->type;
     newSrc->mode     = source->mode;

trunk/psphot/src/psphotSourceStats.c

@@ -22 +22 @@
         // create a new source, add peak
         pmSource *source = pmSourceAlloc();
-        source->peak = (pmPeak *)psMemCopy(peaks->data[i]);
+        source->peak = (pmPeak *)psMemIncrRefCounter(peaks->data[i]);
 
         // allocate image, weight, mask arrays for each peak (square of radius OUTER)