Index: trunk/psModules/src/objects/models/pmModel_PGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 33993)
+++ trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 34085)
@@ -261,5 +261,4 @@
 {
     psF64 z;
-    int Nstep = 0;
     psEllipseShape shape;
 
@@ -285,5 +284,4 @@
     // use the fact that f is monotonically decreasing
     z = 0;
-    Nstep = 0;
 
     // choose a z value guaranteed to be beyond our limit
Index: trunk/psModules/src/objects/models/pmModel_PS1_V1.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_PS1_V1.c	(revision 33993)
+++ trunk/psModules/src/objects/models/pmModel_PS1_V1.c	(revision 34085)
@@ -283,5 +283,4 @@
 {
     psF64 z;
-    int Nstep = 0;
     psEllipseShape shape;
 
@@ -308,5 +307,4 @@
     // use the fact that f is monotonically decreasing
     z = 0;
-    Nstep = 0;
 
     // choose a z value guaranteed to be beyond our limit
Index: trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 33993)
+++ trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 34085)
@@ -284,5 +284,4 @@
 {
     psF64 z;
-    int Nstep = 0;
     psEllipseShape shape;
 
@@ -312,5 +311,4 @@
     // use the fact that f is monotonically decreasing
     z = 0;
-    Nstep = 0;
 
     // choose a z value guaranteed to be beyond our limit
Index: trunk/psModules/src/objects/models/pmModel_RGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 33993)
+++ trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 34085)
@@ -273,5 +273,4 @@
 {
     psF64 z;
-    int Nstep = 0;
     psEllipseShape shape;
 
@@ -296,5 +295,4 @@
     // use the fact that f is monotonically decreasing
     z = 0;
-    Nstep = 0;
 
     // choose a z value guaranteed to be beyond our limit
Index: trunk/psModules/src/objects/pmModelFuncs.h
===================================================================
--- trunk/psModules/src/objects/pmModelFuncs.h	(revision 33993)
+++ trunk/psModules/src/objects/pmModelFuncs.h	(revision 34085)
@@ -29,6 +29,4 @@
 # define PM_MODEL_FUNCS_H
 
-# define HAVE_MODEL_VAR 1
-
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
@@ -57,7 +55,5 @@
     PM_MODEL_OP_NORM     = 0x20,
     PM_MODEL_OP_NOISE    = 0x40,
-# if (HAVE_MODEL_VAR)
     PM_MODEL_OP_MODELVAR = 0x80,
-# endif
 } pmModelOpMode;
 
Index: trunk/psModules/src/objects/pmModelUtils.c
===================================================================
--- trunk/psModules/src/objects/pmModelUtils.c	(revision 33993)
+++ trunk/psModules/src/objects/pmModelUtils.c	(revision 34085)
@@ -43,4 +43,13 @@
 
 #include "pmErrorCodes.h"
+
+// XX static bool useModelVar = false;
+// XX 
+// XX void pmModelSetModelVarOption (bool option) {
+// XX   useModelVar = option;
+// XX }
+// XX bool pmModelGetModelVarOption (void) {
+// XX   return useModelVar;
+// XX }
 
 /*****************************************************************************
Index: trunk/psModules/src/objects/pmModelUtils.h
===================================================================
--- trunk/psModules/src/objects/pmModelUtils.h	(revision 33993)
+++ trunk/psModules/src/objects/pmModelUtils.h	(revision 34085)
@@ -46,4 +46,7 @@
 bool pmModelSetShape (float *Sxx, float *Sxy, float *Syy, pmMoments *moments);
 
+// XXX void pmModelSetModelVarOption (bool option);
+// XXX bool pmModelGetModelVarOption (void);
+
 /// @}
 # endif /* PM_MODEL_UTILS_H */
Index: trunk/psModules/src/objects/pmPSFtryMakePSF.c
===================================================================
--- trunk/psModules/src/objects/pmPSFtryMakePSF.c	(revision 33993)
+++ trunk/psModules/src/objects/pmPSFtryMakePSF.c	(revision 34085)
@@ -231,9 +231,6 @@
 	// XXX we are using the same stats structure on each pass: do we need to re-init it?
 	// XXX we hardwire this to SAMPLE stats above (psphotChoosePSF.c), hardwire here instead?
