Index: trunk/ippToPsps/config/tables.IN.vot
===================================================================
--- trunk/ippToPsps/config/tables.IN.vot	(revision 40269)
+++ trunk/ippToPsps/config/tables.IN.vot	(revision 40270)
@@ -822,28 +822,29 @@
         <DATA>
         <TABLEDATA>
-          <TR><TD>DEFAULT</TD>           <TD>0x00000000</TD><TD>0              </TD><TD>Initial value; resets all bits.</TD></TR>
-	  <TR><TD>SECF_STAR_FEW</TD>     <TD>0x00000001</TD><TD>1              </TD><TD>Used within relphot: skip star.</TD></TR>
-	  <TR><TD>SECF_STAR_POOR</TD>    <TD>0x00000002</TD><TD>2              </TD><TD>Used within relphot: skip star.</TD></TR>
-	  <TR><TD>SECF_USE_SYNTH</TD>    <TD>0x00000004</TD><TD>4              </TD><TD>Synthetic photometry used in average measurement.</TD></TR>
-	  <TR><TD>SECF_USE_UBERCAL</TD>  <TD>0x00000008</TD><TD>8              </TD><TD>Ubercal photometry used in average measurement.</TD></TR>
-	  <TR><TD>SECF_HAS_PS1</TD>      <TD>0x00000010</TD><TD>16             </TD><TD>PS1 photometry used in average measurement.</TD></TR>
-	  <TR><TD>SECF_HAS_PS1_STACK</TD><TD>0x00000020</TD><TD>32             </TD><TD>PS1 stack photometry exists.</TD></TR>
-
-	  <TR><TD>SECF_HAS_TYCHO</TD>    <TD>0x00000040</TD><TD>64             </TD><TD>Tycho photometry used for synthetic magnitudes.</TD></TR>
-	  <TR><TD>SECF_FIX_SYNTH</TD>    <TD>0x00000080</TD><TD>128            </TD><TD>Synthetic magnitudes repaired with zeropoint map.</TD></TR>
-
-	  <TR><TD>SECF_RANK_0</TD>       <TD>0x00000100</TD><TD>256            </TD><TD>Average magnitude calculated in 0th pass.</TD></TR>
-	  <TR><TD>SECF_RANK_1</TD>       <TD>0x00000200</TD><TD>512            </TD><TD>Average magnitude calculated in 1st pass.</TD></TR>
-	  <TR><TD>SECF_RANK_2</TD>       <TD>0x00000400</TD><TD>1024           </TD><TD>Average magnitude calculated in 2nd pass.</TD></TR>
-	  <TR><TD>SECF_RANK_3</TD>       <TD>0x00000800</TD><TD>2048           </TD><TD>Average magnitude calculated in 3rd pass.</TD></TR>
-	  <TR><TD>SECF_RANK_4</TD>       <TD>0x00001000</TD><TD>4096           </TD><TD>Average magnitude calculated in 4th pass.</TD></TR>
-	  <TR><TD>SECF_STACK_PRIMARY</TD><TD>0x00004000</TD><TD>16384          </TD><TD>PS1 stack photometry comes from primary skycell.</TD></TR>
-	  <TR><TD>SECF_STACK_BESTDET</TD><TD>0x00008000</TD><TD>32768          </TD><TD>PS1 stack best measurement is a detection (not forced).</TD></TR>
-	  <TR><TD>SECF_STACK_PRIMDET</TD><TD>0x00010000</TD><TD>65536          </TD><TD>PS1 stack primary measurement is a detection (not forced).</TD></TR>
-	  <TR><TD>SECF_HAS_SDSS</TD>     <TD>0x00100000</TD><TD>1048576        </TD><TD>This photcode has SDSS photometry.</TD></TR>
-	  <TR><TD>SECF_HAS_HSC</TD>      <TD>0x00200000</TD><TD>2097152        </TD><TD>This photcode has HSC photometry.</TD></TR>
-	  <TR><TD>SECF_HAS_CFH</TD>      <TD>0x00400000</TD><TD>4194304        </TD><TD>This photcode has CFH photometry (mostly Megacam).</TD></TR>
-	  <TR><TD>SECF_HAS_DES</TD>      <TD>0x00800000</TD><TD>8388608        </TD><TD>This photcode has DES photometry.</TD></TR>
-	  <TR><TD>SECF_OBJ_EXT</TD>      <TD>0x01000000</TD><TD>16777216       </TD><TD>Extended in this band.</TD></TR>
+          <TR><TD>DEFAULT</TD>           	  <TD>0x00000000</TD><TD>0              </TD><TD>Initial value; resets all bits.</TD></TR>
+	  <TR><TD>SECF_STAR_FEW</TD>     	  <TD>0x00000001</TD><TD>1              </TD><TD>Used within relphot: skip star.</TD></TR>
+	  <TR><TD>SECF_STAR_POOR</TD>    	  <TD>0x00000002</TD><TD>2              </TD><TD>Used within relphot: skip star.</TD></TR>
+	  <TR><TD>SECF_USE_SYNTH</TD>    	  <TD>0x00000004</TD><TD>4              </TD><TD>Synthetic photometry used in average measurement.</TD></TR>
+	  <TR><TD>SECF_USE_UBERCAL</TD>  	  <TD>0x00000008</TD><TD>8              </TD><TD>Ubercal photometry used in average measurement.</TD></TR>
+	  <TR><TD>SECF_HAS_PS1</TD>      	  <TD>0x00000010</TD><TD>16             </TD><TD>PS1 photometry used in average measurement.</TD></TR>
+	  <TR><TD>SECF_HAS_PS1_STACK</TD>	  <TD>0x00000020</TD><TD>32             </TD><TD>PS1 stack photometry exists.</TD></TR>
+
+	  <TR><TD>SECF_HAS_TYCHO</TD>    	  <TD>0x00000040</TD><TD>64             </TD><TD>Tycho photometry used for synthetic magnitudes.</TD></TR>
+	  <TR><TD>SECF_FIX_SYNTH</TD>    	  <TD>0x00000080</TD><TD>128            </TD><TD>Synthetic magnitudes repaired with zeropoint map.</TD></TR>
+
+	  <TR><TD>SECF_RANK_0</TD>       	  <TD>0x00000100</TD><TD>256            </TD><TD>Average magnitude calculated in 0th pass.</TD></TR>
+	  <TR><TD>SECF_RANK_1</TD>       	  <TD>0x00000200</TD><TD>512            </TD><TD>Average magnitude calculated in 1st pass.</TD></TR>
+	  <TR><TD>SECF_RANK_2</TD>       	  <TD>0x00000400</TD><TD>1024           </TD><TD>Average magnitude calculated in 2nd pass.</TD></TR>
+	  <TR><TD>SECF_RANK_3</TD>       	  <TD>0x00000800</TD><TD>2048           </TD><TD>Average magnitude calculated in 3rd pass.</TD></TR>
+	  <TR><TD>SECF_RANK_4</TD>       	  <TD>0x00001000</TD><TD>4096           </TD><TD>Average magnitude calculated in 4th pass.</TD></TR>
+	  <TR><TD>SECF_STACK_PRIMARY</TD>	  <TD>0x00004000</TD><TD>16384          </TD><TD>PS1 stack photometry includes a primary skycell.</TD></TR>
+	  <TR><TD>SECF_STACK_BESTDET</TD>	  <TD>0x00008000</TD><TD>32768          </TD><TD>PS1 stack best measurement is a detection (not forced).</TD></TR>
+	  <TR><TD>SECF_STACK_PRIMDET</TD>	  <TD>0x00010000</TD><TD>65536          </TD><TD>PS1 stack primary measurement is a detection (not forced).</TD></TR>
+	  <TR><TD>SECF_STACK_PRIMARY_MULTIPLE</TD><TD>0x00010000</TD><TD>65536          </TD><TD>PS1 stack object has multiple primary measurements.</TD></TR>
+	  <TR><TD>SECF_HAS_SDSS</TD>     	  <TD>0x00100000</TD><TD>1048576        </TD><TD>This photcode has SDSS photometry.</TD></TR>
+	  <TR><TD>SECF_HAS_HSC</TD>      	  <TD>0x00200000</TD><TD>2097152        </TD><TD>This photcode has HSC photometry.</TD></TR>
+	  <TR><TD>SECF_HAS_CFH</TD>      	  <TD>0x00400000</TD><TD>4194304        </TD><TD>This photcode has CFH photometry (mostly Megacam).</TD></TR>
+	  <TR><TD>SECF_HAS_DES</TD>      	  <TD>0x00800000</TD><TD>8388608        </TD><TD>This photcode has DES photometry.</TD></TR>
+	  <TR><TD>SECF_OBJ_EXT</TD>      	  <TD>0x01000000</TD><TD>16777216       </TD><TD>Extended in this band.</TD></TR>
         </TABLEDATA>
       </DATA>
