Index: trunk/psModules/src/astrom/Makefile.am
===================================================================
--- trunk/psModules/src/astrom/Makefile.am	(revision 17034)
+++ trunk/psModules/src/astrom/Makefile.am	(revision 17036)
@@ -8,5 +8,6 @@
 	pmAstrometryDistortion.c \
 	pmAstrometryUtils.c \
-	pmAstrometryTable.c \
+	pmAstrometryModel.c \
+	pmAstrometryRefstars.c \
 	pmAstrometryWCS.c
 
@@ -16,5 +17,6 @@
 	pmAstrometryDistortion.h \
 	pmAstrometryUtils.h \
-	pmAstrometryTable.h \
+	pmAstrometryModel.h \
+	pmAstrometryRefstars.h \
 	pmAstrometryWCS.h
 
Index: trunk/psModules/src/astrom/pmAstrometryObjects.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 17034)
+++ trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 17036)
@@ -8,6 +8,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2008-01-15 02:49:45 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2008-03-18 18:38:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32,7 +32,4 @@
 #include "pmFPA.h"
 #include "pmAstrometryObjects.h"
-
-# define DEG_RAD 57.295779513082322
-# define RAD_DEG  0.017453292519943
 
 #define PM_ASTROMETRYOBJECTS_DEBUG 1
@@ -726,7 +723,7 @@
     double delScale = psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.SCALE");
 
-    double minAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.ANGLE");
-    double maxAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MAX.ANGLE");
-    double delAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.ANGLE");
+    double minAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.ANGLE");
+    double maxAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MAX.ANGLE");
+    double delAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.ANGLE");
     double minSigma = psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.SIGMA");
 
@@ -762,8 +759,8 @@
 		*minStat = *newStat;
 		psLogMsg ("psModule.astrom", 4, "grid test - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric) *",
-			  minStat->offset.x, minStat->offset.y, DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
+			  minStat->offset.x, minStat->offset.y, PS_DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
 	    } else {
 		psLogMsg ("psModule.astrom", 4, "grid test - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric)",
-			  newStat->offset.x, newStat->offset.y, DEG_RAD*newStat->angle, newStat->scale, newStat->nMatch, newStat->nSigma, newStat->minVar, log10(newStat->minMetric));
+			  newStat->offset.x, newStat->offset.y, PS_DEG_RAD*newStat->angle, newStat->scale, newStat->nMatch, newStat->nSigma, newStat->minVar, log10(newStat->minMetric));
 
 	    }
@@ -773,5 +770,5 @@
     }
     psLogMsg ("psModule.astrom.grid.match", 4, "grid best - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric)",
-              minStat->offset.x, minStat->offset.y, DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
+              minStat->offset.x, minStat->offset.y, PS_DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
 
     // I need to decide if a solution is likely to be a good solution or just a mis-match
Index: trunk/psModules/src/astrom/pmAstrometryWCS.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 17034)
+++ trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 17036)
@@ -7,6 +7,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-15 02:48:58 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-03-18 18:38:14 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -339,6 +339,6 @@
     psFree (type);
 
-    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PM_DEG_RAD);
-    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PM_DEG_RAD);
+    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PS_DEG_RAD);
+    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PS_DEG_RAD);
 
     psMetadataAddF64 (header, PS_LIST_TAIL, "CRPIX1", PS_META_REPLACE, "", wcs->crpix1);
@@ -604,6 +604,6 @@
     // convert projection from FPA to SKY into wcs projection (degrees to radians)
     wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, fpa->toSky->type);
-    wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
-    wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
+    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
+    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
 
     // given transformation, solve for coordinates which yields output coordinates of 0,0
@@ -620,6 +620,6 @@
 
     // pdelt1,2 has units of degrees/micron
-    double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
-    double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
+    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
+    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
 
     // convert wcs->trans to a matrix with units of degrees/pixel
@@ -696,6 +696,6 @@
     // convert projection from TPA to SKY into wcs projection (degrees to radians)
     wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, PS_PROJ_DIS);
-    wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
-    wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
+    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
+    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
 
     // given transformation, solve for coordinates which yields output coordinates of 0,0
@@ -712,6 +712,6 @@
 
     // pdelt1,2 has units of degrees/micron
-    double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
-    double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
+    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
+    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
 
     // convert wcs->trans to units of degree/micron