Index: trunk/psModules/test/astrom/.cvsignore
===================================================================
--- trunk/psModules/test/astrom/.cvsignore	(revision 10775)
+++ trunk/psModules/test/astrom/.cvsignore	(revision 10786)
@@ -9,2 +9,3 @@
 tap_pmAstrometryWCS_DVO2
 tap_pmAstrometryWCS_DVO3
+tap_pmAstrometryWCS_DVO
Index: trunk/psModules/test/astrom/Makefile.am
===================================================================
--- trunk/psModules/test/astrom/Makefile.am	(revision 10775)
+++ trunk/psModules/test/astrom/Makefile.am	(revision 10786)
@@ -1,4 +1,2 @@
-
-
 AM_CPPFLAGS = \
 	$(SRCINC) \
@@ -20,2 +18,6 @@
 
 test: check
+
+tests: $(check_PROGRAMS)
+	$(top_srcdir)/test/test.pl
+
Index: trunk/psModules/test/astrom/tap_pmAstrometryWCS.c
===================================================================
--- trunk/psModules/test/astrom/tap_pmAstrometryWCS.c	(revision 10775)
+++ 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);
Index: trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO.c
===================================================================
--- trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO.c	(revision 10775)
+++ trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO.c	(revision 10786)
@@ -27,8 +27,8 @@
 int main (void)
 {
-    plan_tests(984);
-
-    // diag("pmAstrometryWCS tests compared with DVO coords routines");
-    // diag("this file tests pmAstromWCS <-> Header representations");
+    plan_tests(992);
+
+    note("pmAstrometryWCS tests compared with DVO coords routines");
+    note("this file tests pmAstromWCS <-> Header representations");
 
     test1in();
@@ -44,5 +44,5 @@
 void test3in()
 {
-    // diag("test pmAstromWCStoHeader");
+    note("test pmAstromWCStoHeader");
     psMemId id = psMemGetId();
 
@@ -76,7 +76,4 @@
     pmAstromWCS *wcs2 = pmAstromWCSfromHeader(header2);
 
-    psMetadataConfigWrite (header1, "head1.md");
-    psMetadataConfigWrite (header2, "head2.md");
-
     ok (wcs2 != NULL, "converted WCS keywords to WCS astrometry");
     skip_start (wcs2 == NULL, 1, "*** WCS Conversion FAILS *** : skipping related tests");
@@ -122,5 +119,5 @@
 void test2in()
 {
-    // diag("test pmAstromWCStoHeader");
+    note("test pmAstromWCStoHeader");
     psMemId id = psMemGetId();
 
@@ -198,5 +195,5 @@
 void test1in()
 {
-    // diag("test pmAstromWCStoHeader");
+    note("test pmAstromWCStoHeader");
     psMemId id = psMemGetId();
 
@@ -271,5 +268,5 @@
 void test3 ()
 {
-    // diag("test pmAstromWCSfromHeader ");
+    note("test pmAstromWCSfromHeader ");
     psMemId id = psMemGetId();
 
@@ -332,5 +329,5 @@
 void test2 ()
 {
-    // diag("test pmAstromWCSfromHeader");
+    note("test pmAstromWCSfromHeader");
     psMemId id = psMemGetId();
 
@@ -391,5 +388,5 @@
 void test1()
 {
-    // diag("test pmAstromWCSfromHeader");
+    note("test pmAstromWCSfromHeader");
     psMemId id = psMemGetId();
 
@@ -450,5 +447,5 @@
 void testA()
 {
-    // diag("test coord allocs");
+    note("test coord allocs");
     psMemId id = psMemGetId();
 
@@ -460,5 +457,5 @@
 void testB()
 {
-    // diag("test coord allocs");
+    note("test coord allocs");
     psMemId id = psMemGetId();
 
@@ -525,5 +522,5 @@
     plan_tests(0);
 
-    // diag("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
+    note("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
 
     return exit_status();
Index: trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c
===================================================================
--- trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c	(revision 10775)
+++ trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c	(revision 10786)
@@ -24,7 +24,7 @@
 int main (void)
 {
-    plan_tests(1472);
-
-    diag("pmAstromReadWCS tests compared with DVO coords routines");
+    plan_tests(1483);
+
+    note("pmAstromReadWCS tests compared with DVO coords routines");
 
     test1();
@@ -41,5 +41,5 @@
 void test1()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -112,5 +112,5 @@
 void test2()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -183,5 +183,5 @@
 void test3()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -257,5 +257,5 @@
 void test1x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -328,5 +328,5 @@
 void test2x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -399,5 +399,5 @@
 void test3x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -473,8 +473,8 @@
 void test3inv()
 {
-    diag("test the inversion of the non-linear polynomial for toFPA -> fromFPA in pmAstromReadWCS");
-    diag("note that the tolerance for these tests are rather loose");
-    diag("a 2nd order polynomial is not a great approximate to 1 over a 2nd order polynomial");
-    diag("unless the non-linear terms are quite small");
+    note("test the inversion of the non-linear polynomial for toFPA -> fromFPA in pmAstromReadWCS");
+    note("note that the tolerance for these tests are rather loose");
+    note("a 2nd order polynomial is not a great approximate to 1 over a 2nd order polynomial");
+    note("unless the non-linear terms are quite small");
     psMemId id = psMemGetId();
 
@@ -621,5 +621,5 @@
     plan_tests(0);
 
-    diag("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
+    note("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
 
     return exit_status();
Index: trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c
===================================================================
--- trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c	(revision 10775)
+++ trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c	(revision 10786)
@@ -20,19 +20,17 @@
 void test2x(); // small rotation with central offset
 void test3x(); // 2nd order term with central offset
-void test3inv(); // 2nd order term with central offset
 
 int main (void)
 {
-    plan_tests(984);
-
-    diag("pmAstromWriteWCS tests compared with DVO coords routines");
-
-    //    test1();
-    //    test2();
-    //    test3();
-    //    test1x();
+    plan_tests(991);
+
+    note("pmAstromWriteWCS tests compared with DVO coords routines");
+
+    test1();
+    test2();
+    test3();
+    test1x();
     test2x();
-    //    test3x();
-    //    test3inv();
+    test3x();
 
     return exit_status();
@@ -41,5 +39,5 @@
 void test1()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -73,5 +71,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
 
@@ -131,5 +129,5 @@
 void test2()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -165,5 +163,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     psMetadataConfigWrite (header2, "head2.md");
 
@@ -225,5 +223,5 @@
 void test3()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -260,5 +258,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     psMetadataConfigWrite (header2, "head2.md");
 
@@ -320,5 +318,5 @@
 void test1x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -352,5 +350,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
 
@@ -410,5 +408,5 @@
 void test2x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -418,6 +416,6 @@
     coords.crval1 = 0.0;
     coords.crval2 = 0.0;
-    coords.crpix1 = 20.0;
-    coords.crpix2 = 50.0;
+    coords.crpix1 = 50.0;
+    coords.crpix2 = -20.0;
     coords.cdelt1 = 1.0/3600;
     coords.cdelt2 = 1.0/3600;
@@ -444,5 +442,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     psMetadataConfigWrite (header2, "head2.md");
 
@@ -504,5 +502,5 @@
 void test3x()
 {
-    diag("test pmAstromReadWCS");
+    note("test pmAstromReadWCS");
     psMemId id = psMemGetId();
 
@@ -539,5 +537,5 @@
 
     psMetadata *header2 = psMetadataAlloc();
-    status = pmAstromWriteWCS (header2, fpa, chip);
+    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
     psMetadataConfigWrite (header2, "head2.md");
 
@@ -654,5 +652,5 @@
     plan_tests(0);
 
-    diag("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
+    note("pmAstrometryWCS tests compared with DVO coords routines : SKIPPED (libdvo not available)");
 
     return exit_status();