Index: /branches/eam_branches/ipp-20110213/psModules/src/objects/pmPeaks.c
===================================================================
--- /branches/eam_branches/ipp-20110213/psModules/src/objects/pmPeaks.c	(revision 31025)
+++ /branches/eam_branches/ipp-20110213/psModules/src/objects/pmPeaks.c	(revision 31026)
@@ -151,7 +151,7 @@
     tmp->y = y;
     tmp->detValue      	 = value;
-    tmp->rawFlux       	 = NAN;
+    tmp->rawFlux       	 = value; // set this by default: it is up to the user to supply a better value
     tmp->rawFluxStdev  	 = NAN;
-    tmp->smoothFlux    	 = NAN;
+    tmp->smoothFlux    	 = value; // set this by default: it is up to the user to supply a better value
     tmp->smoothFluxStdev = NAN;
     // tmp->SN = 0;
Index: /branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceIO_SMPDATA.c
===================================================================
--- /branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 31025)
+++ /branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 31026)
@@ -205,5 +205,4 @@
 
 	source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
-        source->peak->rawFlux = peakFlux;
 
         sources->data[i] = source;
Index: /branches/eam_branches/ipp-20110213/psphot/src/psphotLoadSRCTEXT.c
===================================================================
--- /branches/eam_branches/ipp-20110213/psphot/src/psphotLoadSRCTEXT.c	(revision 31025)
+++ /branches/eam_branches/ipp-20110213/psphot/src/psphotLoadSRCTEXT.c	(revision 31026)
@@ -78,6 +78,4 @@
 
 	    source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
-	    source->peak->rawFlux = peakFlux;
-	    source->peak->smoothFlux = peakFlux;
 	    source->peak->dx   = dPAR[PM_PAR_XPOS];
 	    source->peak->dy   = dPAR[PM_PAR_YPOS];
Index: /branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c
===================================================================
--- /branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c	(revision 31025)
+++ /branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c	(revision 31026)
@@ -337,6 +337,4 @@
         peak->xf = xpos;
         peak->yf = ypos;
-        peak->rawFlux = flux; // this are being set wrong, but does it matter?
-        peak->smoothFlux = flux; // this are being set wrong, but does it matter?
 
         psArrayAdd (detections->peaks, 100, peak);
Index: /branches/eam_branches/ipp-20110213/psphot/src/psphotSourceMatch.c
===================================================================
--- /branches/eam_branches/ipp-20110213/psphot/src/psphotSourceMatch.c	(revision 31025)
+++ /branches/eam_branches/ipp-20110213/psphot/src/psphotSourceMatch.c	(revision 31026)
@@ -229,10 +229,7 @@
 	    int col0 = readout->image->col0;
 
-	    // XXX the peak type is not really used in psphot
-	    // PM_PEAK_LONE is certainly not true, but irrelevant
+	    // The peak type is not used in psphot. PM_PEAK_LONE may be wrong, but irrelevant
 	    float peakFlux = readout->image->data.F32[(int)(obj->y-row0-0.5)][(int)(obj->x-col0-0.5)];
 	    pmPeak *peak = pmPeakAlloc(obj->x, obj->y, peakFlux, PM_PEAK_LONE);
-	    peak->rawFlux = peakFlux;
-	    peak->smoothFlux = peakFlux;
 	    peak->xf = obj->x;
 	    peak->yf = obj->y;