Index: /branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmSubtractionStamps.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmSubtractionStamps.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmSubtractionStamps.c	(revision 31360)
@@ -1197,8 +1197,8 @@
        
 	// fprintf (stderr, "%f,%f : %f %f : %f %f\n", source->peak->xf, source->peak->yf,
-	// source->psfMag, source->apMag, source->psfMag - source->apMag, source->errMag);
+	// source->psfMag, source->apMag, source->psfMag - source->apMag, source->psfMagErr);
 
 	// XXX this is somewhat arbitrary...
-	if (source->errMag > 0.05) continue;
+	if (source->psfMagErr > 0.05) continue;
 	if (fabs(source->psfMag - source->apMag) > 0.5) continue;
 
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmPSFtryFitPSF.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmPSFtryFitPSF.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmPSFtryFitPSF.c	(revision 31360)
@@ -122,5 +122,5 @@
         psfTry->fitMag->data.F32[i] = source->psfMag;
         psfTry->metric->data.F32[i] = source->apMag - source->psfMag;
-        psfTry->metricErr->data.F32[i] = source->errMag;
+        psfTry->metricErr->data.F32[i] = source->psfMagErr;
 
 	// XXX this did not work: modifies shape of psf too much
@@ -131,5 +131,5 @@
 		 source->peak->xf, source->peak->yf, 
 		 source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS], 
-		 source->psfMag, source->apMag, source->errMag,
+		 source->psfMag, source->apMag, source->psfMagErr,
 		 source->modelPSF->params->data.F32[PM_PAR_I0], 
 		 source->modelPSF->params->data.F32[PM_PAR_SXX], source->modelPSF->params->data.F32[PM_PAR_SXY], 
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSource.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSource.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSource.c	(revision 31360)
@@ -137,5 +137,5 @@
     source->psfFluxErr 	     = NAN;
     source->extMag 	     = NAN;    
-    source->errMag 	     = NAN;
+    source->psfMagErr 	     = NAN;
     source->apMag  	     = NAN;
     source->apMagRaw  	     = NAN;
@@ -207,5 +207,5 @@
     source->psfFluxErr	       = in->psfFluxErr;
     source->extMag	       = in->extMag;
-    source->errMag	       = in->errMag;
+    source->psfMagErr	       = in->psfMagErr;
     source->apMag	       = in->apMag;
     source->apMagRaw	       = in->apMagRaw;
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c	(revision 31360)
@@ -125,5 +125,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
@@ -256,10 +256,10 @@
 
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
         PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c	(revision 31360)
@@ -124,5 +124,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
@@ -274,10 +274,10 @@
 
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
         PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c	(revision 31360)
@@ -125,5 +125,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental flux (counts)",         source->psfFlux);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental flux",             source->psfFluxErr);
@@ -273,10 +273,10 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
         PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c	(revision 31360)
@@ -118,5 +118,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              outputs.apRadius);
@@ -241,10 +241,10 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
         PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c	(revision 31360)
@@ -116,5 +116,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              outputs.apRadius);
@@ -247,10 +247,10 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
         PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMP.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMP.c	(revision 31360)
@@ -137,5 +137,5 @@
         axes = pmPSF_ModelToAxes (PAR, 20.0);
 
-        float errMag = isfinite(source->errMag) ? source->errMag : 999;
+        float psfMagErr = isfinite(source->psfMagErr) ? source->psfMagErr : 999;
 
         psLineInit (line);
@@ -143,5 +143,5 @@
         psLineAdd (line, "%6.1f ",  PAR[PM_PAR_YPOS]);
         psLineAdd (line, "%6.3f ",  PS_MIN (99.0, source->psfMag + ZERO_POINT));
-        psLineAdd (line, "%03d ",   PS_MIN (999, (int)errMag));
+        psLineAdd (line, "%03d ",   PS_MIN (999, (int)psfMagErr));
         psLineAdd (line, "%2d ",    type);
         psLineAdd (line, "%3.1f ",  lsky);
@@ -280,5 +280,5 @@
             source->psfMag = atof (array->data[2]);
             source->extMag = atof (array->data[6]);
-            source->errMag = atof (array->data[3]) / 1000.0;
+            source->psfMagErr = atof (array->data[3]) / 1000.0;
             source->apMag  = atof (array->data[7]);
             axes.major     = atof (array->data[8]);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_CAL_0.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 31360)
@@ -71,5 +71,5 @@
     psF32 xPos, yPos;
     psF32 xErr, yErr;
-    psF32 errMag, chisq;
+    psF32 psfMagErr, chisq;
 
     pmChip *chip = readout->parent->parent;
@@ -121,6 +121,6 @@
 	    chisq = model->chisq;
 
