Index: trunk/ippToPsps/config/detection/map.xml
===================================================================
--- trunk/ippToPsps/config/detection/map.xml	(revision 27345)
+++ trunk/ippToPsps/config/detection/map.xml	(revision 27607)
@@ -43,12 +43,18 @@
   <map ippName="FLIMIT" ippType="TFLOAT" pspsName="completMag" />
   <map ippName="CERROR" ippType="TFLOAT" pspsName="astroScat" />
-  <map ippName="NASTRO" ippType="TLONG" pspsName="nAstRef" />
+  <map ippName="NASTRO" ippType="TLONG" pspsName="numAstroRef" />
   <map ippName="CNAXIS1" ippType="TSHORT" pspsName="nx" />
   <map ippName="CNAXIS2" ippType="TSHORT" pspsName="ny" />
   <map ippName="FWHM_MAJ" ippType="TFLOAT" pspsName="psfWidMajor" />
   <map ippName="FWHM_MIN" ippType="TFLOAT" pspsName="psfWidMinor" />
+  <map ippName="IQ_FW1" ippType="TFLOAT" pspsName="momentWidMajor" />
+  <map ippName="IQ_FW2" ippType="TFLOAT" pspsName="momentWidMinor" />
   <map ippName="ANGLE" ippType="TFLOAT" pspsName="psfTheta" />
   <map ippName="APMIFIT" ippType="TFLOAT" pspsName="apResid" />
   <map ippName="DAPMIFIT" ippType="TFLOAT" pspsName="dapResid" />
+  <map ippName="DETREND.MASK" ippType="TSTRING" pspsName="detrend1" />
+  <map ippName="DETREND.DARK" ippType="TSTRING" pspsName="detrend2" />
+  <map ippName="DETREND.FLAT" ippType="TSTRING" pspsName="detrend3" />
+  <map ippName="DETREND.FRINGE" ippType="TSTRING" pspsName="detrend4" />
   <map ippName="CTYPE1" ippType="TSTRING" pspsName="ctype1" />
   <map ippName="CTYPE2" ippType="TSTRING" pspsName="ctype2" />
Index: trunk/ippToPsps/config/detection/tables.xml
===================================================================
--- trunk/ippToPsps/config/detection/tables.xml	(revision 27345)
+++ trunk/ippToPsps/config/detection/tables.xml	(revision 27607)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<tableDescriptions type="DT">
+<tableDescriptions type="det">
   <table name="FrameMeta">
     <column name="frameID" type="TLONG" default="0" comment="unique exposure/frame identifier."></column>
+    <column name="frameName" type="TSTRING" default=" " comment="frame name provided by camera software"></column>
     <column name="surveyID" type="TBYTE" default="0" comment="survey flag identifier"></column>
     <column name="filterID" type="TBYTE" default="0" comment="filter identifier"></column>
@@ -9,13 +10,11 @@
     <column name="cameraConfigID" type="TSHORT" default="0" comment="camera configuration identifier"></column>
     <column name="telescopeID" type="TSHORT" default="0" comment="telescope identifier"></column>
-    <column name="analysisVer" type="TSHORT" default="-999" comment="version number of analysis"></column>
-    <column name="p1Recip" type="TSHORT" default="-999" comment="IPP phase 1 recipe ID"></column>
-    <column name="p2Recip" type="TSHORT" default="-999" comment="IPP phase 2 recipe ID"></column>
-    <column name="p3Recip" type="TSHORT" default="-999" comment="IPP phase 3 recipe ID"></column>
-    <column name="nP2Images" type="TSHORT" default="-999" comment="number of OTA/CCD images in this P2 exposure"></column>
-    <column name="astroScat" type="TFLOAT" default="-999" comment=" global astrometric scatter (unit = mas)"></column>
+    <column name="analysisVer" type="TSTRING" default=" " comment="IPP software analysis release"></column>
+    <column name="p1Recip" type="TSTRING" default=" " comment="IPP phase 1 MD5 Checksum"></column>
+    <column name="p2Recip" type="TSTRING" default=" " comment="IPP phase 2 MD5 Checksum"></column>
+    <column name="p3Recip" type="TSTRING" default=" " comment="IPP phase 3 MD5 Checksum"></column>
+    <column name="nOTA" type="TSHORT" default="-999" comment="number of valid OTA/CCD images in this exposure"></column>
     <column name="photoScat" type="TFLOAT" default="-999" comment=" global photometric scatter (unit = mag)"></column>
-    <column name="nAstRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
-    <column name="nPhoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
+    <column name="numPhotoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
     <column name="expStart" type="TFLOAT" default="-999" comment=" exposure start time in MJD (unit = day)"></column>
     <column name="expTime" type="TFLOAT" default="-999" comment=" exposure time (unit = s)"></column>
