Index: trunk/psModules/test/astrom/tap_pmAstrometryWCS.c
===================================================================
--- trunk/psModules/test/astrom/tap_pmAstrometryWCS.c	(revision 10615)
+++ trunk/psModules/test/astrom/tap_pmAstrometryWCS.c	(revision 10786)
@@ -9,13 +9,10 @@
 int main (void)
 {
+    plan_tests(33);
 
-    pmModelGroupInit ();
-
-    plan_tests(240);
-
-    diag("pmAstrometryWCS tests");
+    note("pmAstrometryWCS tests");
 
     {
-        diag("test pmAstromReadWCS");
+        note("test pmAstromReadWCS");
         psMemId id = psMemGetId();
 
@@ -51,5 +48,5 @@
         // toFPA carries pixel scale (pixels per micron)
         // toTPA carries plate scale (microns per arcsecond)
-        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PS_RAD_DEG/3600.0, false);
+        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0, false);
         ok (status, "converted WCS keywords to FPA astrometry");
         skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
@@ -58,9 +55,9 @@
 
         // make these tests double
-        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PS_DEG_RAD);
-        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PS_DEG_RAD);
+        ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PM_DEG_RAD);
+        ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PM_DEG_RAD);
 
-        ok_float(fpa->toSky->Xs, 25.0*PS_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Xs);
-        ok_float(fpa->toSky->Ys, 25.0*PS_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
+        ok_float(fpa->toSky->Xs, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Xs);
+        ok_float(fpa->toSky->Ys, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
 
         ok_float(fpa->toTPA->x->coeff[1][0][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
@@ -84,16 +81,6 @@
 
     {
-        diag("test pmAstromReadWCS");
+        note("test pmAstromReadWCS");
         psMemId id = psMemGetId();
-
-        psPlaneTransform *wcsTrans = psPlaneTransformAlloc (1, 1);
-        wcsTrans->x->coeff[0][0] = 0.0;
-        wcsTrans->y->coeff[0][0] = 0.0;
-        wcsTrans->x->coeff[1][0] = 1.0;
-        wcsTrans->x->coeff[0][1] = 0.0;
-        wcsTrans->y->coeff[1][0] = 0.0;
-        wcsTrans->y->coeff[0][1] = 1.0;
-
-
 
         // construct a header with a simple set of WCS values
@@ -128,5 +115,5 @@
         // toFPA carries pixel scale (pixels per micron)
         // toTPA carries plate scale (microns per arcsecond)
-        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PS_RAD_DEG/3600.0, false);
+        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0, false);
         ok (status, "converted WCS keywords to FPA astrometry");
         skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
@@ -135,9 +122,9 @@
 
         // make these tests double
-        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PS_DEG_RAD);
-        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PS_DEG_RAD);
+        ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PM_DEG_RAD);
+        ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PM_DEG_RAD);
 
-        ok_float(fpa->toSky->Xs, 25.0*PS_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Xs);
-        ok_float(fpa->toSky->Ys, 25.0*PS_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
+        ok_float(fpa->toSky->Xs, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Xs);
+        ok_float(fpa->toSky->Ys, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
 
         ok_float(fpa->toTPA->x->coeff[1][0][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
@@ -152,7 +139,4 @@
         ok_float(chip->toFPA->y->coeff[0][1], 1.0, "CD2_2: %f", chip->toFPA->y->coeff[0][1]);
 
-        // apply both systems to real data:
-
-
         psFree (fpa);
         psFree (chip);