Changeset 2204 for trunk/psLib/test/astronomy/tst_psAstrometry01.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/astronomy/tst_psAstrometry01.c (modified) (13 diffs)

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-14 02:05:00 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -14 +14 @@
 #include "pslib.h"
 
-static int test1( void );
-static int test2( void );
-static int test3( void );
+static psS32 test1( void );
+static psS32 test2( void );
+static psS32 test3( void );
 
 testDescription tests[] = {
@@ -115 +115 @@
 psFPA *genSystem()
 {
-    int i;
-    int j;
-    int k;
+    psS32 i;
+    psS32 j;
+    psS32 k;
     psImage *tmpImage;
     //    psTime* now = psTimeGetTime(PS_TIME_UTC);
@@ -170 +170 @@
             for (k=0;k<NUM_READOUTS;k++) {
                 tmpImage = psImageAlloc(READOUT_NUM_COLS, READOUT_NUM_ROWS, PS_TYPE_F32);
-                for (int row=0;row<READOUT_NUM_ROWS;row++) {
-                    for(int col=0;col<READOUT_NUM_COLS;col++) {
+                for (psS32 row=0;row<READOUT_NUM_ROWS;row++) {
+                    for(psS32 col=0;col<READOUT_NUM_COLS;col++) {
                         tmpImage->data.F32[row][col] = (float) ((i * (CHIP_WIDTH + CHIP_GAP)) +
                                                                 (j * (CELL_WIDTH + CELL_GAP)));
@@ -185 +185 @@
 }
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -201 +201 @@
 #define Y0  60.0
 
-int test1( void )
-{
-    int i;
-    int j;
+psS32 test1( void )
+{
+    psS32 i;
+    psS32 j;
     psFixedPattern *tmp = NULL;
     float x0 = X0;
@@ -212 +212 @@
     psImage *x = psImageAlloc(X_NUM_COLS, X_NUM_ROWS, PS_TYPE_F64);
     psImage *y = psImageAlloc(Y_NUM_COLS, Y_NUM_ROWS, PS_TYPE_F64);
-    int testStatus = 0;
-    int numPixels = 0;
+    psS32 testStatus = 0;
+    psS32 numPixels = 0;
 
     for (i=0;i<X_NUM_ROWS;i++) {
@@ -295 +295 @@
 }
 
-int test2()
-{
-    int testStatus = 0;
+psS32 test2()
+{
+    psS32 testStatus = 0;
 
     psTime* now = psTimeGetTime(PS_TIME_UTC);
@@ -371 +371 @@
 }
 
-int printCell(psCell *cell)
+psS32 printCell(psCell *cell)
 {
     psReadout **readouts = (psReadout **) cell->readouts->data;
@@ -377 +377 @@
 
     printf("-------------------------------\n");
-    for (int i = 0; i < readout->image->numRows ; i++) {
-        for (int j = 0; j < readout->image->numCols ; j++) {
+    for (psS32 i = 0; i < readout->image->numRows ; i++) {
+        for (psS32 j = 0; j < readout->image->numCols ; j++) {
             printf("(%.1f) ", readout->image->data.F32[i][j]);
         }
@@ -415 +415 @@
  
  *****************************************************************************/
-int test3( void )
-{
-    int x;
-    int y;
+psS32 test3( void )
+{
+    psS32 x;
+    psS32 y;
     psPlane fpaCoord;
     psFPA *myFPA = genSystem();
@@ -426 +426 @@
     psPlane testCoord;
 
-    int xReadout = 0;
-    int xFPA = 0;
-    for (int chip=0;chip<NUM_CHIPS;chip++) {
-        for (int cell=0;cell<NUM_CELLS;cell++) {
+    psS32 xReadout = 0;
+    psS32 xFPA = 0;
+    for (psS32 chip=0;chip<NUM_CHIPS;chip++) {
+        for (psS32 cell=0;cell<NUM_CELLS;cell++) {
             for(x=0;x<CELL_WIDTH;x++) {
                 for (y=0;y<CELL_HEIGHT;y++) {
@@ -444 +444 @@
                         psCoordChipToCell(&cellCoord, &chipCoord, myCell);
 
-                        if (x != (int) cellCoord.x) {
+                        if (x != (psS32) cellCoord.x) {
                             printf("ERROR: x coord was %f, should be %d\n", cellCoord.x, x);
                         }
-                        if (y != (int) cellCoord.y) {
+                        if (y != (psS32) cellCoord.y) {
                             printf("ERROR: y coord was %f, should be %d\n", cellCoord.y, y);
                         }