-	psStatsOptions meanOption = psStatsMeanOption(psf->psfTrendStats->options);
-	psStatsOptions stdevOption = psStatsStdevOption(psf->psfTrendStats->options);
-
+     
 	pmTrend2D *trend = NULL;
-	float mean, stdev;
 
 	// XXX we are using the same stats structure on each pass: do we need to re-init it?
@@ -249,7 +246,14 @@
 	    return true;
 	}
+
+# if (PS_TRACE_ON)
+	float mean, stdev;
+	psStatsOptions meanOption = psStatsMeanOption(psf->psfTrendStats->options);
+	psStatsOptions stdevOption = psStatsStdevOption(psf->psfTrendStats->options);
 	mean = psStatsGetValue (trend->stats, meanOption);
 	stdev = psStatsGetValue (trend->stats, stdevOption);
 	psTrace ("psModules.objects", 4, "clipped E0 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e0->n);
+# endif
+
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
 	pmSourceVisualPSFModelResid (trend, x, y, e0, srcMask);
@@ -264,7 +268,9 @@
 	    return true;
 	}
+# if (PS_TRACE_ON)
 	mean = psStatsGetValue (trend->stats, meanOption);
 	stdev = psStatsGetValue (trend->stats, stdevOption);
 	psTrace ("psModules.objects", 4, "clipped E1 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e1->n);
+# endif
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
 	pmSourceVisualPSFModelResid (trend, x, y, e1, srcMask);
@@ -279,7 +285,9 @@
 	    return true;
 	}
+# if (PS_TRACE_ON)
 	mean = psStatsGetValue (trend->stats, meanOption);
 	stdev = psStatsGetValue (trend->stats, stdevOption);
 	psTrace ("psModules.objects", 4, "clipped E2 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e2->n);
+# endif
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
 	pmSourceVisualPSFModelResid (trend, x, y, e2, srcMask);
Index: trunk/psModules/src/objects/pmSource.c
===================================================================
--- trunk/psModules/src/objects/pmSource.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSource.c	(revision 34085)
@@ -51,7 +51,5 @@
     psFree(tmp->pixels);
     psFree(tmp->variance);
-# if (HAVE_MODEL_VAR)
     psFree(tmp->modelVar);
-# endif
     psFree(tmp->maskObj);
     psFree(tmp->maskView);
@@ -80,7 +78,5 @@
     psFree (source->pixels);
     psFree (source->variance);
-# if (HAVE_MODEL_VAR)
     psFree (source->modelVar);
-# endif
     psFree (source->maskObj);
     psFree (source->maskView);
@@ -90,7 +86,5 @@
     source->pixels = NULL;
     source->variance = NULL;
-# if (HAVE_MODEL_VAR)
     source->modelVar = NULL;
-# endif
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -122,7 +116,5 @@
     source->pixels = NULL;
     source->variance = NULL;
-# if (HAVE_MODEL_VAR)
     source->modelVar = NULL;
-# endif
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -212,7 +204,5 @@
     source->pixels   = in->pixels   ? psImageCopyView(NULL, in->pixels)   : NULL;
     source->variance = in->variance ? psImageCopyView(NULL, in->variance) : NULL;
-# if (HAVE_MODEL_VAR)
     source->modelVar = NULL;
-# endif
     source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 
@@ -1044,8 +1034,6 @@
     bool addNoise = mode & PM_MODEL_OP_NOISE;
 
-# if (HAVE_MODEL_VAR)
     bool addModelVar = mode & PM_MODEL_OP_MODELVAR;
     if (addModelVar) psAssert (source->modelVar, "programming error");
-# endif
 
     // require the use of pmModelAddWithOffset if we are adding noise (because the model size and norm are rescaled)
@@ -1070,9 +1058,6 @@
         }
 
