Index: trunk/ippToPsps/config/test/map.xml
===================================================================
--- trunk/ippToPsps/config/test/map.xml	(revision 28662)
+++ trunk/ippToPsps/config/test/map.xml	(revision 28759)
@@ -3,96 +3,7 @@
 <tabledata>
 
- <table name="FrameMeta">
-  <map ippName="ZPT_ERR" ippType="TFLOAT" pspsName="photoScat" />
-  <map ippName="MJD-OBS" ippType="TFLOAT" pspsName="expStart" />
-  <map ippName="EXPREQ" ippType="TFLOAT" pspsName="expTime" />
-  <map ippName="AIRMASS" ippType="TFLOAT" pspsName="airmass" />
-  <map ippName="RA" ippType="TDOUBLE" pspsName="raBore" />
-  <map ippName="DEC" ippType="TDOUBLE" pspsName="decBore" />
-  <map ippName="CTYPE1" ippType="TSTRING" pspsName="ctype1" />
-  <map ippName="CTYPE2" ippType="TSTRING" pspsName="ctype2" />
-  <map ippName="CRVAL1" ippType="TDOUBLE" pspsName="crval1" />
-  <map ippName="CRVAL2" ippType="TDOUBLE" pspsName="crval2" />
-  <map ippName="CRPIX1" ippType="TDOUBLE" pspsName="crpix1" />
-  <map ippName="CRPIX2" ippType="TDOUBLE" pspsName="crpix2" />
-  <map ippName="CDELT1" ippType="TDOUBLE" pspsName="cdelt1" />
-  <map ippName="CDELT2" ippType="TDOUBLE" pspsName="cdelt2" />
-  <map ippName="PC001001" ippType="TDOUBLE" pspsName="pc001001" />
-  <map ippName="PC001002" ippType="TDOUBLE" pspsName="pc001002" />
-  <map ippName="PC002001" ippType="TDOUBLE" pspsName="pc002001" />
-  <map ippName="PC002002" ippType="TDOUBLE" pspsName="pc002002" />
-  <map ippName="NPLYTERM" ippType="TBYTE" pspsName="polyOrder" />
-  <map ippName="PCA1X3Y0" ippType="TDOUBLE" pspsName="pca1x3y0" />
-  <map ippName="PCA1X2Y1" ippType="TDOUBLE" pspsName="pca1x2y1" />
-  <map ippName="PCA1X1Y2" ippType="TDOUBLE" pspsName="pca1x1y2" />
-  <map ippName="PCA1X0Y3" ippType="TDOUBLE" pspsName="pca1x0y3" />
-  <map ippName="PCA1X2Y0" ippType="TDOUBLE" pspsName="pca1x2y0" />
-  <map ippName="PCA1X1Y1" ippType="TDOUBLE" pspsName="pca1x1y1" />
-  <map ippName="PCA1X0Y2" ippType="TDOUBLE" pspsName="pca1x0y2" />
-  <map ippName="PCA2X3Y0" ippType="TDOUBLE" pspsName="pca2x3y0" />
-  <map ippName="PCA2X2Y1" ippType="TDOUBLE" pspsName="pca2x2y1" />
-  <map ippName="PCA2X1Y2" ippType="TDOUBLE" pspsName="pca2x1y2" />
-  <map ippName="PCA2X0Y3" ippType="TDOUBLE" pspsName="pca2x0y3" />
-  <map ippName="PCA2X2Y0" ippType="TDOUBLE" pspsName="pca2x2y0" />
-  <map ippName="PCA2X1Y1" ippType="TDOUBLE" pspsName="pca2x1y1" />
-  <map ippName="PCA2X0Y2" ippType="TDOUBLE" pspsName="pca2x0y2" />
- </table>
-
- <table name="ImageMeta">
-  <map ippName="MSKY_MN" ippType="TFLOAT" pspsName="sky" />
-  <map ippName="MSKY_SIG" ippType="TFLOAT" pspsName="skyScat" />
-  <map ippName="FSATUR" ippType="TFLOAT" pspsName="magSat" />
-  <map ippName="FLIMIT" ippType="TFLOAT" pspsName="completMag" />
-  <map ippName="CERROR" ippType="TFLOAT" pspsName="astroScat" />
-  <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="ANGLE" ippType="TFLOAT" pspsName="psfTheta" />
-  <map ippName="APMIFIT" ippType="TFLOAT" pspsName="apResid" />
-  <map ippName="DAPMIFIT" ippType="TFLOAT" pspsName="dapResid" />
-  <map ippName="CTYPE1" ippType="TSTRING" pspsName="ctype1" />
-  <map ippName="CTYPE2" ippType="TSTRING" pspsName="ctype2" />
-  <map ippName="CRVAL1" ippType="TDOUBLE" pspsName="crval1" />
-  <map ippName="CRVAL2" ippType="TDOUBLE" pspsName="crval2" />
-  <map ippName="CRPIX1" ippType="TDOUBLE" pspsName="crpix1" />
-  <map ippName="CRPIX2" ippType="TDOUBLE" pspsName="crpix2" />
-  <map ippName="CDELT1" ippType="TDOUBLE" pspsName="cdelt1" />
-  <map ippName="CDELT2" ippType="TDOUBLE" pspsName="cdelt2" />
-  <map ippName="PC001001" ippType="TDOUBLE" pspsName="pc001001" />
-  <map ippName="PC001002" ippType="TDOUBLE" pspsName="pc001002" />
-  <map ippName="PC002001" ippType="TDOUBLE" pspsName="pc002001" />
-  <map ippName="PC002002" ippType="TDOUBLE" pspsName="pc002002" />
-  <map ippName="NPLYTERM" ippType="TBYTE" pspsName="polyOrder" />
-  <map ippName="PCA1X3Y0" ippType="TDOUBLE" pspsName="pca1x3y0" />
-  <map ippName="PCA1X2Y1" ippType="TDOUBLE" pspsName="pca1x2y1" />
-  <map ippName="PCA1X1Y2" ippType="TDOUBLE" pspsName="pca1x1y2" />
-  <map ippName="PCA1X0Y3" ippType="TDOUBLE" pspsName="pca1x0y3" />
-  <map ippName="PCA1X2Y0" ippType="TDOUBLE" pspsName="pca1x2y0" />
-  <map ippName="PCA1X1Y1" ippType="TDOUBLE" pspsName="pca1x1y1" />
-  <map ippName="PCA1X0Y2" ippType="TDOUBLE" pspsName="pca1x0y2" />
-  <map ippName="PCA2X3Y0" ippType="TDOUBLE" pspsName="pca2x3y0" />
-  <map ippName="PCA2X2Y1" ippType="TDOUBLE" pspsName="pca2x2y1" />
-  <map ippName="PCA2X1Y2" ippType="TDOUBLE" pspsName="pca2x1y2" />
-  <map ippName="PCA2X0Y3" ippType="TDOUBLE" pspsName="pca2x0y3" />
-  <map ippName="PCA2X2Y0" ippType="TDOUBLE" pspsName="pca2x2y0" />
-  <map ippName="PCA2X1Y1" ippType="TDOUBLE" pspsName="pca2x1y1" />
-  <map ippName="PCA2X0Y2" ippType="TDOUBLE" pspsName="pca2x0y2" />
- </table>
-
  <table name="Detection">
