Index: branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in
===================================================================
--- branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 34188)
+++ branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 34192)
@@ -179,6 +179,6 @@
         @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX",        PS_DATA_F32, "Kron Flux (in 2.5 R1)",                      moments.Krf);
         @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX_ERR",    PS_DATA_F32, "Kron Flux Error",                            moments.dKrf);
-        @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX_INNER",  PS_DATA_F32, "Kron Flux (in 2.5 R1)",                      moments.Kinner);
-        @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX_OUTER",  PS_DATA_F32, "Kron Flux (in 2.5 R1)",                      moments.Kouter);
+        @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX_INNER",  PS_DATA_F32, "Kron Flux (in 1.0 R1)",                      moments.Kinner);
+        @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "KRON_FLUX_OUTER",  PS_DATA_F32, "Kron Flux (in 4.0 R1)",                      moments.Kouter);
 
         @>PS1_V3@ 		  psMetadataAdd (row, PS_LIST_TAIL, "SKY_LIMIT_RAD",    PS_DATA_F32, "Radius where object hits sky",               source->skyRadius);
@@ -200,7 +200,15 @@
 	@>PS1_V2,PS1_SV1,PS1_DV2@ 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_SV1@ // XXX do I need PADDING2 or not?
-
-        // XXX not sure how to get this : need to load Nimages with weight?
+	@PS1_SV1@
+
+	  // note that this definition is inconsistent with the definition in
+	  // Ohana/src/libautocode/def.  This version creates a table with data not
+	  // properly aligned with the 8-byte boundaries. The structure defined by
+	  // libautocode does this, but has a different order of elements (and adds
+	  // padding2 to fix things). We have generated may files with PS1_SV1 as is, so
+	  // I'll leave it. But in future a PS1_SV2 should be forced to match
+	  // libautocode. Note that addstar knows to detect the alternate version of
+	  // PS1_SV1 and correctly interpret its fields.
+
         @ALL@     		  psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", source->nFrames);
         @ALL@     		  psMetadataAdd (row, PS_LIST_TAIL, "PADDING",          PS_DATA_S16, "padding", 0);