@@ -62,38 +61,40 @@
     <column name="skyScat" type="TFLOAT" default="-999" comment=" scatter in mean sky level (unit = ADU)"></column>
     <column name="nDetect" type="TLONG" default="-999" comment="number of detections on CCD"></column>
-    <column name="magSat" type="TFLOAT" default="-999" comment="saturation magnitude level"></column>
-    <column name="completMag" type="TFLOAT" default="-999" comment="95% completion level in mag"></column>
-    <column name="astroScat" type="TFLOAT" default="-999" comment="astrometric scatter for chip"></column>
+    <column name="magSat" type="TFLOAT" default="-999" comment=" saturation magnitude level (unit = mag)"></column>
+    <column name="completMag" type="TFLOAT" default="-999" comment=" 95% completion level in mag (unit = mag)"></column>
+    <column name="astroScat" type="TFLOAT" default="-999" comment=" astrometric scatter for chip (unit = mag)"></column>
     <column name="photoScat" type="TFLOAT" default="-999" comment="photometric scatter for chip"></column>
-    <column name="nAstRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
-    <column name="nPhoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
+    <column name="numAstroRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
+    <column name="numPhotoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
     <column name="nx" type="TSHORT" default="-999" comment="chip dimension in x"></column>
     <column name="ny" type="TSHORT" default="-999" comment="chip dimension in y"></column>
-    <column name="psfFwhm" type="TFLOAT" default="-999" comment="PSF full width at half maximum"></column>
     <column name="psfModelID" type="TLONG" default="-999" comment="PSF model identifier"></column>
-    <column name="psfWidMajor" type="TFLOAT" default="-999" comment="PSF parameters"></column>
-    <column name="psfWidMinor" type="TFLOAT" default="-999" comment="PSF parameters"></column>
-    <column name="psfTheta" type="TFLOAT" default="-999" comment="PSF parameters"></column>
-    <column name="psfExtra1" type="TFLOAT" default="-999" comment="PSF parameters"></column>
-    <column name="psfExtra2" type="TFLOAT" default="-999" comment="PSF parameters"></column>
+    <column name="psfFwhm" type="TFLOAT" default="-999" comment=" model psf full width at half maximum at chip center (unit = arcsec)"></column>
+    <column name="psfWidMajor" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = arcsec)"></column>
+    <column name="psfWidMinor" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = arcsec)"></column>
+    <column name="psfTheta" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = deg)"></column>
+    <column name="momentFwhm" type="TFLOAT" default="-999" comment=" average PSF full width at half maximum from moments (unit = arcsec)"></column>
+    <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
+    <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
+    <column name="momentTheta" type="TFLOAT" default="-999" comment=" average PSF parametets from moments (unit = deg)"></column>
     <column name="apResid" type="TFLOAT" default="-999" comment="corrected aperture residual"></column>
     <column name="dapResid" type="TFLOAT" default="-999" comment="scatter of aperture corrections"></column>
     <column name="detectorID" type="TSHORT" default="-999" comment="identifier for actual CCD chip"></column>
-    <column name="qaFlags" type="TLONG" default="-999" comment="Q/A flags"></column>
-    <column name="detrend1" type="TLONGLONG" default="-999" comment="identifier of detrend image 1"></column>
-    <column name="detrend2" type="TLONGLONG" default="-999" comment="identifier of detrend image 2"></column>
-    <column name="detrend3" type="TLONGLONG" default="-999" comment="identifier of detrend image 3"></column>
-    <column name="detrend4" type="TLONGLONG" default="-999" comment="identifier of detrend image 4"></column>
-    <column name="detrend5" type="TLONGLONG" default="-999" comment="identifier of detrend image 5"></column>
-    <column name="detrend6" type="TLONGLONG" default="-999" comment="identifier of detrend image 6"></column>
-    <column name="detrend7" type="TLONGLONG" default="-999" comment="identifier of detrend image 7"></column>
-    <column name="detrend8" type="TLONGLONG" default="-999" comment="identifier of detrend image 8"></column>
-    <column name="photoZero" type="TFLOAT" default="-999" comment="local derived photometric zero point"></column>
+    <column name="qaFlags" type="TLONG" default="-999" comment="Q/A flags for this OTA"></column>
+    <column name="detrend1" type="TSTRING" default=" " comment="identifier of detrend image 1"></column>
+    <column name="detrend2" type="TSTRING" default=" " comment="identifier of detrend image 2"></column>
+    <column name="detrend3" type="TSTRING" default=" " comment="identifier of detrend image 3"></column>
+    <column name="detrend4" type="TSTRING" default=" " comment="identifier of detrend image 4"></column>
+    <column name="detrend5" type="TSTRING" default=" " comment="identifier of detrend image 5"></column>
+    <column name="detrend6" type="TSTRING" default=" " comment="identifier of detrend image 6"></column>
+    <column name="detrend7" type="TSTRING" default=" " comment="identifier of detrend image 7"></column>
+    <column name="detrend8" type="TSTRING" default=" " comment="identifier of detrend image 8"></column>
+    <column name="photoZero" type="TFLOAT" default="-999" comment=" local derived photometric zero point (unit = mag)"></column>
     <column name="ctype1" type="TSTRING" default=" " comment="name of astrometric projection in RA"></column>
     <column name="ctype2" type="TSTRING" default=" " comment="name of astrometric projection in DEC"></column>
     <column name="crval1" type="TFLOAT" default="-999" comment=" RA corresponding to reference pixel (unit = deg)"></column>
     <column name="crval2" type="TFLOAT" default="-999" comment=" DEC corresponding to reference pixel (unit = deg)"></column>
