Changeset 2990

Timestamp:

Jan 13, 2005, 3:13:15 PM (22 years ago)

Author:

desonia

Message:

modification concerning requirement that 'n' in psArray of psFPA/psChip/psCell
shall be 0 at allocation time.

Location:

trunk/psLib

Files:

• src/astronomy/psAstrometry.c (modified) (3 diffs)
• test/astronomy/tst_psAstrometry01.c (modified) (8 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-13 22:45:28 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-14 01:13:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -362 +362 @@
         chips[i] = NULL;
     }
+    newFPA->chips->n = 0; // per requirement
 
     newFPA->metadata = NULL;
@@ -467 +468 @@
     psReadout* readout = psAlloc(sizeof(psReadout));
 
-    *(psU32*)&readout->colBins = 0;
-    *(psU32*)&readout->rowBins = 0;
+    *(psU32*)&readout->colBins = 1;
+    *(psU32*)&readout->rowBins = 1;
     *(psU32*)&readout->rowParity = 0;
     *(psU32*)&readout->colParity = 0;

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-01-13 22:45:40 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-14 01:13:15 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 
 testDescription tests[] = {
-                              {test1, 0000, "Tests psFixedPatternAlloc()", 0, false},
-                              {test2, 0000, "Tests psGrommitAlloc()", 0, false},
-                              {test3, 0000, "MISC", 0, false},
+                              {test1, -1, "Tests psFixedPatternAlloc()", 0, false},
+                              {test2, -2, "Tests psGrommitAlloc()", 0, false},
+                              {test3, -3, "MISC", 0, false},
                               {NULL}
                           };
@@ -136 +136 @@
 
     chips = (psChip **) myFPA->chips->data;
+    myFPA->chips->n = NUM_CHIPS;
+
     for (i=0;i<NUM_CHIPS;i++) {
         chips[i] = psChipAlloc(NUM_CELLS, myFPA);
@@ -148 +150 @@
 
         cells = (psCell **) chips[i]->cells->data;
+        chips[i]->cells->n = NUM_CELLS;
 
         for (j=0;j<NUM_CELLS;j++) {
@@ -168 +171 @@
 
             readouts = (psReadout **) cells[j]->readouts->data;
+            cells[j]->readouts->n = NUM_READOUTS;
+
             for (k=0;k<NUM_READOUTS;k++) {
                 tmpImage = psImageAlloc(READOUT_NUM_COLS, READOUT_NUM_ROWS, PS_TYPE_F32);
@@ -176 +181 @@
                     }
                 }
-                readouts[k] = psReadoutAlloc((j * (CELL_WIDTH + CELL_GAP)), 0, tmpImage);
+                readouts[k] = psReadoutAlloc();
+                readouts[k]->image = tmpImage;
+                *(psS32*)&readouts[k]->col0 = (j * (CELL_WIDTH + CELL_GAP));
+                *(psS32*)&readouts[k]->row0 = 0;
+
 
             }
@@ -341 +350 @@
         XXX: Don't know how to verify: latitude, sinLat, cosLat, abberationMag,
              refractA, refractB, longitudeOffset, siderealTime
-     
+
        if (grom-> != ) {
             printf("ERROR: grom-> is %f, should be %f\n", grom->, );
@@ -405 +414 @@
 coords returned above.
  
-Then, it calls 
+Then, it calls
     psCellInChip()
 and flags an ERROR if the cell it returns is different from that of