-# if (HAVE_MODEL_VAR)
-        psF32 **target = addModelVar ? source->modelVar->data.F32 : source->pixels->data.F32;
-# else
-        psF32 **target = source->pixels->data.F32;
-# endif
+	psF32 **target = NULL;
+	target = addModelVar ? source->modelVar->data.F32 : source->pixels->data.F32;
 
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
@@ -1089,19 +1074,12 @@
             }
         }
-# if (HAVE_MODEL_VAR)
+	// do not change the flag here if we are adding/subtracting from modelVar
 	if (!addModelVar) {
-	    if (add) {
-		source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
-	    } else {
-		source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
-	    }
+	  if (add) {
+	    source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+	  } else {
+	    source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+	  }
 	}
-# else
-	if (add) {
-	    source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
-	} else {
-	    source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
-	}
-# endif
         return true;
     }
@@ -1111,24 +1089,17 @@
         target = source->variance;
     }
-# if (HAVE_MODEL_VAR)
     if (addModelVar) {
-        target = source->modelVar;
-    }
-# endif
+      target = source->modelVar;
+    }
 
     if (add) {
 	status = pmModelAddWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
-# if (HAVE_MODEL_VAR)
 	if (!addNoise && !addModelVar) source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
-# else
-	source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
-# endif
     } else {
 	status = pmModelSubWithOffset (target, source->maskObj, model, PM_MODEL_OP_FULL, maskVal, dx, dy);
-# if (HAVE_MODEL_VAR)
 	if (!addNoise && !addModelVar) source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
-# else
-	source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
-# endif
+    }
+    if (!status) {
+	// XXX maybe raise an error or warning?
     }
 
@@ -1200,4 +1171,7 @@
 	status = pmModelSubWithOffset (target, source->maskObj, model, mode, maskVal, dx, dy);
     }
+    if (!status) {
+	// XXX raise an error or warning?
+    }
 
     // restore original values
@@ -1287,4 +1261,7 @@
     } else {
 	status = pmModelSubWithOffset (target, source->maskObj, model, mode, maskVal, dx, dy);
+    }
+    if (!status) {
+	// XXX raise an error or warning?
     }
 
Index: trunk/psModules/src/objects/pmSource.h
===================================================================
--- trunk/psModules/src/objects/pmSource.h	(revision 33993)
+++ trunk/psModules/src/objects/pmSource.h	(revision 34085)
@@ -72,7 +72,5 @@
     psImage *pixels;                    ///< Rectangular region including object pixels.
     psImage *variance;			///< Image variance.
-# if (HAVE_MODEL_VAR)
     psImage *modelVar;			///< variance based on current models
-# endif
     psImage *maskObj;                   ///< unique mask for this object which marks included pixels associated with objects.
     psImage *maskView;                  ///< view into global image mask for this object region
Index: trunk/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 34085)
@@ -65,5 +65,5 @@
     int i, type;
     // psMetadataItem *mdi;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     float lsky = 0;
     bool status;
@@ -130,5 +130,4 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         type = pmSourceGetDophotType (source);
@@ -174,5 +173,5 @@
     bool status;
     int Ninstar;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
 
@@ -185,8 +184,8 @@
     }
 
-    // find config information for output header
-    float ZERO_POINT = psMetadataLookupF32 (&status, header, "ZERO_PT");
-    if (!status)
-        ZERO_POINT = 25.0;
+    // XXX unused // find config information for output header
+    // XXX unused float ZERO_POINT = psMetadataLookupF32 (&status, header, "ZERO_PT");
+    // XXX unused if (!status)
+    // XXX unused     ZERO_POINT = 25.0;
 
     // how many lines in the header?
@@ -273,5 +272,4 @@
 
             PAR = source->modelPSF->params->data.F32;
-            dPAR = source->modelPSF->dparams->data.F32;
 
             PAR[PM_PAR_SKY] = pow (atof (array->data[5]), 10.0);
Index: trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 34085)
@@ -322,4 +322,6 @@
 }
 
+# define WRITE_AP_DATA 0
+
 bool pmSourcesWrite_PS1_CAL_0_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe)
 {
@@ -338,4 +340,5 @@
     }
 
+# if (WRITE_AP_DATA)
     bool calMags = false;
     bool status1 = false;