-	    // need to determine the PSF photometry error: source->errMag is the error on the 'best' model mag.
-	    errMag = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
+	    // need to determine the PSF photometry error: source->psfMagErr is the error on the 'best' model mag.
+	    psfMagErr = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
         } else {
             xPos = source->peak->xf;
@@ -132,5 +132,5 @@
             axes.theta = NAN;
 	    chisq = NAN;
-	    errMag = NAN;
+	    psfMagErr = NAN;
         }
 
@@ -167,7 +167,7 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
         psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG",      PS_DATA_F32, "Calibrated Magnitude from PSF Fit",          calMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG_SIG",  PS_DATA_F32, "Calibrated Magnitude Error",                 errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG_SIG",  PS_DATA_F32, "Calibrated Magnitude Error",                 psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           peakMag);
         psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
@@ -284,7 +284,7 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
 	PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-	dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+	dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_0.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 31360)
@@ -113,5 +113,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             PS_MIN (99.0, source->psfMag));
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        PS_MIN (99.0, source->errMag));
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        PS_MIN (99.0, source->psfMagErr));
         psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           PS_MIN (99.0, peakMag));
         psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
@@ -212,5 +212,5 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_1.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_1.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_1.c	(revision 31360)
@@ -70,5 +70,5 @@
     psF32 xPos, yPos;
     psF32 xErr, yErr;
-    psF32 errMag, chisq;
+    psF32 psfMagErr, chisq;
 
     // let's write these out in S/N order
@@ -103,6 +103,6 @@
 	    chisq = model->chisq;
 
-	    // need to determine the PSF photometry error: source->errMag is the error on the 'best' model mag.
-	    errMag = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
+	    // need to determine the PSF photometry error: source->psfMagErr is the error on the 'best' model mag.
+	    psfMagErr = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
         } else {
             xPos = source->peak->xf;
@@ -114,5 +114,5 @@
             axes.theta = NAN;
 	    chisq = NAN;
-	    errMag = NAN;
+	    psfMagErr = NAN;
         }
 
@@ -128,5 +128,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        psfMagErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           peakMag);
         psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
@@ -253,7 +253,7 @@
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
 	PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
-	dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
+	dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_RAW.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_RAW.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_RAW.c	(revision 31360)
@@ -110,5 +110,5 @@
         fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
                  PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
-                 source->psfMag, source->errMag, dPos);
+                 source->psfMag, source->psfMagErr, dPos);
 
         for (j = 4; j < model->params->n; j++) {
@@ -174,5 +174,5 @@
         fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
                  PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
-                 source->extMag, source->errMag, dPos);
+                 source->extMag, source->psfMagErr, dPos);
 
         for (j = 4; j < model->params->n; j++) {
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SMPDATA.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 31360)
@@ -106,5 +106,5 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PIX",   PS_DATA_F32, "", yPos);
         psMetadataAdd (row, PS_LIST_TAIL, "MAG_RAW", PS_DATA_F32, "", PS_MIN (99.0, source->psfMag + ZERO_POINT));
-        psMetadataAdd (row, PS_LIST_TAIL, "MAG_ERR", PS_DATA_F32, "", PS_MIN (999, 1000*source->errMag));
+        psMetadataAdd (row, PS_LIST_TAIL, "MAG_ERR", PS_DATA_F32, "", PS_MIN (999, 1000*source->psfMagErr));
         psMetadataAdd (row, PS_LIST_TAIL, "MAG_GAL", PS_DATA_F32, "", PS_MIN (99.0, source->extMag + ZERO_POINT));
         psMetadataAdd (row, PS_LIST_TAIL, "MAG_AP",  PS_DATA_F32, "", PS_MIN (99.0, source->apMag + ZERO_POINT));
@@ -194,5 +194,5 @@
         source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;
         source->extMag = psMetadataLookupF32 (&status, row, "MAG_GAL") - ZERO_POINT;
-        source->errMag = psMetadataLookupF32 (&status, row, "MAG_ERR") * 0.001;
+        source->psfMagErr = psMetadataLookupF32 (&status, row, "MAG_ERR") * 0.001;
         source->apMag  = psMetadataLookupF32 (&status, row, "MAG_AP")  - ZERO_POINT;
 
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SX.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SX.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SX.c	(revision 31360)
@@ -88,5 +88,5 @@
         psLineAdd (line, "%11.3f", PAR[PM_PAR_YPOS]);
         psLineAdd (line, "%9.4f",  source->psfMag);
