Index: /branches/eam_02_branch/psphot/src/psphotAddNoise.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotAddNoise.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotAddNoise.c	(revision 12952)
@@ -64,7 +64,7 @@
 
 	if (add) {
-	    pmModelAdd (source->weight, source->mask, model, false, false);
+	    pmModelAdd (source->weight, source->mask, model, PM_MODEL_ADD_FULL);
 	} else {
-	    pmModelSub (source->weight, source->mask, model, false, false);
+	    pmModelSub (source->weight, source->mask, model, PM_MODEL_ADD_FULL);
 	}
 	
Index: /branches/eam_02_branch/psphot/src/psphotBlendFit.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotBlendFit.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotBlendFit.c	(revision 12952)
@@ -65,5 +65,5 @@
 	// replace object in image
 	if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
-	    pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+	    pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 	}
 	Nfit ++;
@@ -85,5 +85,5 @@
 
 	// re-subtract PSF for object, leave local sky
-	pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+	pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 	source->mode |= PM_SOURCE_MODE_SUBTRACTED;
 	source->mode |= PM_SOURCE_MODE_TEMPSUB;
Index: /branches/eam_02_branch/psphot/src/psphotChoosePSF.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotChoosePSF.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotChoosePSF.c	(revision 12952)
@@ -240,5 +240,5 @@
 	    // set the mask and subtract the PSF model
 	    psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
-	    pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+	    pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 	    psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 	}
Index: /branches/eam_02_branch/psphot/src/psphotEnsemblePSF.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotEnsemblePSF.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotEnsemblePSF.c	(revision 12952)
@@ -93,5 +93,5 @@
         psImageInit (fitSource->pixels, 0.0);
         psImageKeepCircle (fitSource->mask, x, y, model->radiusFit, "OR", PM_MASK_MARK);
-        pmModelAdd (fitSource->pixels, fitSource->mask, model, false, false);
+        pmModelAdd (fitSource->pixels, fitSource->mask, model, PM_MODEL_ADD_FULL);
 
         // save source in list
@@ -218,5 +218,5 @@
 
         // subtract object
-        pmModelSub (Ri->pixels, Ri->mask, model, false, false);
+        pmModelSub (Ri->pixels, Ri->mask, model, PM_MODEL_ADD_FULL);
         Ri->mode |= PM_SOURCE_MODE_SUBTRACTED;
         if (!final) Ri->mode |= PM_SOURCE_MODE_TEMPSUB;
Index: /branches/eam_02_branch/psphot/src/psphotFitSet.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotFitSet.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotFitSet.c	(revision 12952)
@@ -32,5 +32,5 @@
     for (int i = 0; i < modelSet->n; i++) {
         pmModel *model = modelSet->data[i];
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
 
         fprintf (stderr, "output parameters (obj %d):\n", i);
Index: /branches/eam_02_branch/psphot/src/psphotGrowthCurve.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotGrowthCurve.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotGrowthCurve.c	(revision 12952)
@@ -54,5 +54,5 @@
 
         psImageKeepCircle (mask, xc, yc, radius, "OR", PM_MASK_MARK);
-        pmModelAdd (image, mask, model, false, false);
+        pmModelAdd (image, mask, model, PM_MODEL_ADD_FULL);
         pmSourcePhotometryAper (&apMag, model, image, mask);
         psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_U8(PM_MASK_MARK));
Index: /branches/eam_02_branch/psphot/src/psphotMakeResiduals.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotMakeResiduals.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotMakeResiduals.c	(revision 12952)
@@ -79,5 +79,5 @@
         psImage *weight = psImageCopy (NULL, source->weight, PS_TYPE_F32);
         psImage *mask   = psImageCopy (NULL, source->mask,   PS_TYPE_U8);
-        pmModelSub (image, mask, model, false, false);
+        pmModelSub (image, mask, model, PM_MODEL_ADD_FULL);
 	
 	// re-normalize image and weight
Index: /branches/eam_02_branch/psphot/src/psphotModelTest.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotModelTest.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotModelTest.c	(revision 12952)
@@ -177,5 +177,5 @@
 
     // subtract object, leave local sky
-    pmModelSub (source->pixels, source->mask, model, false, false);
+    pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
 
     fprintf (stderr, "output parameters: \n");