-    <column name="crpix1" type="TFLOAT" default="-999" comment="reference pixel value for RA"></column>
-    <column name="crpix2" type="TFLOAT" default="-999" comment="reference pixel value for DEC"></column>
+    <column name="crpix1" type="TFLOAT" default="-999" comment=" reference pixel value for RA (unit = pix)"></column>
+    <column name="crpix2" type="TFLOAT" default="-999" comment=" reference pixel value for DEC (unit = pix)"></column>
     <column name="pc001001" type="TFLOAT" default="-999" comment="elements of rotation/Dcale matrix"></column>
     <column name="pc001002" type="TFLOAT" default="-999" comment="elements of rotation/Dcale matrix"></column>
@@ -131,13 +132,18 @@
     <column name="xPosErr" type="TFLOAT" default="-999" comment=" estimated error in x (unit = pix)"></column>
     <column name="yPosErr" type="TFLOAT" default="-999" comment=" estimated error in y (unit = pix)"></column>
-    <column name="instFlux" type="TFLOAT" default="-999" comment="PSF instrumental flux"></column>
-    <column name="instFluxErr" type="TFLOAT" default="-999" comment="estimated error in flux"></column>
-    <column name="peakFlux" type="TFLOAT" default="-999" comment="ratio of peak flux to total flux"></column>
-    <column name="psfWidMajor" type="TFLOAT" default="-999" comment="PSF width in major axis"></column>
-    <column name="psfWidMinor" type="TFLOAT" default="-999" comment="PSF width in minor axis"></column>
-    <column name="psfTheta" type="TFLOAT" default="-999" comment="PSF orientation angle"></column>
+    <column name="instFlux" type="TFLOAT" default="-999" comment=" PSF instrumental flux (unit = adu/s)"></column>
+    <column name="instFluxErr" type="TFLOAT" default="-999" comment=" estimated error in flux (unit = adu/s)"></column>
+    <column name="peakADU" type="TFLOAT" default="-999" comment=" peak count in source pixel (unit = adu)"></column>
+    <column name="psfWidMajor" type="TFLOAT" default="-999" comment=" model PSF width in major axis (unit = arcsec)"></column>
+    <column name="psfWidMinor" type="TFLOAT" default="-999" comment=" model PSF width in minor axis (unit = arcsec)"></column>
+    <column name="psfTheta" type="TFLOAT" default="-999" comment=" model PSF orientation angle (unit = deg)"></column>
     <column name="psfLikelihood" type="TFLOAT" default="-999" comment="PSF likelihood"></column>
     <column name="psfCf" type="TFLOAT" default="-999" comment="PSF coverage factor"></column>
-    <column name="infoFlag" type="TLONG" default="-999" comment="bitmask indicating provenance information"></column>
+    <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" PSF width in major axis from moments (unit = arcsec)"></column>
+    <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" PSF width in minot axis from moments (unit = arcsec)"></column>
+    <column name="momentTheta" type="TFLOAT" default="-999" comment=" PSF orientation angle from moments (unit = deg)"></column>
+    <column name="crLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is a cosmic ray"></column>
+    <column name="extendedLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is extended"></column>
+    <column name="infoFlag" type="TLONG" default="-999" comment="flag indicating provenance information"></column>
     <column name="sky" type="TFLOAT" default="-999" comment=" PSF sky level at source (unit = adu)"></column>
     <column name="skyErr" type="TFLOAT" default="-999" comment=" estimated error in sky (unit = adu)"></column>