Index: /trunk/psphot/src/psphot.h
===================================================================
--- /trunk/psphot/src/psphot.h	(revision 8469)
+++ /trunk/psphot/src/psphot.h	(revision 8470)
@@ -8,6 +8,4 @@
 
 # define PSPHOT_RECIPE "PSPHOT"
-
-# define psMemCopy(A)(psMemIncrRefCounter((A)))
 
 // top-level psphot functions
Index: /trunk/psphot/src/psphotChoosePSF.c
===================================================================
--- /trunk/psphot/src/psphotChoosePSF.c	(revision 8469)
+++ /trunk/psphot/src/psphotChoosePSF.c	(revision 8470)
@@ -100,5 +100,5 @@
 
     // save only the best model;
-    psf = psMemCopy(try->psf);
+    psf = psMemIncrRefCounter(try->psf);
     psFree (models);
 
Index: /trunk/psphot/src/psphotEnsemblePSF.c
===================================================================
--- /trunk/psphot/src/psphotEnsemblePSF.c	(revision 8469)
+++ /trunk/psphot/src/psphotEnsemblePSF.c	(revision 8470)
@@ -188,5 +188,5 @@
 
 	// 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
Index: /trunk/psphot/src/psphotSourceFits.c
===================================================================
--- /trunk/psphot/src/psphotSourceFits.c	(revision 8469)
+++ /trunk/psphot/src/psphotSourceFits.c	(revision 8470)
@@ -254,5 +254,5 @@
     // 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,10 +261,10 @@
     // 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;
Index: /trunk/psphot/src/psphotSourceStats.c
===================================================================
--- /trunk/psphot/src/psphotSourceStats.c	(revision 8469)
+++ /trunk/psphot/src/psphotSourceStats.c	(revision 8470)
@@ -22,5 +22,5 @@
 	// 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)