@@ -350,4 +353,5 @@
 	calMags = true;
     }
+# endif
 
     // create a header to hold the output data
@@ -424,5 +428,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_EXT_SIG",        PS_DATA_F32, "Sigma in EXT y coordinate",                  yErr);
 
-# if (0)
+# if (WRITE_AP_DATA)
 	// Petrosian measurements
 	// XXX insert header data: petrosian ref radius, flux ratio
Index: trunk/psModules/src/objects/pmSourceIO_SMPDATA.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 34085)
@@ -63,5 +63,5 @@
     psMetadata *row;
     int i;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     bool status;
     psEllipseAxes axes;
@@ -85,5 +85,4 @@
         if (model != NULL) {
 	    PAR = model->params->data.F32;
-	    dPAR = model->dparams->data.F32;
 	    xPos = PAR[PM_PAR_XPOS];
 	    yPos = PAR[PM_PAR_YPOS];
@@ -145,5 +144,5 @@
 
     bool status;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
     float lsky;
@@ -176,5 +175,4 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         psMetadata *row = table->data[i];
Index: trunk/psModules/src/objects/pmSourceIO_SX.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 34085)
@@ -56,5 +56,5 @@
     PS_ASSERT_PTR_NON_NULL(filename, false);
 
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
 
@@ -77,5 +77,4 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         // pmSourceSextractType (source, &type, &flags);
Index: trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 33993)
+++ trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 34085)
@@ -899,21 +899,14 @@
 }
 
