Index: trunk/ippToPsps/config/tables.IN.vot
===================================================================
--- trunk/ippToPsps/config/tables.IN.vot	(revision 39646)
+++ trunk/ippToPsps/config/tables.IN.vot	(revision 40101)
@@ -559,4 +559,5 @@
       <DESCRIPTION>Contains information flag values for images.</DESCRIPTION>
       <!-- branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvo.h / DVOImageFlags -->
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / DVOImageFlags -->
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="name" arraysize="100" datatype="char">
@@ -574,9 +575,16 @@
       <DATA>
         <TABLEDATA>
-          <TR><TD>NEW</TD>  <TD>0x00000000</TD><TD>0</TD><TD>No relphot / relastro attempted.</TD></TR>
-          <TR><TD>NOCAL</TD><TD>0x00000001</TD><TD>1</TD><TD>Used within relphot to mean 'don't apply fit'.</TD></TR>
-          <TR><TD>POOR</TD> <TD>0x00000002</TD><TD>2</TD><TD>Relphot says image is bad.</TD></TR>
-          <TR><TD>SKIP</TD> <TD>0x00000004</TD><TD>4</TD><TD>External information image is bad.</TD></TR>
-          <TR><TD>FEW</TD>  <TD>0x00000008</TD><TD>8</TD><TD>Currently too few measurements for good value.</TD></TR>
+	  <TR><TD>NEW</TD>           <TD>0x00000000</TD><TD>0</TD><TD>No relphot / relastro attempted.</TD></TR>
+	  <TR><TD>PHOTOM_NOCAL</TD>  <TD>0x00000001</TD><TD>1</TD><TD>Used within relphot to mean 'don't apply fit'. | user-set value used withing relphot: ignore (EAM!)</TD></TR>
+	  <TR><TD>PHOTOM_POOR</TD>   <TD>0x00000002</TD><TD>2</TD><TD>Relphot says image is bad (dMcal > limit). (EAM!)</TD></TR>
+	  <TR><TD>PHOTOM_SKIP</TD>   <TD>0x00000004</TD><TD>4</TD><TD>External information image has bad photometry (EAM).</TD></TR>
+	  <TR><TD>PHOTOM_FEW</TD>    <TD>0x00000008</TD><TD>8</TD><TD>Currently too few measurements for good value for photometry.</TD></TR>
+	  <TR><TD>ASTROM_NOCAL</TD>  <TD>0x00000010</TD><TD>16</TD><TD>User-set value used within relastro: ignore (EAM!).</TD></TR>
+	  <TR><TD>ASTROM_POOR</TD>   <TD>0x00000020</TD><TD>32</TD><TD>Relastro says image is bad (dR,dD > limit).</TD></TR>
+	  <TR><TD>ASTROM_FAIL</TD>   <TD>0x00000040</TD><TD>64</TD><TD>Relastro fit diverged, fit not applied.</TD></TR>
+	  <TR><TD>ASTROM_SKIP</TD>   <TD>0x00000080</TD><TD>128</TD><TD>External information image has bad astrometry. (EAM)</TD></TR>
+	  <TR><TD>ASTROM_FEW</TD>    <TD>0x00000100</TD><TD>256</TD><TD>Currently too few measurements for good value for astrometry.</TD></TR>
+	  <TR><TD>PHOTOM_UBERCAL</TD><TD>0x00000200</TD><TD>512</TD><TD>Externally-supplied photometry zero point from ubercal analysis.</TD></TR>
+	  <TR><TD>ASTROM_GMM</TD>    <TD>0x00000400</TD><TD>1024</TD><TD>Image was fitted to positions corrected by the galaxy motion model.</TD></TR>
         </TABLEDATA>
       </DATA>
@@ -586,4 +594,5 @@
       <DESCRIPTION>Contains information flag values for detections.</DESCRIPTION>
       <!-- branches/eam_branches/ipp-20150625/psModules/src/objects/pmSourceMasks.h / pmSourceMode -->
+      <!-- ~ippdvo ipp20170630/psModules/src/objects/pmSourceMasks.h / pmSourceMode -->
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="name" arraysize="100" datatype="char">
@@ -641,4 +650,5 @@
       <DESCRIPTION>Contains information flag values for detections.  References:  Petrosian, V. 1976, ApJL, 209, L1.</DESCRIPTION>
       <!-- branches/eam_branches/ipp-20150625/psModules/src/objects/pmSourceMasks.h / pmSourceMode2 -->
+      <!-- ~ippdvo ipp20170630/psModules/src/objects/pmSourceMasks.h / pmSourceMode2 -->
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="name" arraysize="100" datatype="char">
@@ -688,4 +698,5 @@
       <DESCRIPTION>Contains information flag values for detections.  References:  Kron, R. G. 1980, ApJS, 43, 305.</DESCRIPTION>
       <!-- branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvo.h / DVOMeasureFlags -->
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / DVOMeasureFlags -->
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="name" arraysize="100" datatype="char">
@@ -715,5 +726,5 @@
 	  <TR><TD>BLEND_OBJ</TD>             <TD>0x00000200</TD><TD>512        </TD><TD>Multiple detections within radius of object.</TD></TR>
 	  <TR><TD>WARP_USED</TD>             <TD>0x00000400</TD><TD>1024       </TD><TD>Measurement used to find mean warp photometry.</TD></TR>
