Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 1407)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 1440)
@@ -9,6 +9,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-07 00:06:06 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:34:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,14 +21,14 @@
 #include "psMemory.h"
 
-static void grommitFree(psGrommit * grommit);
-static int checkValidChipCoords(double x, double y, psChip * tmpChip);
-static int checkValidImageCoords(double x, double y, psImage * tmpImage);
-
-psExposure *psExposureAlloc(double ra, double dec, double hourAngle,
+static void grommitFree(psGrommit* grommit);
+static int checkValidChipCoords(double x, double y, psChip* tmpChip);
+static int checkValidImageCoords(double x, double y, psImage* tmpImage);
+
+psExposure* psExposureAlloc(double ra, double dec, double hourAngle,
                             double zenith, double azimuth, double localTime, float date,
                             float rotAngle, float temperature, float pressure, float humidity,
                             float exposureTime)
 {
-    psExposure *exp = psAlloc(sizeof(psExposure));
+    psExposure* exp = psAlloc(sizeof(psExposure));
 
     *(double *)&exp->ra = ra;
@@ -49,8 +49,8 @@
 }
 
-psGrommit *psGrommitAlloc(const psExposure * exp)
+psGrommit* psGrommitAlloc(const psExposure* exp)
 {
     double *slaGrommit = (double *)psAlloc(14 * sizeof(double));
-    psGrommit *grommit = (psGrommit *) psAlloc(sizeof(psGrommit));
+    psGrommit* grommit = (psGrommit* ) psAlloc(sizeof(psGrommit));
 
     /*
@@ -79,13 +79,13 @@
 }
 
-void p_psGrommitFree(psGrommit * grommit)
+void p_psGrommitFree(psGrommit* grommit)
 {
     psFree(grommit);
 }
 
-psCell *psCellinFPA(psCell * out, const psPlane * coord, const psFPA * FPA)
-{
-    psChip *tmpChip = NULL;
-    psCell *tmpCell = NULL;
+psCell* psCellinFPA(psCell* out, const psPlane* coord, const psFPA* FPA)
+{
+    psChip* tmpChip = NULL;
+    psCell* tmpCell = NULL;
 
     tmpChip = psChipinFPA(tmpChip, coord, FPA);
@@ -94,17 +94,17 @@
 }
 
-int checkValidChipCoords(double x, double y, psChip * tmpChip)
+int checkValidChipCoords(double x, double y, psChip* tmpChip)
 {
     return (0);
 }
 
-psChip *psChipinFPA(psChip * out, const psPlane * coord, const psFPA * FPA)
-{
-    psArray *chips = FPA->chips;
+psChip* psChipinFPA(psChip* out, const psPlane* coord, const psFPA* FPA)
+{
+    psArray* chips = FPA->chips;
     int nChips = chips->n;
-    psPlane *tmpCoord = NULL;
+    psPlane* tmpCoord = NULL;
 
     for (int i = 0; i < nChips; i++) {
-        psChip *tmpChip = chips->data[i];
+        psChip* tmpChip = chips->data[i];
 
         tmpCoord = psPlaneTransformApply(tmpCoord, tmpChip->fromFPA, coord);
@@ -120,5 +120,5 @@
 }
 
-int checkValidImageCoords(double x, double y, psImage * tmpImage)
+int checkValidImageCoords(double x, double y, psImage* tmpImage)
 {
     if ((x < 0.0) || (x > (double)tmpImage->numCols) || (y < 0.0) || (y > (double)tmpImage->numRows)) {
@@ -140,8 +140,8 @@
 XXX: must deallocate memory.
  *****************************************************************************/
-psCell *psCellinChip(psCell * out, const psPlane * coord, const psChip * chip)
-{
-    psPlane *tmpCoord = NULL;
-    psArray *cells;
+psCell* psCellinChip(psCell* out, const psPlane* coord, const psChip* chip)
+{
+    psPlane* tmpCoord = NULL;
+    psArray* cells;
 
     if (chip == NULL) {
@@ -156,10 +156,10 @@
 
     for (int i = 0; i < cells->n; i++) {
-        psCell *tmpCell = (psCell *) cells->data[i];
-        psArray *readouts = tmpCell->readouts;
+        psCell* tmpCell = (psCell* ) cells->data[i];
+        psArray* readouts = tmpCell->readouts;
 
         if (readouts != NULL) {
             for (int j = 0; j < readouts->n; j++) {
-                psReadout *tmpReadout = readouts->data[j];
+                psReadout* tmpReadout = readouts->data[j];
 
                 tmpCoord = psPlaneTransformApply(tmpCoord, tmpCell->fromChip, coord);
@@ -173,15 +173,15 @@
 }
 
-psPlane *psCoordCelltoChip(psPlane * out, const psPlane * in, const psCell * cell)
+psPlane* psCoordCelltoChip(psPlane* out, const psPlane* in, const psCell* cell)
 {
     return (psPlaneTransformApply(out, cell->toChip, in));
 }
 
-psPlane *psCoordChipToFPA(psPlane * out, const psPlane * in, const psChip * chip)
+psPlane* psCoordChipToFPA(psPlane* out, const psPlane* in, const psChip* chip)
 {
     return (psPlaneTransformApply(out, chip->toFPA, in));
 }
 
-psPlane *psCoordFPAtoTP(psPlane * out, const psPlane * in, const psFPA * fpa)
+psPlane* psCoordFPAtoTP(psPlane* out, const psPlane* in, const psFPA* fpa)
 {
     // XXX: This code doesn't work; fpa->toTangentPlane is of the wrong type.
@@ -191,5 +191,5 @@
 
 // XXX: must wrap SLA_QAPQK here.
-psSphere *psCoordTPtoSky(psSphere * out, const psPlane * in, const psGrommit * grommit)
+psSphere* psCoordTPtoSky(psSphere* out, const psPlane* in, const psGrommit* grommit)
 {
     /*
@@ -202,5 +202,5 @@
 }
 
-psPlane *psCoordCellToFPA(psPlane * out, const psPlane * in, const psCell * cell)
+psPlane* psCoordCellToFPA(psPlane* out, const psPlane* in, const psCell* cell)
 {
     return (psPlaneTransformApply(out, cell->toFPA, in));
@@ -210,10 +210,10 @@
 // transformation, as well as a few psPlane structs.  Can this be implemented
 // better?
-psSphere *psCoordCelltoSky(psSphere * out, const psPlane * in, const psCell * cell)
-{
-    psPlane *tmp1 = NULL;
-    psPlane *tmp2 = NULL;
-    psFPA *parFPA = (cell->parent)->parent;
-    psGrommit *tmpGrommit = NULL;
+psSphere* psCoordCelltoSky(psSphere* out, const psPlane* in, const psCell* cell)
+{
+    psPlane* tmp1 = NULL;
+    psPlane* tmp2 = NULL;
+    psFPA* parFPA = (cell->parent)->parent;
+    psGrommit* tmpGrommit = NULL;
 
     tmp1 = psPlaneTransformApply(tmp1, cell->toFPA, in);
@@ -230,7 +230,7 @@
 }
 
-psSphere *psCoordCelltoSkyQuick(psSphere * out, const psPlane * in, const psCell * cell)
-{
-    psPlane *tmp1 = NULL;
+psSphere* psCoordCelltoSkyQuick(psSphere* out, const psPlane* in, const psCell* cell)
+{
+    psPlane* tmp1 = NULL;
 
     tmp1 = psPlaneTransformApply(tmp1, cell->toSky, in);
@@ -245,5 +245,5 @@
 
 // XXX: must wrap SLA_AOPQK here.
-psPlane *psCoordSkytoTP(psPlane * out, const psSphere * in, const psGrommit * grommit)
+psPlane* psCoordSkytoTP(psPlane* out, const psSphere* in, const psGrommit* grommit)
 {
     extern void sla_AOPQK(RAP, DAP, AOPRMS, AOB, ZOB, HOB, DOB, ROB);
@@ -255,5 +255,5 @@
 
     if (out == NULL) {
-        out = (psPlane *) psAlloc(sizeof(psPlane));
+        out = (psPlane* ) psAlloc(sizeof(psPlane));
     }
 
@@ -264,20 +264,20 @@
 }
 
-psPlane *psCoordTPtoFPA(psPlane * out, const psPlane * in, const psFPA * fpa)
+psPlane* psCoordTPtoFPA(psPlane* out, const psPlane* in, const psFPA* fpa)
 {
     return (psPlaneTransformApply(out, fpa->fromTangentPlane, in));
 }
 
-psPlane *psCoordFPAtoChip(psPlane * out, const psPlane * in, const psChip * chip)
+psPlane* psCoordFPAtoChip(psPlane* out, const psPlane* in, const psChip* chip)
 {
     return (psPlaneTransformApply(out, chip->fromFPA, in));
 }
 
-psPlane *psCoordChiptoCell(psPlane * out, const psPlane * in, const psCell * cell)
+psPlane* psCoordChiptoCell(psPlane* out, const psPlane* in, const psCell* cell)
 {
     return (psPlaneTransformApply(out, cell->fromChip, in));
 }
 
-psPlane *psCoordSkytoCell(psPlane * out, const psSphere * in, const psCell * cell)
+psPlane* psCoordSkytoCell(psPlane* out, const psSphere* in, const psCell* cell)
 {
     out = psCoordSkytoTP(out, in, tmpGrommit);
@@ -289,10 +289,10 @@
 }
 
-psPlane *psCoordSkytoCellQuick(psPlane * out, const psSphere * in, const psCell * cell)
+psPlane* psCoordSkytoCellQuick(psPlane* out, const psSphere* in, const psCell* cell)
 {
     if (out == NULL) {
-        out = (psPlane *) psAlloc(sizeof(psPlane));
-    }
-
-    return (out);
-}
+        out = (psPlane* ) psAlloc(sizeof(psPlane));
+    }
+
+    return (out);
+}