Index: trunk/Ohana/src/addstar/src/FilterStars.c
===================================================================
--- trunk/Ohana/src/addstar/src/FilterStars.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/FilterStars.c	(revision 15038)
@@ -43,4 +43,5 @@
     stars[N].Mcal    = image[0].Mcal;
     stars[N].t       = image[0].tzero + 1e-4*stars[N].Y*image[0].trate;  /* trate is in 0.1 msec / row */
+    stars[N].dt      = MTIME;
 
     stars[N].M       = MIN (stars[N].M + MTIME, NO_MAG);
Index: trunk/Ohana/src/addstar/src/ImageOptions.c
===================================================================
--- trunk/Ohana/src/addstar/src/ImageOptions.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/ImageOptions.c	(revision 15038)
@@ -36,4 +36,6 @@
   }
   options[0].photcode = equivPhotcode;
+
+  options[0].imageID = 0;
   return (TRUE);
 }
Index: trunk/Ohana/src/addstar/src/ReadStarsFITS.c
===================================================================
--- trunk/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 15038)
@@ -176,5 +176,9 @@
     stars[i].extNsigma = ps1data[i].extNsigma;
 
-    stars[i].detID   = ps1data[i].detID;
+    stars[i].detID     = ps1data[i].detID;
+    stars[i].flags     = ps1data[i].flags;
+
+    // XXX not defined anyway
+    // stars[i].stargal   = ps1data[i].stargal;
 
     /* these are set elsewhere */
@@ -196,4 +200,5 @@
     stars[i].dt      = 0;
     stars[i].airmass = 0;
+    stars[i].az      = 0;
     stars[i].code    = 0;
     stars[i].found   = 0;
Index: trunk/Ohana/src/addstar/src/SEDfit.c
===================================================================
--- trunk/Ohana/src/addstar/src/SEDfit.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/SEDfit.c	(revision 15038)
@@ -186,9 +186,9 @@
       outcat[0].measure[Nmeas].dM       = 0.0;
       outcat[0].measure[Nmeas].Mcal     = 0;
-      outcat[0].measure[Nmeas].t           = TIMEREF;
-      outcat[0].measure[Nmeas].averef      = Nave;
-      outcat[0].measure[Nmeas].photcode      = table[0].code[n];
-      outcat[0].measure[Nmeas].dophot      = 0;
-      outcat[0].measure[Nmeas].flags       = 0;
+      outcat[0].measure[Nmeas].t        = TIMEREF;
+      outcat[0].measure[Nmeas].averef   = Nave;
+      outcat[0].measure[Nmeas].photcode = table[0].code[n];
+      outcat[0].measure[Nmeas].dophot   = 0;
+      outcat[0].measure[Nmeas].dbFlags  = 0;
       outcat[0].measure[Nmeas].dt       = 0xffff;
 
Index: trunk/Ohana/src/addstar/src/find_matches.c
===================================================================
--- trunk/Ohana/src/addstar/src/find_matches.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/find_matches.c	(revision 15038)
@@ -163,6 +163,4 @@
       catalog[0].measure[Nmeas].dD       = 3600.0*(catalog[0].average[n].D - stars[N].D);
 
-      /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
-      /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
       catalog[0].measure[Nmeas].Xccd     = stars[N].X;
       catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
@@ -175,7 +173,23 @@
       catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
       catalog[0].measure[Nmeas].dophot   = stars[N].dophot;  
-      catalog[0].measure[Nmeas].flags    = 0;
+      catalog[0].measure[Nmeas].dbFlags  = 0;
       catalog[0].measure[Nmeas].dt       = stars[N].dt;
       catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+      catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+      catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+      catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+      catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+      catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+      catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+      catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+      catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
+
+      catalog[0].measure[Nmeas].detID     = stars[N].detID;
+      catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+      catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+      catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
       catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