Index: /branches/eam_02_branch/psphot/src/psphotOutput.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotOutput.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotOutput.c	(revision 12952)
@@ -182,5 +182,5 @@
     modelEXT->params->data.F32[3] = y;
     pmModel *modelPSF = pmModelFromPSF (modelEXT, psf);
-    pmModelAdd (sample, NULL, modelPSF, false, false);
+    pmModelAdd (sample, NULL, modelPSF, PM_MODEL_ADD_FULL);
     psFree (modelPSF);
     return (sample);
Index: /branches/eam_02_branch/psphot/src/psphotReplaceUnfit.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotReplaceUnfit.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotReplaceUnfit.c	(revision 12952)
@@ -20,5 +20,5 @@
 		 source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS]);
 
-	pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+	pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 	source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
 	source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -47,5 +47,5 @@
 	       model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS]);
 
-      pmModelAdd (source->pixels, source->mask, model, false, false);
+      pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
       source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
     }
@@ -70,5 +70,5 @@
     // replace the model if 1) state says it is missing or 2) useState is false (just do it)
     if (!state || !useState) {
-	pmModelAdd (source->pixels, source->mask, model, false, false);
+	pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;
@@ -91,5 +91,5 @@
     // replace the model if 1) state says it is missing or 2) useState is false (just do it)
     if (!state || !useState) {
-	pmModelSub (source->pixels, source->mask, model, false, false);
+	pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;
@@ -111,8 +111,8 @@
     
     if (curState && !newState) {
-	pmModelSub (source->pixels, source->mask, model, false, false);
+	pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     if (newState && !curState) {
-	pmModelAdd (source->pixels, source->mask, model, false, false);
+	pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;
Index: /branches/eam_02_branch/psphot/src/psphotSourceFits.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotSourceFits.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotSourceFits.c	(revision 12952)
@@ -110,5 +110,5 @@
         blend->modelPSF = psMemIncrRefCounter (model);
         psTrace ("psphot", 5, "fitted blend as PSF\n");
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
         blend->mode |=  PM_SOURCE_MODE_SUBTRACTED;
         blend->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -128,5 +128,5 @@
 
     psTrace ("psphot", 5, "fitted primary as PSF\n");
-    pmModelSub (source->pixels, source->mask, PSF, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
     psFree (source->modelPSF);
     source->modelPSF = PSF;
@@ -169,5 +169,5 @@
 
     psTrace ("psphot", 5, "fitted as PSF\n");
-    pmModelSub (source->pixels, source->mask, PSF, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
 
     // free old model, save new model
@@ -264,5 +264,5 @@
     // sub EXT
     psFree (DBL);
-    pmModelSub (source->pixels, source->mask, EXT, false, false);
+    pmModelSub (source->pixels, source->mask, EXT, PM_MODEL_ADD_FULL);
     psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[PM_PAR_XPOS], EXT->params->data.F32[PM_PAR_YPOS]);
 
@@ -276,6 +276,6 @@
     // sub DLB
     psFree (EXT);
-    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], false, false);
-    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], false, false);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], PM_MODEL_ADD_FULL);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], PM_MODEL_ADD_FULL);
     psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[PM_PAR_XPOS], ONE->params->data.F32[PM_PAR_YPOS]);
 
Index: /branches/eam_02_branch/psphot/src/psphotTestPSF.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotTestPSF.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotTestPSF.c	(revision 12952)
@@ -124,5 +124,5 @@
 
 	// subtract model flux
-	pmModelSub (source->pixels, source->mask, model, false, false);
+	pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     fclose (f);
Index: /branches/eam_02_branch/psphot/src/psphotWeightBias.c
===================================================================
--- /branches/eam_02_branch/psphot/src/psphotWeightBias.c	(revision 12951)
+++ /branches/eam_02_branch/psphot/src/psphotWeightBias.c	(revision 12952)
@@ -59,5 +59,5 @@
 
         // replace object in image
-        pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 
         // make a temporary model (we don't keep the result of this analysis)
@@ -76,5 +76,5 @@
 
         // re-subtract PSF for object, leave local sky
-        pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 
         PARp = source->modelPSF->params->data.F32;