Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-elixir.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-elixir.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-elixir.d	(revision 30516)
@@ -44,6 +44,6 @@
 FIELD 	  dummy,            DUMMY,                char[20],       unused
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-loneos.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-loneos.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-loneos.d	(revision 30516)
@@ -44,6 +44,6 @@
 FIELD 	  dummy,            DUMMY,                char[20],       unused
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-0.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-0.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-0.d	(revision 30516)
@@ -53,6 +53,6 @@
 
 FIELD 	  dummy,            DUMMY,                char[10],       unused
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-1.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-1.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-1.d	(revision 30516)
@@ -53,6 +53,6 @@
 
 FIELD 	  dummy,            DUMMY,                char[10],       unused
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-1.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-1.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-1.d	(revision 30516)
@@ -53,6 +53,6 @@
 
 # 40 bytes
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-2.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-2.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-2.d	(revision 30516)
@@ -53,6 +53,6 @@
 # 48 bytes 
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-3.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-3.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-3.d	(revision 30516)
@@ -54,6 +54,6 @@
 # 48 bytes 
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-ref.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-ref.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-ref.d	(revision 30516)
@@ -56,6 +56,6 @@
 
 # 40 bytes
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v1.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v1.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v1.d	(revision 30516)
@@ -55,6 +55,6 @@
 # 48 bytes 
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v2.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v2.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v2.d	(revision 30516)
@@ -60,6 +60,6 @@
 # 48 bytes 
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image.d
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image.d	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image.d	(revision 30516)
@@ -61,6 +61,6 @@
 # 48 bytes 
 
-FIELD 	  dummy1,           DUMMY1,               short,      	  place holder for byte boundaries
-FIELD 	  dummy2,           DUMMY2,               short,      	  place holder for byte boundaries
+FIELD 	  nLinkAstrom,      NLINK_ASTROM,         short,      	  mean number of matched measurements for astrometry
+FIELD 	  nLinkPhotom,      NLINK_PHOTOM,         short,      	  mean number of matched measurements for astrometry
 FIELD 	  dummy3,           DUMMY3,               short,      	  place holder for byte boundaries
 
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 30516)
@@ -266,6 +266,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -333,6 +333,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 30516)
@@ -262,6 +262,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -327,6 +327,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c	(revision 30516)
@@ -46,6 +46,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -105,6 +105,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 30516)
@@ -221,6 +221,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -283,6 +283,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 30516)
@@ -270,6 +270,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -334,6 +334,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 30516)
@@ -279,6 +279,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -341,6 +341,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_elixir.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 30516)
@@ -269,6 +269,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -339,6 +339,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_loneos.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 30516)
@@ -262,6 +262,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -332,6 +332,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 30516)
@@ -276,6 +276,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -345,6 +345,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 30516)
@@ -276,6 +276,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
@@ -345,6 +345,6 @@
     // with the following.  (no real databases used those values -- see
     // libdvo/doc/dvo-images.txt)
-    out[i].dummy1	    = in[i].dummy1;
-    out[i].dummy2	    = in[i].dummy2;
+    out[i].nLinkAstrom	    = in[i].nLinkAstrom;
+    out[i].nLinkPhotom	    = in[i].nLinkPhotom;
     out[i].dummy3	    = in[i].dummy3;
     out[i].dXpixSys	    = in[i].dXpixSys;
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractImages.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractImages.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractImages.c	(revision 30516)
@@ -316,4 +316,10 @@
       value.Int = image[N].nFitAstrom;
       break;
+    case IMAGE_NLINK_PHOTOM:
+      value.Int = image[N].nLinkPhotom;
+      break;
+    case IMAGE_NLINK_ASTROM:
+      value.Int = image[N].nLinkAstrom;
+      break;
   }
   return (value);
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbFields.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbFields.c	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbFields.c	(revision 30516)
@@ -433,4 +433,6 @@
   if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM,MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM,MAG_NONE, OPIHI_INT);
+  if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM,MAG_NONE, OPIHI_INT);
+  if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM,MAG_NONE, OPIHI_INT);
 
   // for words that don't parse, try a photcode
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/include/dvoshell.h
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/include/dvoshell.h	(revision 30515)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/include/dvoshell.h	(revision 30516)
@@ -224,5 +224,7 @@
       IMAGE_MAG_ERR_SYS,
       IMAGE_NFIT_PHOTOM,
-      IMAGE_NFIT_ASTROM
+      IMAGE_NFIT_ASTROM,
+      IMAGE_NLINK_PHOTOM,
+      IMAGE_NLINK_ASTROM
 };