Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure-ps1-v4.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure-ps1-v4.d	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure-ps1-v4.d	(revision 34871)
@@ -30,6 +30,6 @@
 FIELD Yccd,           Y_CCD,        float,          Y coord on chip,               pixels
 
-FIELD Xoff,           X_OFF,        float,          X correction in chip coords,   pixels
-FIELD Yoff,           Y_OFF,        float,          Y correction in chip coords,   pixels
+FIELD Xraw,           X_RAW,        float,          X coord before correction,     pixels
+FIELD Yraw,           Y_RAW,        float,          Y coord before correction,     pixels
 
 # could these be packed into fewer bits?
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure.d	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure.d	(revision 34871)
@@ -30,6 +30,6 @@
 FIELD Yccd,           Y_CCD,        float,          Y coord on chip,                pixels
 
-FIELD Xoff,           X_OFF,        float,          X correction in chip coords,   pixels
-FIELD Yoff,           Y_OFF,        float,          Y correction in chip coords,   pixels
+FIELD Xraw,           X_RAW,        float,          X coord before correction,     pixels
+FIELD Yraw,           Y_RAW,        float,          Y coord before correction,     pixels
 
 # could these be packed into fewer bits?
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/include/dvodb.h	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/include/dvodb.h	(revision 34871)
@@ -122,6 +122,6 @@
       MEAS_XCCD_ERR, 
       MEAS_YCCD_ERR, 
-      MEAS_XOFF, 
-      MEAS_YOFF, 
+      MEAS_XRAW, 
+      MEAS_YRAW, 
       MEAS_POS_SYS_ERR, 
       MEAS_XMOSAIC, 
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbExtractMeasures.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 34871)
@@ -443,9 +443,9 @@
 # endif
       break;
-    case MEAS_XOFF: /* OK */
-      value.Flt = measure[0].Xoff;
-      break;
-    case MEAS_YOFF: /* OK */
-      value.Flt = measure[0].Yoff;
+    case MEAS_XRAW: /* OK */
+      value.Flt = measure[0].Xraw;
+      break;
+    case MEAS_YRAW: /* OK */
+      value.Flt = measure[0].Yraw;
       break;
     case MEAS_XCCD_ERR: /* OK */
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbFields.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbFields.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dbFields.c	(revision 34871)
@@ -217,6 +217,6 @@
   if (!strcasecmp (fieldName, "XCCD:ERR"))   	 ESCAPE (MEAS_XCCD_ERR,       MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "YCCD:ERR"))   	 ESCAPE (MEAS_YCCD_ERR,       MAG_NONE, OPIHI_FLT);
-  if (!strcasecmp (fieldName, "XOFF"))       	 ESCAPE (MEAS_XOFF,           MAG_NONE, OPIHI_FLT);
-  if (!strcasecmp (fieldName, "YOFF"))       	 ESCAPE (MEAS_YOFF,           MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "XRAW"))       	 ESCAPE (MEAS_XRAW,           MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "YRAW"))       	 ESCAPE (MEAS_YRAW,           MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "POS_SYS_ERR"))    ESCAPE (MEAS_POS_SYS_ERR,    MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "XMOSAIC"))    	 ESCAPE (MEAS_XMOSAIC,        MAG_NONE, OPIHI_FLT);
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_catalog.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_catalog.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_catalog.c	(revision 34871)
@@ -161,6 +161,6 @@
  measure->Xccd      = NAN;
  measure->Yccd      = NAN;
- measure->Xoff      = 0.0;
- measure->Yoff      = 0.0;
+ measure->Xraw      = NAN;
+ measure->Yraw      = NAN;
 
  measure->Sky       = NAN;
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 34871)
@@ -31,6 +31,6 @@
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
-    out[i].Xoff       = in[i].Xoff;
-    out[i].Yoff       = in[i].Yoff;
+    out[i].Xraw       = in[i].Xraw;
+    out[i].Yraw       = in[i].Yraw;
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
@@ -94,4 +94,6 @@
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
+    out[i].Xraw       = in[i].Xraw;
+    out[i].Yraw       = in[i].Yraw;
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
Index: /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/Makefile
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/Makefile	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/Makefile	(revision 34871)
@@ -26,5 +26,5 @@
 setastrom_client: $(BIN)/setastrom_client.$(ARCH)
 
-install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client
+install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client $(DESTBIN)/setastrom $(DESTBIN)/setastrom_client
 
 UNIPHOT = \
Index: /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/astrom_correction.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/astrom_correction.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/astrom_correction.c	(revision 34871)
@@ -95,8 +95,8 @@
 
     int sub = -1;
-    if (extname[6] == '0') {
+    if (extname[9] == '0') {
       sub = 0;
     }
-    if (extname[6] == '1') {
+    if (extname[9] == '1') {
       sub = 1;
     }
@@ -130,4 +130,6 @@
   *dX = 0.0;
   *dY = 0.0;
+
+  // XXX need to include some limits on Minst?
 
   spline = splineset[sub][0][chip];
Index: /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/update_catalog_setastrom.c
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/update_catalog_setastrom.c	(revision 34870)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/update_catalog_setastrom.c	(revision 34871)
@@ -10,4 +10,6 @@
 
   time_t timeRef = ohana_date_to_sec("2011/05/11,00:00:00");
+
+  found = 0;
 
   for (i = 0; i < catalog[0].Nmeasure; i++) {