Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 17025)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 17036)
@@ -443,6 +443,13 @@
     return PM_FPA_FILE_HEADER;
   }
+  // deprecate this?
   if (!strcasecmp (type, "ASTROM"))     {
-    return PM_FPA_FILE_ASTROM;
+    return PM_FPA_FILE_ASTROM_MODEL;
+  }
+  if (!strcasecmp (type, "ASTROM.MODEL"))     {
+    return PM_FPA_FILE_ASTROM_MODEL;
+  }
+  if (!strcasecmp (type, "ASTROM.REFSTARS"))     {
+    return PM_FPA_FILE_ASTROM_REFSTARS;
   }
 
@@ -481,6 +488,8 @@
     case PM_FPA_FILE_HEADER:
       return ("HEADER");
-    case PM_FPA_FILE_ASTROM:
-      return ("ASTROM");
+    case PM_FPA_FILE_ASTROM_MODEL:
+      return ("ASTROM.MODEL");
+    case PM_FPA_FILE_ASTROM_REFSTARS:
+      return ("ASTROM.REFSTARS");
     default:
       return ("NONE");
Index: trunk/psModules/src/camera/pmFPAfile.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.h	(revision 17025)
+++ trunk/psModules/src/camera/pmFPAfile.h	(revision 17036)
@@ -4,6 +4,6 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-03-06 20:47:50 $
+ * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-18 18:38:14 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -36,5 +36,6 @@
     PM_FPA_FILE_KAPA,
     PM_FPA_FILE_HEADER,
-    PM_FPA_FILE_ASTROM,
+    PM_FPA_FILE_ASTROM_MODEL,
+    PM_FPA_FILE_ASTROM_REFSTARS,
 } pmFPAfileType;
 
Index: trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.c	(revision 17025)
+++ trunk/psModules/src/camera/pmFPAfileIO.c	(revision 17036)
@@ -34,5 +34,6 @@
 #include "pmResiduals.h"
 #include "pmPSF_IO.h"
-#include "pmAstrometryTable.h"
+#include "pmAstrometryModel.h"
+#include "pmAstrometryRefstars.h"
 #include "pmFPA_JPEG.h"
 #include "pmSourcePlots.h"
@@ -196,7 +197,8 @@
         status = pmPSFmodelReadForView (view, file, config);
         break;
-      case PM_FPA_FILE_ASTROM:
-        status = pmAstromReadForView (view, file, config);
-        break;
+      case PM_FPA_FILE_ASTROM_MODEL:
+        status = pmAstromModelReadForView (view, file, config);
+        break;
+      case PM_FPA_FILE_ASTROM_REFSTARS:
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
@@ -281,5 +283,6 @@
     case PM_FPA_FILE_CMF:
     case PM_FPA_FILE_PSF:
-    case PM_FPA_FILE_ASTROM:
+    case PM_FPA_FILE_ASTROM_MODEL:
+    case PM_FPA_FILE_ASTROM_REFSTARS:
     case PM_FPA_FILE_JPEG:
     case PM_FPA_FILE_KAPA:
@@ -357,6 +360,12 @@
       }
     }
-    if (file->type == PM_FPA_FILE_ASTROM) {
-      if (!pmAstromCheckDataStatusForView (view, file)) {
+    if (file->type == PM_FPA_FILE_ASTROM_MODEL) {
+      if (!pmAstromModelCheckDataStatusForView (view, file)) {
+        psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
+        return true;
+      }
+    }
+    if (file->type == PM_FPA_FILE_ASTROM_REFSTARS) {
+      if (!pmAstromRefstarsCheckDataStatusForView (view, file)) {
         psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
         return true;
@@ -405,5 +414,6 @@
     fitsType |= (file->type == PM_FPA_FILE_CMF);
     fitsType |= (file->type == PM_FPA_FILE_PSF);
-    fitsType |= (file->type == PM_FPA_FILE_ASTROM);
+    fitsType |= (file->type == PM_FPA_FILE_ASTROM_MODEL);
+    fitsType |= (file->type == PM_FPA_FILE_ASTROM_REFSTARS);
 
     // Ensure headers and all are updated
@@ -481,6 +491,10 @@
         break;
 
-      case PM_FPA_FILE_ASTROM:
-        status = pmAstromWriteForView (view, file, config);
+      case PM_FPA_FILE_ASTROM_MODEL:
+        status = pmAstromModelWriteForView (view, file, config);
+        break;
+
+      case PM_FPA_FILE_ASTROM_REFSTARS:
+        status = pmAstromRefstarsWriteForView (view, file, config);
         break;
 
@@ -543,5 +557,6 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         status = psFitsClose (file->fits);
@@ -611,5 +626,6 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
         return true;
@@ -749,5 +765,6 @@
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
                  file->filename, file->name, view->chip, view->cell, view->readout);
@@ -922,5 +939,8 @@
         status = pmPSFmodelWritePHU (view, file, config);
         break;
-      case PM_FPA_FILE_ASTROM:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
+        status = pmAstromRefstarsWritePHU (view, file, config);
+        break;
+      case PM_FPA_FILE_ASTROM_MODEL:
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW: