Index: branches/eam_branches/ipp-20120601/psModules/src/objects/pmModelFuncs.h
===================================================================
--- branches/eam_branches/ipp-20120601/psModules/src/objects/pmModelFuncs.h	(revision 34044)
+++ branches/eam_branches/ipp-20120601/psModules/src/objects/pmModelFuncs.h	(revision 34049)
@@ -29,4 +29,6 @@
 # define PM_MODEL_FUNCS_H
 
+# define HAVE_MODEL_VAR 1
+
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
@@ -55,5 +57,7 @@
     PM_MODEL_OP_NORM     = 0x20,
     PM_MODEL_OP_NOISE    = 0x40,
+# if (HAVE_MODEL_VAR)
     PM_MODEL_OP_MODELVAR = 0x80,
+# endif
 } pmModelOpMode;
 
Index: branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.c
===================================================================
--- branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.c	(revision 34044)
+++ branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.c	(revision 34049)
@@ -51,5 +51,7 @@
     psFree(tmp->pixels);
     psFree(tmp->variance);
+# if (HAVE_MODEL_VAR)
     psFree(tmp->modelVar);
+# endif
     psFree(tmp->maskObj);
     psFree(tmp->maskView);
@@ -78,5 +80,7 @@
     psFree (source->pixels);
     psFree (source->variance);
+# if (HAVE_MODEL_VAR)
     psFree (source->modelVar);
+# endif
     psFree (source->maskObj);
     psFree (source->maskView);
@@ -86,5 +90,7 @@
     source->pixels = NULL;
     source->variance = NULL;
+# if (HAVE_MODEL_VAR)
     source->modelVar = NULL;
+# endif
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -116,5 +122,7 @@
     source->pixels = NULL;
     source->variance = NULL;
+# if (HAVE_MODEL_VAR)
     source->modelVar = NULL;
+# endif
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -204,5 +212,7 @@
     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;
 
@@ -1033,7 +1043,9 @@
 
     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)
@@ -1058,5 +1070,9 @@
         }
 
+# if (HAVE_MODEL_VAR)
         psF32 **target = addModelVar ? source->modelVar->data.F32 : source->pixels->data.F32;
+# else
+        psF32 **target = source->pixels->data.F32;
+# endif
 
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
@@ -1073,4 +1089,5 @@
             }
         }
+# if (HAVE_MODEL_VAR)
 	if (!addModelVar) {
 	    if (add) {
@@ -1080,4 +1097,11 @@
 	    }
 	}
+# else
+	if (add) {
+	    source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+	} else {
+	    source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+	}
+# endif
         return true;
     }
@@ -1087,14 +1111,24 @@
         target = source->variance;
     }
+# if (HAVE_MODEL_VAR)
     if (addModelVar) {
         target = source->modelVar;
     }
+# endif
 
     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) {
Index: branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.h
===================================================================
--- branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.h	(revision 34044)
+++ branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.h	(revision 34049)
@@ -72,5 +72,7 @@
     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: branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.c	(revision 34044)
+++ branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.c	(revision 34049)
@@ -899,12 +899,21 @@
 }
 
+# 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
 
     const psImage *Pi = Mi->modelFlux;
     assert (Pi != NULL);
 
+# if (HAVE_MODEL_VAR)
     const psImage *Wi = NULL;
     switch (fitVarMode) {
@@ -922,5 +931,10 @@
 	psAbort("programming error");
     }	
-
+# else
+    const psImage *Wi = Mi->variance;
+    if (!unweighted_sum) {
+        assert (Wi != NULL);
+    }
+# endif
     const psImage *Ti = Mi->maskObj;
     assert (Ti != NULL);
@@ -928,9 +942,18 @@
     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 (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) {
@@ -948,6 +971,14 @@
             }
 
+# 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
         }
     }
@@ -955,5 +986,9 @@
 }
 
+# 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);
@@ -963,6 +998,10 @@
     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;
@@ -971,4 +1010,5 @@
     assert (Pj != NULL);
 
+# if (HAVE_MODEL_VAR)
     const psImage *Wi = NULL;
     switch (fitVarMode) {
@@ -986,4 +1026,10 @@
 	psAbort("programming error");
     }	
+# else
+    const psImage *Wi = Mi->variance;
+    if (!unweighted_sum) {
+        assert (Wi != NULL);
+    }
+# endif
 
     const psImage *Ti = Mi->maskObj;
@@ -1015,4 +1061,5 @@
                 continue;
 
+# if (HAVE_MODEL_VAR)
 	    float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
 	    switch (fitVarMode) {
@@ -1031,4 +1078,15 @@
 
 	    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
         }
     }
@@ -1036,5 +1094,9 @@
 }
 
+# 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);
@@ -1044,6 +1106,10 @@
     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;
@@ -1052,4 +1118,5 @@
     assert (Pj != NULL);
 
+# if (HAVE_MODEL_VAR)
     const psImage *Wi = NULL;
     switch (fitVarMode) {
@@ -1067,4 +1134,10 @@
 	psAbort("programming error");
     }	
+# else
+    const psImage *Wi = Mi->variance;
+    if (!unweighted_sum) {
+        assert (Wi != NULL);
+    }
+# endif
 
     const psImage *Ti = Mi->maskObj;
@@ -1096,4 +1169,5 @@
                 continue;
 
+# if (HAVE_MODEL_VAR)
 	    float value = (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
 	    switch (fitVarMode) {
@@ -1113,4 +1187,15 @@
 	    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
         }
     }
Index: branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.h
===================================================================
--- branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.h	(revision 34044)
+++ branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourcePhotometry.h	(revision 34049)
@@ -38,4 +38,5 @@
 } pmSourcePhotometryMode;
 
+# if (HAVE_MODEL_VAR)
 typedef enum {
     PM_SOURCE_PHOTFIT_NONE       = 0,
@@ -44,4 +45,5 @@
     PM_SOURCE_PHOTFIT_MODEL_VAR  = 3,
 } pmSourceFitVarMode;
+# endif
 
 bool pmSourcePhotometryModel(
@@ -82,7 +84,13 @@
 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);