Index: branches/eam_branches/ipp-20120805/psModules/src/objects/Makefile.am
===================================================================
--- branches/eam_branches/ipp-20120805/psModules/src/objects/Makefile.am	(revision 34381)
+++ branches/eam_branches/ipp-20120805/psModules/src/objects/Makefile.am	(revision 34383)
@@ -48,4 +48,5 @@
 	pmSourceIO_CMF_PS1_V4.c \
 	pmSourceIO_CMF_PS1_SV1.c \
+	pmSourceIO_CMF_PS1_SV2.c \
 	pmSourceIO_CMF_PS1_DV1.c \
 	pmSourceIO_CMF_PS1_DV2.c \
@@ -136,5 +137,14 @@
 
 # pmSourceID_CMF_* functions use a common framework
-BUILT_SOURCES = pmSourceIO_CMF_PS1_V1.c pmSourceIO_CMF_PS1_V2.c pmSourceIO_CMF_PS1_V3.c pmSourceIO_CMF_PS1_DV1.c pmSourceIO_CMF_PS1_DV2.c pmSourceIO_CMF_PS1_DV3.c pmSourceIO_CMF_PS1_SV1.c
+BUILT_SOURCES = \
+pmSourceIO_CMF_PS1_V1.c \
+pmSourceIO_CMF_PS1_V2.c \
+pmSourceIO_CMF_PS1_V3.c \
+pmSourceIO_CMF_PS1_V4.c \
+pmSourceIO_CMF_PS1_DV1.c \
+pmSourceIO_CMF_PS1_DV2.c \
+pmSourceIO_CMF_PS1_DV3.c \
+pmSourceIO_CMF_PS1_SV1.c \
+pmSourceIO_CMF_PS1_SV2.c
 
 pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
Index: branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.c
===================================================================
--- branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.c	(revision 34381)
+++ branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.c	(revision 34383)
@@ -575,6 +575,8 @@
 	    PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
 	    PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
+	    PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
 	    PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
 	    PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
+	    PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
 
 	    psFree (outhead);
@@ -1048,6 +1050,8 @@
 	    PM_SOURCES_READ_PSF("PS1_V4",    CMF_PS1_V4);
 	    PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
+	    PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
 	    PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
 	    PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
+	    PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
 
             long *sourceIndex = NULL;
@@ -1254,6 +1258,8 @@
 	PM_SOURCES_READ_XSRC("PS1_V4",    CMF_PS1_V4);
 	PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
+	PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
 	PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
 	PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
+	PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);
@@ -1290,6 +1296,8 @@
 	PM_SOURCES_READ_XFIT("PS1_V4",    CMF_PS1_V4);
 	PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
+	PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
 	PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
 	PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
+	PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);
@@ -1325,6 +1333,8 @@
 	PM_SOURCES_READ_XRAD("PS1_V4",    CMF_PS1_V4);
 	PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
+	PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
 	PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
 	PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
+	PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);
Index: branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.h
===================================================================
--- branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.h	(revision 34381)
+++ branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.h	(revision 34383)
@@ -36,4 +36,5 @@
 MK_PROTO(CMF_PS1_V4);
 MK_PROTO(CMF_PS1_SV1);
+MK_PROTO(CMF_PS1_SV2);
 MK_PROTO(CMF_PS1_DV1);
 MK_PROTO(CMF_PS1_DV2);
Index: branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in
===================================================================
--- branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 34381)
+++ branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 34383)
@@ -142,5 +142,5 @@
 	@>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX_SIG",      PS_DATA_F32, "aperture flux error",                        source->apFluxErr);
 
-	@<PS1_V3,PS1_SV?,PS1_DV?@ psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
+	@<PS1_V3,PS1_SV1,PS1_DV?@ psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
 
         @ALL@      		  psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG",      PS_DATA_F32, "PSF Magnitude using supplied calibration",   outputs.calMag);
@@ -151,5 +151,5 @@
 	@ALL,!PS1_V1@             psMetadataAdd (row, PS_LIST_TAIL, "DEC_PSF",          PS_DATA_F64, "PSF DEC coordinate (degrees)",               outputs.dec);
 
-	@>=PS1_V3@ 		  psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
+	@>=PS1_V3,>PS1_SV1@	  psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
         @ALL@     		  psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
         @ALL@     		  psMetadataAdd (row, PS_LIST_TAIL, "SKY_SIGMA",        PS_DATA_F32, "Sigma of sky level",                         source->skyErr);
@@ -200,5 +200,5 @@
         @ALL@     		   psMetadataAdd (row, PS_LIST_TAIL, "FLAGS",            PS_DATA_U32, "psphot analysis flags",                      source->mode);
 	@>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "FLAGS2",           PS_DATA_U32, "psphot analysis flags",                      source->mode2);
-	@>PS1_V2@                  psMetadataAdd (row, PS_LIST_TAIL, "PADDING2",         PS_DATA_S32, "more padding", 0);
+	@PS1_V3,PS1_SV2@           psMetadataAdd (row, PS_LIST_TAIL, "PADDING2",         PS_DATA_S32, "more padding", 0);
 	@PS1_SV?@