-	  <TR><TD>ID_MEAS_UNMASKED_ASTRO</TD><TD>0x00000800</TD><TD>2048       </TD><TD>Detection was unmasked in update chips to determine astrometry parameter errors.</TD></TR>
+	  <TR><TD>UNMASKED_ASTRO</TD><TD>0x00000800</TD><TD>2048       </TD><TD>Detection was unmasked in update chips to determine astrometry parameter errors.</TD></TR>
 	  <TR><TD>BLEND_MEAS_X</TD>          <TD>0x00001000</TD><TD>4096       </TD><TD>Detection is within radius of multiple objects across catalogs.</TD></TR>               
 	  <TR><TD>ARTIFACT</TD>              <TD>0x00002000</TD><TD>8192       </TD><TD>Detection is thought to be non-astronomical.</TD></TR>        
@@ -730,4 +741,7 @@
 	  <TR><TD>MASKED_APER</TD>           <TD>0x02000000</TD><TD>33554432   </TD><TD>This measurement is masked based on IRLS weights for the mean aperture magnitude.</TD></TR>
 	  <TR><TD>MASKED_KRON</TD>           <TD>0x04000000</TD><TD>67108864   </TD><TD>This measurement is masked based on IRLS weights for the mean Kron (1980) magnitude.</TD></TR>
+	  <TR><TD>OBJECT_HAS_2MASS</TD>      <TD>0x10000000</TD><TD>268435456  </TD><TD>This measurement comes from an object with 2MASS data.</TD></TR>
+	  <TR><TD>OBJECT_HAS_GAIA</TD>       <TD>0x20000000</TD><TD>536870912  </TD><TD>This measurement comes from an object with Gaia data.</TD></TR>
+	  <TR><TD>OBJECT_HAS_TYCHO</TD>      <TD>0x40000000</TD><TD>1073741824 </TD><TD>This measurement comes from an object with Tycho data.</TD></TR>
         </TABLEDATA>
       </DATA>
@@ -737,4 +751,5 @@
       <DESCRIPTION>Contains information flag values for objects.</DESCRIPTION>
       <!-- branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvo.h / DVOAverageFlags -->
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / DVOAverageFlags -->
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="name" arraysize="100" datatype="char">
@@ -790,4 +805,5 @@
      <TABLE name="ObjectFilterFlags">
       <!-- branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvo.h / DVOSecFiltFlags -->
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / DVOSecFiltFlags -->
       <DESCRIPTION>Contains information flags for the photometric calibration of an object.</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
@@ -823,4 +839,10 @@
 	  <TR><TD>SECF_RANK_4</TD>       <TD>0x00001000</TD><TD>4096           </TD><TD>Average magnitude uses only rank 4 detections.</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 (EAM??).</TD></TR>
+	  <TR><TD>SECF_HAS_HSC</TD>      <TD>0x00200000</TD><TD>2097152        </TD><TD>This photcode has HSC  photometry (EAM??).</TD></TR>
+	  <TR><TD>SECF_HAS_CFH</TD>      <TD>0x00400000</TD><TD>4194304        </TD><TD>This photcode has CFH  photometry (mostly Megacam) (EAM??).</TD></TR>
+	  <TR><TD>SECF_HAS_DES</TD>      <TD>0x00800000</TD><TD>8388608        </TD><TD>This photcode has DES  photometry (EAM??).</TD></TR>
 	  <TR><TD>SECF_OBJ_EXT</TD>      <TD>0x01000000</TD><TD>16777216       </TD><TD>Extended in this band.</TD></TR>
         </TABLEDATA>
@@ -829,4 +851,5 @@
 
      <TABLE name="ObjectQualityFlags">
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / Subset of DVOAverageFlags -->
       <DESCRIPTION>Contains information flag values that denote if an object is real or a possible false positive.  </DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
@@ -853,5 +876,5 @@
 	  <TR><TD>QF_OBJ_BEST_STACK</TD>   <TD>0x00000020</TD><TD>32      </TD><TD>the primary stack measurements are the best measurements.</TD></TR>
 	  <TR><TD>QF_OBJ_SUSPECT_STACK</TD><TD>0x00000040</TD><TD>64      </TD><TD>suspect object in the stack (no more than 1 good measurement, 2 or more suspect or good stack measurement).</TD></TR>
-	  <TR><TD>QF_OBJ_BAD_STACK</TD>    <TD>0x00000080</TD><TD>64      </TD><TD>poor-quality stack object (no more than 1 good or suspect measurement).</TD></TR>
+	  <TR><TD>QF_OBJ_BAD_STACK</TD>    <TD>0x00000080</TD><TD>128      </TD><TD>poor-quality stack object (no more than 1 good or suspect measurement).</TD></TR>
 	</TABLEDATA>
       </DATA>
@@ -859,4 +882,5 @@
 
      <TABLE name="ForcedGalaxyShapeFlags">
+      <!-- ~ippdvo/src/ipptrunk.20170630/Ohana/src/libdvo/include/dvo.h / DVOGalPhotFlags -->
       <DESCRIPTION>Contains information flag values that define ForcedGalaxyShape chisq surface fit failures.</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>