@@ -201,9 +215,9 @@
       /* this image star matches more than one catalog star */
       if (stars[N].found > -1) {
-	catalog[0].measure[stars[N].found].flags |= BLEND_IMAGE;
-	catalog[0].measure[Nmeas].flags |= BLEND_IMAGE;
+	catalog[0].measure[stars[N].found].dbFlags |= BLEND_IMAGE;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE;
       } 
       if (stars[N].found == -2) { /* this image star matches a catalog star on a neighboring catalog */
-	catalog[0].measure[Nmeas].flags |= BLEND_IMAGE_NEIGHBOR;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE_NEIGHBOR;
       } 
       if (stars[N].found == -1) { /* this image star matches only this catalog star */
@@ -212,6 +226,6 @@
       /* this catalog star matches more than one image star */
       if (catalog[0].found[n] > -1) {
-	catalog[0].measure[catalog[0].found[n]].flags |= BLEND_CATALOG;
-	catalog[0].measure[Nmeas].flags |= BLEND_CATALOG;
+	catalog[0].measure[catalog[0].found[n]].dbFlags |= BLEND_CATALOG;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_CATALOG;
       } else {
 	catalog[0].found[n] = Nmeas;
@@ -273,6 +287,4 @@
     }
 
-    /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
-    /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
     catalog[0].measure[Nmeas].Xccd     = stars[N].X;
     catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
@@ -287,7 +299,23 @@
     catalog[0].measure[Nmeas].photcode  = stars[N].code;  /* photcode */
     catalog[0].measure[Nmeas].dophot   	= stars[N].dophot;  
-    catalog[0].measure[Nmeas].flags    	= 0;
+    catalog[0].measure[Nmeas].dbFlags 	= 0;
     catalog[0].measure[Nmeas].dt    	= stars[N].dt;
     catalog[0].measure[Nmeas].airmass   = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+    catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
+
+    catalog[0].measure[Nmeas].detID     = stars[N].detID;
+    catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
     catalog[0].measure[Nmeas].Mgal  	= stars[N].Mgal;
Index: trunk/Ohana/src/addstar/src/find_matches_closest.c
===================================================================
--- trunk/Ohana/src/addstar/src/find_matches_closest.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/find_matches_closest.c	(revision 15038)
@@ -193,7 +193,23 @@
     catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
     catalog[0].measure[Nmeas].dophot   = stars[N].dophot;  
-    catalog[0].measure[Nmeas].flags    = 0;
+    catalog[0].measure[Nmeas].dbFlags  = 0;
     catalog[0].measure[Nmeas].dt       = stars[N].dt;
     catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+    catalog[0].measure[Nmeas].stargal   = 0;
+
+    catalog[0].measure[Nmeas].detID     = stars[N].detID;
+    catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
     catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
@@ -270,6 +286,4 @@
     }
 
-    /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
-    /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
     catalog[0].measure[Nmeas].Xccd     = stars[N].X;
     catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
@@ -284,7 +298,23 @@
     catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
     catalog[0].measure[Nmeas].dophot   = stars[N].dophot;  
-    catalog[0].measure[Nmeas].flags    = 0;
+    catalog[0].measure[Nmeas].dbFlags  = 0;
     catalog[0].measure[Nmeas].dt       = stars[N].dt;
     catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
+
+    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
+    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
+    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
+    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
+    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
+    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
+    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
+
+    catalog[0].measure[Nmeas].stargal   = 0;
+
+    catalog[0].measure[Nmeas].detID     = stars[N].detID;
+    catalog[0].measure[Nmeas].imageID   = options.imageID;
+
+    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
+    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
 
     catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
Index: trunk/Ohana/src/addstar/src/find_matches_refstars.c
===================================================================
--- trunk/Ohana/src/addstar/src/find_matches_refstars.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/find_matches_refstars.c	(revision 15038)
@@ -140,5 +140,5 @@
       catalog[0].measure[Nmeas].photcode = stars[N][0].code;
       catalog[0].measure[Nmeas].dophot   = 0;
-      catalog[0].measure[Nmeas].flags    = 0;
+      catalog[0].measure[Nmeas].dbFlags  = 0;
       catalog[0].measure[Nmeas].dt       = 0xffff;
 
@@ -149,6 +149,20 @@
       catalog[0].measure[Nmeas].theta    = NO_MAG;
 	
-      /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
-      /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
+      catalog[0].measure[Nmeas].photFlags = 0;
+      catalog[0].measure[Nmeas].qPSF      = 0;
+      catalog[0].measure[Nmeas].psfProb   = 0;
+      catalog[0].measure[Nmeas].crNsigma  = 0;
+      catalog[0].measure[Nmeas].extNsigma = 0;
+      catalog[0].measure[Nmeas].Sky       = 0;
+      catalog[0].measure[Nmeas].dSky      = 0;
+
+      catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
+
+      catalog[0].measure[Nmeas].detID     = 0;
+      catalog[0].measure[Nmeas].imageID   = 0;
+
+      catalog[0].measure[Nmeas].dXccd     = 0;
+      catalog[0].measure[Nmeas].dYccd     = 0;
+
       catalog[0].measure[Nmeas].Xccd     = 0.0;
       catalog[0].measure[Nmeas].Yccd     = 0.0;
