Index: trunk/psLib/test/astronomy/Makefile
===================================================================
--- trunk/psLib/test/astronomy/Makefile	(revision 2108)
+++ trunk/psLib/test/astronomy/Makefile	(revision 2109)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/astronomy
 ##
-##  $Revision: 1.18 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-10-13 23:58:20 $
+##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-10-14 02:05:00 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30,7 +30,5 @@
          tst_psCoord \
          tst_psAstrometry \
-         tst_psAstrometry01 \
-         tst_psAstrometry02 \
-         tst_psAstrometry03
+         tst_psAstrometry01
 
 OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET)))
Index: trunk/psLib/test/astronomy/tst_psAstrometry01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 2108)
+++ trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 2109)
@@ -5,6 +5,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-14 01:53:20 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-14 02:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -461,5 +461,5 @@
                         psCell *myCell2 = psCellInChip(&chipCoord, tmpChip);
                         if (myCell2 != myCell) {
-                            printf("ERROR: psCellInFPA() != psCellInChip(psChipInFPA()) (%d %d)\n", (int) myCell2, (int) myCell);
+                            printf("ERROR: psCellInFPA() != psCellInChip(psChipInFPA()) (%p %p)\n", myCell2, myCell);
                             printCell(myCell2);
                             printCell(myCell);
Index: trunk/psLib/test/astronomy/tst_psAstrometry02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry02.c	(revision 2108)
+++ 	(revision )
@@ -1,78 +1,0 @@
-#include "psTest.h"
-#include "pslib.h"
-static int test1( void );
-testDescription tests[] = {
-                              {test1, 0000, "Hey", 0, false},
-                              {NULL}
-                          };
-#define RA  1.0
-#define DEC  2.0
-#define HA  3.0
-#define ZD  4.0
-#define AZ  5.0
-#define ROT_ANGLE 6.0
-#define TEMPERATURE 7.0
-#define PRESSURE 8.0
-#define HUMIDITY 20.0
-#define EXP_TIME 22.0
-#define WAVELENGTH 11.0
-#define NAME  "The Kaiser Royal Observatory"
-#define LATITUDE 20.7
-#define LONGITUDE 156.3
-#define HEIGHT  3055.0
-#define LAPSERATE 20.0
-#define NUM_CHIPS 2
-#define NUM_CELLS 4
-#define NUM_READOUTS 2
-#define READOUT_NUM_ROWS 8
-#define READOUT_NUM_COLS 8
-#define ROW0  0
-#define COL0  0
-
-int genSystem()
-{
-    int i;
-    int j;
-    psTime* now = psTimeGetTime(PS_TIME_UTC);
-    psObservatory* obs = psObservatoryAlloc(NAME, LATITUDE, LONGITUDE, HEIGHT, LAPSERATE);
-    psExposure* exp = psExposureAlloc(RA, DEC, HA, ZD, AZ,
-                                      now, ROT_ANGLE, TEMPERATURE, PRESSURE, HUMIDITY,
-                                      EXP_TIME, WAVELENGTH, obs);
-    psFPA *myFPA = psFPAAlloc(NUM_CHIPS, exp);
-    psChip **chips;
-    psCell **cells;
-
-    myFPA->fromTangentPlane = NULL;
-    myFPA->toTangentPlane = NULL;
-
-    chips = (psChip **) myFPA->chips->data;
-    for (i=0;i<NUM_CHIPS;i++) {
-        chips[i] = psChipAlloc(NUM_CELLS, myFPA);
-        cells = (psCell **) chips[i]->cells->data;
-
-        for (j=0;j<NUM_CELLS;j++) {
-            cells[j] = psCellAlloc(NUM_READOUTS, chips[i]);
-        }
-    }
-
-    chips = (psChip **) myFPA->chips->data;
-    for (i=0;i<NUM_CHIPS;i++) {
-        cells = (psCell **) chips[i]->cells->data;
-        for (j=0;j<NUM_CELLS;j++) {
-            psFree(cells[j]);
-        }
-        psFree(chips[i]);
-    }
-    return(0);
-}
-
-int main( int argc, char* argv[] )
-{
-    return ( ! runTestSuite( stderr, "psImage", tests, argc, argv ) );
-}
-
-int test1( void )
-{
-    genSystem();
-    return(0);
-}
Index: trunk/psLib/test/astronomy/tst_psAstrometry03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry03.c	(revision 2108)
+++ 	(revision )
@@ -1,28 +1,0 @@
-#include "psTest.h"
-#include "pslib.h"
-#define NUM_CHIPS 2
-#define NUM_CELLS 4
-#define NUM_READOUTS 2
-
-int main()
-{
-    int i;
-    int j;
-    psFPA *myFPA = psFPAAlloc(NUM_CHIPS, NULL);
-    psCell **cells;
-
-    psChip **chips = (psChip **) myFPA->chips->data;
-    for (i=0;i<NUM_CHIPS;i++) {
-        chips[i] = psChipAlloc(NUM_CELLS, myFPA);
-        cells = (psCell **) chips[i]->cells->data;
-
-        for (j=0;j<NUM_CELLS;j++) {
-            cells[j] = psCellAlloc(NUM_READOUTS, chips[i]);
-        }
-    }
-
-    psFree(myFPA);
-
-    psMemCheckLeaks(0,NULL,stderr);
-    return(0);
-}