-# if (HAVE_MODEL_VAR) 
 double pmSourceModelWeight(const pmSource *Mi, int term, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
-# else
-double pmSourceModelWeight(const pmSource *Mi, int term, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
-# endif
 {
     PS_ASSERT_PTR_NON_NULL(Mi, NAN);
-# if (HAVE_MODEL_VAR) 
-    double flux = 0, wt = 1.0, factor = 0;
-# else
-    double flux = 0, wt = 0, factor = 0;
-# endif
+    double flux = 0;
+    double wt = 1.0;
+    double factor = 0;
 
     const psImage *Pi = Mi->modelFlux;
     assert (Pi != NULL);
 
-# if (HAVE_MODEL_VAR)
     const psImage *Wi = NULL;
     switch (fitVarMode) {
@@ -921,4 +914,152 @@
 	break;
       case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+      case PM_SOURCE_PHOTFIT_MODEL_SKY:
+	Wi = Mi->variance;
+	psAssert (Wi, "programming error");
+	break;
+      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+	Wi = Mi->modelVar;
+	psAssert (Wi, "programming error");
+	break;
+      case PM_SOURCE_PHOTFIT_NONE:
+	psAbort("programming error");
+    }	
+    const psImage *Ti = Mi->maskObj;
+    assert (Ti != NULL);
+
+    for (int yi = 0; yi < Pi->numRows; yi++) {
+	for (int xi = 0; xi < Pi->numCols; xi++) {
+	    if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal)
+		continue;
+	    if (fitVarMode != PM_SOURCE_PHOTFIT_CONST) {
+		wt = covarFactor * Wi->data.F32[yi][xi];
+		if (wt == 0) continue;
+	    }
+	    switch (term) {
+	      case 0:
+		factor = 1;
+		break;
+	      case 1:
+		factor = xi + Pi->col0;
+		break;
+	      case 2:
+		factor = yi + Pi->row0;
+		break;
+	      default:
+		psAbort("invalid term for pmSourceWeight");
+	    }
+
+	    // wt is 1.0 for CONST
+	    flux += (factor * Pi->data.F32[yi][xi]) / wt;
+	}
+    }
+    return flux;
+}
+
+double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
+{
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
+    int Xs, Xe, Ys, Ye;
+    int xi, xj, yi, yj;
+    int xIs, xJs, yIs, yJs;
+    int xIe, yIe;
+    double flux;
+    double wt = 1.0;
+
+    const psImage *Pi = Mi->modelFlux;
+    assert (Pi != NULL);
+    const psImage *Pj = Mj->modelFlux;
+    assert (Pj != NULL);
+
+    const psImage *Wi = NULL;
+    switch (fitVarMode) {
+      case PM_SOURCE_PHOTFIT_CONST:
+	break;
+      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+      case PM_SOURCE_PHOTFIT_MODEL_SKY:
+	Wi = Mi->variance;
+	psAssert (Wi, "programming error");
+	break;
+      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+	Wi = Mi->modelVar;
+	psAssert (Wi, "programming error");
+	break;
+      case PM_SOURCE_PHOTFIT_NONE:
+	psAbort("programming error");
+    }	
+
+    const psImage *Ti = Mi->maskObj;
+    assert (Ti != NULL);
+    const psImage *Tj = Mj->maskObj;
+    assert (Tj != NULL);
+
+    Xs = PS_MAX (Pi->col0, Pj->col0);
+    Xe = PS_MIN (Pi->col0 + Pi->numCols, Pj->col0 + Pj->numCols);
+
+    Ys = PS_MAX (Pi->row0, Pj->row0);
+    Ye = PS_MIN (Pi->row0 + Pi->numRows, Pj->row0 + Pj->numRows);
+
+    xIs = Xs - Pi->col0;
+    xJs = Xs - Pj->col0;
+    yIs = Ys - Pi->row0;
+    yJs = Ys - Pj->row0;
+
+    xIe = Xe - Pi->col0;
+    yIe = Ye - Pi->row0;
+
+    // note that weight is addressing the same image pixels
+    flux = 0;
+    for (yi = yIs, yj = yJs; yi < yIe; yi++, yj++) {
+        for (xi = xIs, xj = xJs; xi < xIe; xi++, xj++) {
+            if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal)
+                continue;
+            if (Tj->data.PS_TYPE_IMAGE_MASK_DATA[yj][xj] & maskVal)
+                continue;
+
+	    float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
+	    switch (fitVarMode) {
+	      case PM_SOURCE_PHOTFIT_CONST:
+		wt = 1.0;
+		break;
+	      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+	      case PM_SOURCE_PHOTFIT_MODEL_SKY:
+	      case PM_SOURCE_PHOTFIT_MODEL_VAR:
+		wt = covarFactor * Wi->data.F32[yi][xi];
+		break;
+	      case PM_SOURCE_PHOTFIT_NONE:
+		psAbort("programming error");
+	    }
+	    // skip pixels with nonsense weight values
+	    if (wt <= 0) continue;
+
+	    flux += value / wt;
+        }
+    }
+    return flux;
+}
+
+double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
+{
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
+    int Xs, Xe, Ys, Ye;
+    int xi, xj, yi, yj;
+    int xIs, xJs, yIs, yJs;
+    int xIe, yIe;
+    double flux;
+    double wt = 1.0;
+
+    const psImage *Pi = Mi->pixels;
+    assert (Pi != NULL);
+    const psImage *Pj = Mj->modelFlux;
+    assert (Pj != NULL);
+
+    const psImage *Wi = NULL;
+    switch (fitVarMode) {
+      case PM_SOURCE_PHOTFIT_CONST:
+	break;
+      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+      case PM_SOURCE_PHOTFIT_MODEL_SKY:
 	Wi = Mi->variance;
         psAssert (Wi, "programming error");
@@ -931,105 +1072,4 @@
 	psAbort("programming error");
     }	
-# else
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
-# endif
-    const psImage *Ti = Mi->maskObj;
-    assert (Ti != NULL);
-
-    for (int yi = 0; yi < Pi->numRows; yi++) {
-        for (int xi = 0; xi < Pi->numCols; xi++) {
-            if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal)
-                continue;
-# if (HAVE_MODEL_VAR)
-            if (fitVarMode != PM_SOURCE_PHOTFIT_CONST) {
-                wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt == 0) continue;
-            }
-# else
-            if (!unweighted_sum) {
-                wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt == 0)
-                    continue;
-            }
-# endif
-
-            switch (term) {
-	      case 0:
-                factor = 1;
-                break;
-	      case 1:
-                factor = xi + Pi->col0;
-                break;
-	      case 2:
-                factor = yi + Pi->row0;
-                break;
-	      default:
-                psAbort("invalid term for pmSourceWeight");
-            }
-
-# if (HAVE_MODEL_VAR)
-	    // wt is 1.0 for CONST
-	    flux += (factor * Pi->data.F32[yi][xi]) / wt;
-# else
-            if (unweighted_sum) {
-                flux += (factor * Pi->data.F32[yi][xi]);
-            } else {
-                flux += (factor * Pi->data.F32[yi][xi]) / wt;
-            }
-# endif
-        }
-    }
-    return flux;
-}
-
-# if (HAVE_MODEL_VAR)
-double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
-# else
-double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
-# endif
-{
-    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
-    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
-    int Xs, Xe, Ys, Ye;
-    int xi, xj, yi, yj;
-    int xIs, xJs, yIs, yJs;
-    int xIe, yIe;
-# if (HAVE_MODEL_VAR)
-    double flux;
-    double wt = 1.0;
-# else
-    double flux, wt;
-# endif
-
-    const psImage *Pi = Mi->modelFlux;
-    assert (Pi != NULL);
-    const psImage *Pj = Mj->modelFlux;
-    assert (Pj != NULL);
-
-# if (HAVE_MODEL_VAR)
-    const psImage *Wi = NULL;
-    switch (fitVarMode) {
-      case PM_SOURCE_PHOTFIT_CONST:
-	break;
-      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
-	Wi = Mi->variance;
-        psAssert (Wi, "programming error");
-	break;
-      case PM_SOURCE_PHOTFIT_MODEL_VAR:
-	Wi = Mi->modelVar;
-        psAssert (Wi, "programming error");
-	break;
-      case PM_SOURCE_PHOTFIT_NONE:
-	psAbort("programming error");
-    }	
-# else
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
-# endif
 
     const psImage *Ti = Mi->maskObj;
@@ -1052,5 +1092,5 @@
     yIe = Ye - Pi->row0;
 
-    // note that weight is addressing the same image pixels
+    // note that weight is addressing the same image pixels,
     flux = 0;
     for (yi = yIs, yj = yJs; yi < yIe; yi++, yj++) {
@@ -1061,5 +1101,4 @@
                 continue;
 
-# if (HAVE_MODEL_VAR)
 	    float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
 	    switch (fitVarMode) {
@@ -1068,4 +1107,5 @@
 		break;
 	      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
+	      case PM_SOURCE_PHOTFIT_MODEL_SKY:
 	      case PM_SOURCE_PHOTFIT_MODEL_VAR:
                 wt = covarFactor * Wi->data.F32[yi][xi];
@@ -1078,126 +1118,6 @@
 
 	    flux += value / wt;
-# else
-            // XXX skip the nonsense weight pixels?
-            if (unweighted_sum) {
-                flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
-            } else {
-                wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt > 0) {
-                    flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]) / wt;
-                }
-            }
-# endif
         }
     }
     return flux;
 }