Index: trunk/ippToPsps/config/tables.ST.vot
===================================================================
--- trunk/ippToPsps/config/tables.ST.vot	(revision 40269)
+++ trunk/ippToPsps/config/tables.ST.vot	(revision 40270)
@@ -93,5 +93,8 @@
       </FIELD>
       <FIELD name="photoZero" arraysize="1" datatype="float" unit="magnitudes" default="-999">
-        <DESCRIPTION>Locally derived photometric zero point for this stack.</DESCRIPTION>
+        <DESCRIPTION>Locally derived photometric zero point for this stack (PSF-like measurements only).</DESCRIPTION>
+      </FIELD>
+      <FIELD name="photoZeroAperture" arraysize="1" datatype="float" unit="magnitudes" default="-999">
+        <DESCRIPTION>Locally derived photometric zero point for this stack (Aperture-like measurements only).</DESCRIPTION>
       </FIELD>
       <FIELD name="ctype1" arraysize="100" datatype="char" unit="dimensionless" default="">
@@ -587,5 +590,8 @@
       </FIELD>
       <FIELD name="gzp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint for the g filter stack.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint for the g filter stack (PSF-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="gzpAPER" arraysize="1" datatype="float" unit="magnitudes" default="0">
+        <DESCRIPTION>Photometric zeropoint for the g filter stack (APERTURE-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="gPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
@@ -694,5 +700,8 @@
       </FIELD>
       <FIELD name="rzp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint for the r filter stack.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint for the r filter stack (PSF-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="rzpAPER" arraysize="1" datatype="float" unit="magnitudes" default="0">
+        <DESCRIPTION>Photometric zeropoint for the r filter stack (APERTURE-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="rPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
@@ -801,5 +810,8 @@
       </FIELD>
       <FIELD name="izp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint for the i filter stack.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint for the i filter stack (PSF-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="izpAPER" arraysize="1" datatype="float" unit="magnitudes" default="0">
+        <DESCRIPTION>Photometric zeropoint for the i filter stack (APERTURE-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="iPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
@@ -908,5 +920,8 @@
       </FIELD>
       <FIELD name="zzp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint for the z filter stack.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint for the z filter stack (PSF-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="zzpAPER" arraysize="1" datatype="float" unit="magnitudes" default="0">
+        <DESCRIPTION>Photometric zeropoint for the z filter stack (APERTURE-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="zPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
@@ -1015,5 +1030,8 @@
       </FIELD>
       <FIELD name="yzp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint for the y filter stack.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint for the y filter stack (PSF-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="yzpAPER" arraysize="1" datatype="float" unit="magnitudes" default="0">
+        <DESCRIPTION>Photometric zeropoint for the y filter stack (APERTURE-like magnitudes only).  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="yPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
@@ -4790,5 +4808,5 @@
       </FIELD>
       <FIELD name="zp" arraysize="1" datatype="float" unit="magnitudes" default="0">
-        <DESCRIPTION>Photometric zeropoint.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
+        <DESCRIPTION>Photometric zeropoint of frame/exposure.  Necessary for converting listed fluxes and magnitudes back to measured ADU counts.</DESCRIPTION>
       </FIELD>
       <FIELD name="expTime" arraysize="1" datatype="float" unit="seconds" default="-999">