-        psLineAdd (line, "%9.4f",  source->errMag);
+        psLineAdd (line, "%9.4f",  source->psfMagErr);
         psLineAdd (line, "%13.4f", source->sky);
         psLineAdd (line, "%9.2f",  axes.major);
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMatch.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMatch.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMatch.c	(revision 31360)
@@ -88,5 +88,5 @@
         pmSource *source = sources->data[i]; // Source of interest
         if (!source || (source->mode & SOURCE_MASK) || !isfinite(source->psfMag) ||
-            !isfinite(source->errMag) || source->psfMag > SOURCE_FAINTEST) {
+            !isfinite(source->psfMagErr) || source->psfMag > SOURCE_FAINTEST) {
             continue;
         }
@@ -102,5 +102,5 @@
         (*y)->data.F32[num] = ySrc;
         (*mag)->data.F32[num] = source->psfMag;
-        (*magErr)->data.F32[num] = source->errMag;
+        (*magErr)->data.F32[num] = source->psfMagErr;
         (*indices)->data.S32[num] = i;
         num++;
Index: /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceOutputs.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceOutputs.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceOutputs.c	(revision 31360)
@@ -103,6 +103,6 @@
 	    outputs->yErr = dPAR[PM_PAR_YPOS];
 	} else {
-	    outputs->xErr = fwhmMajor * source->errMag / 2.35;
-	    outputs->yErr = fwhmMinor * source->errMag / 2.35;
+	    outputs->xErr = fwhmMajor * source->psfMagErr / 2.35;
+	    outputs->yErr = fwhmMinor * source->psfMagErr / 2.35;
 	}
 	if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) {
@@ -126,6 +126,6 @@
 	    outputs->xPos = source->moments->Mx;
 	    outputs->yPos = source->moments->My;
-	    outputs->xErr = fwhmMajor * source->errMag / 2.35;
-	    outputs->yErr = fwhmMinor * source->errMag / 2.35;
+	    outputs->xErr = fwhmMajor * source->psfMagErr / 2.35;
+	    outputs->yErr = fwhmMinor * source->psfMagErr / 2.35;
 	} else {
 	    outputs->xPos = source->peak->xf;
Index: /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSource.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSource.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSource.c	(revision 31360)
@@ -91,5 +91,5 @@
         ok(isnan(src->psfMag), "pmSourceAlloc() pmSource->psfMag correctly");
         ok(isnan(src->extMag), "pmSourceAlloc() pmSource->extMag correctly");
-        ok(isnan(src->errMag), "pmSourceAlloc() pmSource->errMag correctly");
+        ok(isnan(src->psfMagErr), "pmSourceAlloc() pmSource->psfMagErr correctly");
         ok(isnan(src->apMag), "pmSourceAlloc() pmSource->apMag correctly");
         ok(isnan(src->sky), "pmSourceAlloc() pmSource->sky correctly");
Index: /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c	(revision 31360)
@@ -167,5 +167,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -215,6 +215,6 @@
              ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMag correctly (is %.2f, should be %.2f)",
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
-             ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, (TEST_BASE_ERR_MAG + (float) i));
+             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
 
              // XXX: Source code always sets src->modelPSF.  Is that right?
Index: /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c	(revision 31360)
@@ -196,5 +196,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -203,5 +203,5 @@
             sources->data[i] = (psPtr *) src;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
             src->skyErr = TEST_BASE_SKY_ERR + (float) i;
@@ -280,6 +280,6 @@
              ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMag correctly (is %.2f, should be %.2f)",
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
-             ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, (TEST_BASE_ERR_MAG + (float) i));
+             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
 
              // XXX: Source code always sets src->modelPSF.  Is that right?
Index: /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_SMPDATA.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_SMPDATA.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_SMPDATA.c	(revision 31360)
@@ -167,5 +167,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -226,6 +226,6 @@
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
              float tmpF =  0.001 * PS_MIN(999, (1000 * (TEST_BASE_ERR_MAG + (float) i)));
-             ok(src->errMag == tmpF, "pmSourcesRead_SMPDATA() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, tmpF);
+             ok(src->psfMagErr == tmpF, "pmSourcesRead_SMPDATA() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, tmpF);
              tmpF = PS_MIN(99.0, (TEST_BASE_EXT_MAG + ZERO_POINT)) - ZERO_POINT;
              ok(src->extMag == tmpF, "pmSourcesRead_SMPDATA() set src->extMag correctly (is %.2f, should be %.2f)",
Index: /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourcePhotometry.c
===================================================================
--- /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourcePhotometry.c	(revision 31359)
+++ /branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourcePhotometry.c	(revision 31360)
@@ -103,5 +103,5 @@
     ok_float_tol(source->psfMag, fitMag, 0.0002, "source fitMag is %f", source->psfMag);
     ok_float_tol(source->apMag,  apMag, 0.0002, "source apMag is %f", source->apMag);
-    ok_float(source->errMag,   0.001, "source errMag is %f", source->errMag);
+    ok_float(source->psfMagErr,   0.001, "source psfMagErr is %f", source->psfMagErr);
     float refMag = source->apMag;