-  <map ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
-  <map ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
-  <map ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
-  <map ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
-  <map ippName="RA_PSF" ippType="TFLOAT" pspsName="ippRa" />
-  <map ippName="DEC_PSF" ippType="TFLOAT" pspsName="ippDec" />
-  <map ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
-  <map ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
-  <map ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
-  <map ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
-  <map ippName="SKY" ippType="TFLOAT" pspsName="sky" />
-  <map ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
+  <map ippName="RA_PSF" ippType="TFLOAT" pspsName="ra" />
+  <map ippName="DEC_PSF" ippType="TFLOAT" pspsName="dec" />
  </table>
 
Index: trunk/ippToPsps/config/test/tables.xml
===================================================================
--- trunk/ippToPsps/config/test/tables.xml	(revision 28662)
+++ trunk/ippToPsps/config/test/tables.xml	(revision 28759)
@@ -2,92 +2,4 @@
 
 <tableDescriptions type="det">
-  <table name="FrameMeta">
-    <column name="frameID" type="TLONG" default="0" comment="unique exposure/frame identifier."></column>
-    <column name="filterID" type="TBYTE" default="0" comment="filter identifier"></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="expStart" type="TDOUBLE" default="-999" comment=" exposure start time in MJD (unit = day)"></column>
-    <column name="expTime" type="TFLOAT" default="-999" comment=" exposure time (unit = s)"></column>
-    <column name="airmass" type="TFLOAT" default="-999" comment="airmass at mid-exposure"></column>
-    <column name="raBore" type="TDOUBLE" default="-999" comment=" RA of telescope boresight (unit = deg)"></column>
-    <column name="decBore" type="TDOUBLE" default="-999" comment=" DEC of telescope boresight (unit = deg)"></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="TDOUBLE" default="-999" comment=" RA corresponding to reference pixel (unit = deg)"></column>
-    <column name="crval2" type="TDOUBLE" default="-999" comment=" DEC corresponding to reference pixel (unit = deg)"></column>
-    <column name="crpix1" type="TDOUBLE" default="-999" comment="reference pixel value for RA"></column>
-    <column name="crpix2" type="TDOUBLE" default="-999" comment="reference pixel value for DEC"></column>
-    <column name="cdelt1" type="TDOUBLE" default="-999" comment=""></column>
-    <column name="cdelt2" type="TDOUBLE" default="-999" comment=""></column>
-    <column name="pc001001" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc001002" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc002001" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc002002" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="polyOrder" type="TBYTE" default="255" comment="polynomial order of astrometry fit"></column>
-    <column name="pca1x3y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x2y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x1y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x0y3" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x2y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x1y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x0y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x3y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x2y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x1y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x0y3" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x2y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x1y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x0y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-  </table>
-  <table name="ImageMeta">
-    <column name="photoCalID" type="TLONG" default="0" comment="photometry reduction code identifier"></column>
-    <column name="filterID" type="TBYTE" default="0" comment="filter ID"></column>
-    <column name="sky" type="TFLOAT" default="-999" comment=" mean sky level (unit = ADU)"></column>
-    <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 (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="numAstroRef" type="TLONG" default="-999" comment="number of astrometric 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="psfModelID" type="TLONG" default="-999" comment="PSF model identifier"></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="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="photoZero" type="TFLOAT" default="-999" comment=" local derived photometric zero point (unit = mag)"></column>
-    <column name="qaFlags" type="TLONGLONG" default="-999" comment="Q/A flags for this OTA"></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="TDOUBLE" default="-999" comment=" RA corresponding to reference pixel (unit = deg)"></column>
-    <column name="crval2" type="TDOUBLE" default="-999" comment=" DEC corresponding to reference pixel (unit = deg)"></column>
-    <column name="crpix1" type="TDOUBLE" default="-999" comment=" reference pixel value for RA (unit = pix)"></column>
-    <column name="crpix2" type="TDOUBLE" default="-999" comment=" reference pixel value for DEC (unit = pix)"></column>
-    <column name="cdelt1" type="TDOUBLE" default="-999" comment=""></column>
-    <column name="cdelt2" type="TDOUBLE" default="-999" comment=""></column>
-    <column name="pc001001" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc001002" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc002001" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="pc002002" type="TDOUBLE" default="-999" comment="elements of rotation/Dcale matrix"></column>
-    <column name="polyOrder" type="TBYTE" default="255" comment="polynomial order of astrometry fit"></column>
-    <column name="pca1x3y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x2y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x1y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x0y3" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x2y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x1y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca1x0y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x3y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x2y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x1y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x0y3" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x2y0" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x1y1" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-    <column name="pca2x0y2" type="TDOUBLE" default="-999" comment="polynomial coefficients for the astrometric fit"></column>
-  </table>
   <table name="Detection">
     <column name="objID" type="TLONGLONG" default="0" comment="ODM object identifier"></column>
@@ -96,20 +8,9 @@
     <column name="ippDetectID" type="TLONGLONG" default="0" comment="detection id generated by IPP"></column>
     <column name="filterID" type="TBYTE" default="0" comment="filter ID: g=1, r=2, i=3, z=4, y=5, w=6, ..."></column>
-    <column name="xPos" type="TFLOAT" default="-999" comment=" measured x on CCD from PSF fit (unit = pix)"></column>
-    <column name="yPos" type="TFLOAT" default="-999" comment=" measured y on CCD from PSF fit (unit = pix)"></column>
-    <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="ippRa" type="TFLOAT" default="-999" comment="RA"></column>
-    <column name="ippDec" type="TFLOAT" default="-999" comment="dec"></column>
+    <column name="imageID" type="TLONGLONG" default="0" comment="unique ID for each image, hashed from frameID and ccdID (ALEX)"></column>
+    <column name="ra" type="TFLOAT" default="-999" comment="RA"></column>
+    <column name="dec" type="TFLOAT" default="-999" comment="dec"></column>
+    <column name="infoFlag" type="TLONGLONG" default="-999" comment="flag indicating provenance information"></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="psfCf" type="TFLOAT" default="-999" comment="PSF coverage factor"></column>
-    <column name="infoFlag" type="TLONGLONG" 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>
   </table>
 </tableDescriptions>