@@ -168,9 +182,9 @@
       /* this image star matches more than one catalog star */
       if (stars[N][0].found > -1) {
-	catalog[0].measure[stars[N][0].found].flags |= BLEND_IMAGE;
-	catalog[0].measure[Nmeas].flags |= BLEND_IMAGE;
+	catalog[0].measure[stars[N][0].found].dbFlags |= BLEND_IMAGE;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE;
       } 
       if (stars[N][0].found == -2) { /* this image star matches a catalog star on a neighboring catalog */
-	catalog[0].measure[Nmeas].flags |= BLEND_IMAGE_NEIGHBOR;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE_NEIGHBOR;
       } 
       if (stars[N][0].found == -1) { /* this image star matches only this catalog star */
@@ -179,6 +193,6 @@
       /* this catalog star matches more than one image star */
       if (catalog[0].found[n] > -1) {
-	catalog[0].measure[catalog[0].found[n]].flags |= BLEND_CATALOG;
-	catalog[0].measure[Nmeas].flags |= BLEND_CATALOG;
+	catalog[0].measure[catalog[0].found[n]].dbFlags |= BLEND_CATALOG;
+	catalog[0].measure[Nmeas].dbFlags |= BLEND_CATALOG;
       } else {
 	catalog[0].found[n] = Nmeas;
@@ -254,6 +268,25 @@
     catalog[0].measure[Nmeas].photcode = stars[N][0].code;
     catalog[0].measure[Nmeas].dophot   = 0;
-    catalog[0].measure[Nmeas].flags    = 0;
+    catalog[0].measure[Nmeas].dbFlags  = 0;
     catalog[0].measure[Nmeas].dt       = 0xffff;
+
+    catalog[0].measure[Nmeas].photFlags = 0;
+    catalog[0].measure[Nmeas].qPSF      = 0;
+    catalog[0].measure[Nmeas].psfProb   = 0;
+    catalog[0].measure[Nmeas].crNsigma  = 0;
+    catalog[0].measure[Nmeas].extNsigma = 0;
+    catalog[0].measure[Nmeas].Sky       = 0;
+    catalog[0].measure[Nmeas].dSky      = 0;
+
+    catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
+
+    catalog[0].measure[Nmeas].detID     = 0;
+    catalog[0].measure[Nmeas].imageID   = 0;
+
+    catalog[0].measure[Nmeas].dXccd     = 0;
+    catalog[0].measure[Nmeas].dYccd     = 0;
+
+    catalog[0].measure[Nmeas].Xccd     = 0.0;
+    catalog[0].measure[Nmeas].Yccd     = 0.0;
 
     catalog[0].measure[Nmeas].airmass  = 0;
@@ -263,6 +296,4 @@
     catalog[0].measure[Nmeas].theta    = NO_MAG;
 
-    /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
-    /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
     catalog[0].measure[Nmeas].Xccd     = 0.0;
     catalog[0].measure[Nmeas].Yccd     = 0.0;
Index: trunk/Ohana/src/addstar/src/load2mass_catalog.c
===================================================================
--- trunk/Ohana/src/addstar/src/load2mass_catalog.c	(revision 15036)
+++ trunk/Ohana/src/addstar/src/load2mass_catalog.c	(revision 15038)
@@ -52,9 +52,9 @@
       catalog[0].measure[Nmeas].dM       = MIN (stars[i+j].dM,  NO_ERR);
       catalog[0].measure[Nmeas].Mcal     = 0;
-      catalog[0].measure[Nmeas].t           = stars[i+j].t;
-      catalog[0].measure[Nmeas].averef      = Nave;
-      catalog[0].measure[Nmeas].photcode      = stars[i+j].code;
-      catalog[0].measure[Nmeas].dophot      = 0;
-      catalog[0].measure[Nmeas].flags       = 0;
+      catalog[0].measure[Nmeas].t        = stars[i+j].t;
+      catalog[0].measure[Nmeas].averef   = Nave;
+      catalog[0].measure[Nmeas].photcode = stars[i+j].code;
+      catalog[0].measure[Nmeas].dophot   = 0;
+      catalog[0].measure[Nmeas].dbFlags  = 0;
       catalog[0].measure[Nmeas].dt       = 0xffff;