Index: /trunk/ippToPsps/config/tables.P2.vot
===================================================================
--- /trunk/ippToPsps/config/tables.P2.vot	(revision 38781)
+++ /trunk/ippToPsps/config/tables.P2.vot	(revision 38782)
@@ -443,9 +443,9 @@
         <DESCRIPTION>Airmass at midpoint of the exposure.</DESCRIPTION>
       </FIELD>
-      <FIELD name="psfFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>PSF instrumental flux.</DESCRIPTION>
-      </FIELD>
-      <FIELD name="psfFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>Error in PSF flux.</DESCRIPTION>
+      <FIELD name="psfFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Flux from PSF fit.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfFluxErr" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Error on flux from PSF fit.</DESCRIPTION>
       </FIELD>
       <FIELD name="psfMajorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
@@ -473,36 +473,36 @@
         <DESCRIPTION>Likelihood that this detection is best fit by a PSF.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentXX" arraysize="1" datatype="float" unit="raw pixels^2" default="-999">
+      <FIELD name="momentXX" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Second moment M_xx.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentXY" arraysize="1" datatype="float" unit="raw pixels^2" default="-999">
+      <FIELD name="momentXY" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Second moment M_xy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentYY" arraysize="1" datatype="float" unit="raw pixels^2" default="-999">
+      <FIELD name="momentYY" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Second moment M_yy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentR1" arraysize="1" datatype="float" unit="raw pixels" default="-999">
+      <FIELD name="momentR1" arraysize="1" datatype="float" unit="arcsec" default="-999">
         <DESCRIPTION>First radial moment.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentRH" arraysize="1" datatype="float" unit="raw pixels^0.5" default="-999">
+      <FIELD name="momentRH" arraysize="1" datatype="float" unit="arcsec^0.5" default="-999">
         <DESCRIPTION>Half radial moment (r^0.5 weighting).</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentM3C" arraysize="1" datatype="float" unit="raw pixels^3" default="-999">
+      <FIELD name="momentM3C" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Moment M3C = M_xxx - 3 * M_xyy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentM3S" arraysize="1" datatype="float" unit="raw pixels^3" default="-999">
+      <FIELD name="momentM3S" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Moment M3S = 3 * M_xxy - M_yyy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentM4C" arraysize="1" datatype="float" unit="raw pixels^4" default="-999">
+      <FIELD name="momentM4C" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Moment M4C = M_xxxx - 6 * M_xxyy + M_yyyy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentM4S" arraysize="1" datatype="float" unit="raw pixels^4" default="-999">
+      <FIELD name="momentM4S" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
         <DESCRIPTION>Moment M4S = 4 * M_xxxy - 4 * M_xyyy.</DESCRIPTION>
       </FIELD>
-      <FIELD name="apFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>Aperture instrumental flux.</DESCRIPTION>
-      </FIELD>
-      <FIELD name="apFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>Error in aperture flux.</DESCRIPTION>
+      <FIELD name="apFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Flux in seeing-dependent aperture.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="apFluxErr" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Error on flux in seeing-dependent aperture.</DESCRIPTION>
       </FIELD>
       <FIELD name="apFillF" arraysize="1" datatype="float" unit="dimensionless" default="-999">
@@ -512,17 +512,17 @@
         <DESCRIPTION>Aperture radius.</DESCRIPTION>
       </FIELD>
-      <FIELD name="kronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>Kron (1980) instrumental flux.</DESCRIPTION>
-      </FIELD>
-      <FIELD name="kronFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
-        <DESCRIPTION>Error in Kron (1980) instrumental flux.</DESCRIPTION>
-      </FIELD>
-      <FIELD name="kronRad" arraysize="1" datatype="float" unit="raw pixels" default="-999">
+      <FIELD name="kronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Kron (1980) flux.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="kronFluxErr" arraysize="1" datatype="float" unit="Janskys" default="-999">
+        <DESCRIPTION>Error on Kron (1980) flux.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="kronRad" arraysize="1" datatype="float" unit="arcsec" default="-999">
         <DESCRIPTION>Kron (1980) radius.</DESCRIPTION>
       </FIELD>
-      <FIELD name="sky" arraysize="1" datatype="float" unit="adu/seconds/pixel" default="-999">
+      <FIELD name="sky" arraysize="1" datatype="float" unit="Jy/arcsec^2" default="-999">
         <DESCRIPTION>Background sky level.</DESCRIPTION>
       </FIELD>
-      <FIELD name="skyErr" arraysize="1" datatype="float" unit="adu/seconds/pixel" default="-999">
+      <FIELD name="skyErr" arraysize="1" datatype="float" unit="Jy/arcsec^2" default="-999">
         <DESCRIPTION>Error in background sky level.</DESCRIPTION>
       </FIELD>