-
-# if (HAVE_MODEL_VAR)
-double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal)
-# else
-double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal)
-# endif
-{
-    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
-    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
-    int Xs, Xe, Ys, Ye;
-    int xi, xj, yi, yj;
-    int xIs, xJs, yIs, yJs;
-    int xIe, yIe;
-# if (HAVE_MODEL_VAR)
-    double flux;
-    double wt = 1.0;
-# else
-    double flux, wt;
-# endif
-
-    const psImage *Pi = Mi->pixels;
-    assert (Pi != NULL);
-    const psImage *Pj = Mj->modelFlux;
-    assert (Pj != NULL);
-
-# if (HAVE_MODEL_VAR)
-    const psImage *Wi = NULL;
-    switch (fitVarMode) {
-      case PM_SOURCE_PHOTFIT_CONST:
-	break;
-      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
-	Wi = Mi->variance;
-        psAssert (Wi, "programming error");
-	break;
-      case PM_SOURCE_PHOTFIT_MODEL_VAR:
-	Wi = Mi->modelVar;
-        psAssert (Wi, "programming error");
-	break;
-      case PM_SOURCE_PHOTFIT_NONE:
-	psAbort("programming error");
-    }	
-# else
-    const psImage *Wi = Mi->variance;
-    if (!unweighted_sum) {
-        assert (Wi != NULL);
-    }
-# endif
-
-    const psImage *Ti = Mi->maskObj;
-    assert (Ti != NULL);
-    const psImage *Tj = Mj->maskObj;
-    assert (Tj != NULL);
-
-    Xs = PS_MAX (Pi->col0, Pj->col0);
-    Xe = PS_MIN (Pi->col0 + Pi->numCols, Pj->col0 + Pj->numCols);
-
-    Ys = PS_MAX (Pi->row0, Pj->row0);
-    Ye = PS_MIN (Pi->row0 + Pi->numRows, Pj->row0 + Pj->numRows);
-
-    xIs = Xs - Pi->col0;
-    xJs = Xs - Pj->col0;
-    yIs = Ys - Pi->row0;
-    yJs = Ys - Pj->row0;
-
-    xIe = Xe - Pi->col0;
-    yIe = Ye - Pi->row0;
-
-    // note that weight is addressing the same image pixels,
-    flux = 0;
-    for (yi = yIs, yj = yJs; yi < yIe; yi++, yj++) {
-        for (xi = xIs, xj = xJs; xi < xIe; xi++, xj++) {
-            if (Ti->data.PS_TYPE_IMAGE_MASK_DATA[yi][xi] & maskVal)
-                continue;
-            if (Tj->data.PS_TYPE_IMAGE_MASK_DATA[yj][xj] & maskVal)
-                continue;
-
-# if (HAVE_MODEL_VAR)
-	    float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
-	    switch (fitVarMode) {
-	      case PM_SOURCE_PHOTFIT_CONST:
-		wt = 1.0;
-		break;
-	      case PM_SOURCE_PHOTFIT_IMAGE_VAR:
-	      case PM_SOURCE_PHOTFIT_MODEL_VAR:
-                wt = covarFactor * Wi->data.F32[yi][xi];
-		break;
-	      case PM_SOURCE_PHOTFIT_NONE:
-		psAbort("programming error");
-	    }
-            // skip pixels with nonsense weight values
-	    if (wt <= 0) continue;
-
-	    flux += value / wt;
-
-# else
-            // XXX skip the nonsense weight pixels?
-            if (unweighted_sum) {
-                flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
-            } else {
-                wt = covarFactor * Wi->data.F32[yi][xi];
-                if (wt > 0) {
-                    flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]) / wt;
-                }
-            }
-# endif
-        }
-    }
-    return flux;
-}
Index: trunk/psModules/src/objects/pmSourcePhotometry.h
===================================================================
--- trunk/psModules/src/objects/pmSourcePhotometry.h	(revision 33993)
+++ trunk/psModules/src/objects/pmSourcePhotometry.h	(revision 34085)
@@ -38,5 +38,4 @@
 } pmSourcePhotometryMode;
 
-# if (HAVE_MODEL_VAR)
 typedef enum {
     PM_SOURCE_PHOTFIT_NONE       = 0,
@@ -44,6 +43,6 @@
     PM_SOURCE_PHOTFIT_IMAGE_VAR  = 2,
     PM_SOURCE_PHOTFIT_MODEL_VAR  = 3,
+    PM_SOURCE_PHOTFIT_MODEL_SKY  = 4,   // XXX bad name: set variance floor based on mean variance image (variance of sky)
 } pmSourceFitVarMode;
-# endif
 
 bool pmSourcePhotometryModel(
@@ -84,13 +83,7 @@
 bool pmSourceMeasureDiffStats (pmSource *source, psImageMaskType maskVal, psImageMaskType markVal);
 
-# if (HAVE_MODEL_VAR)
 double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal);
 double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal);
 double pmSourceModelWeight(const pmSource *Mi, int term, const pmSourceFitVarMode fitVarMode, const float covarFactor, psImageMaskType maskVal);
-# else
-double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
-double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
-double pmSourceModelWeight(const pmSource *Mi, int term, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
-# endif
 
 bool pmSourceNeighborFlags (pmSource *source);