Changeset 4770 for trunk/psModules/test/tst_pmReadoutCombine.c

Timestamp:

Aug 15, 2005, 3:10:36 PM (21 years ago)

Author:

gusciora

Message:

There are a lot of changes here required by the new SDRS. Most changes
involve the new definitions of the psAstrometry types. Not all tests work
correctly.

File:

• trunk/psModules/test/tst_pmReadoutCombine.c (modified) (6 diffs)

trunk/psModules/test/tst_pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-10 22:22:52 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -118 +119 @@
         *(int *) (& (tmpImage->col0)) = baseCols[r];
         /*
-                psReadout *tmpReadout = psReadoutAlloc(baseColsReadout[r],
+                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
                                                        baseRowsReadout[r],
                                                        tmpImage);
         */
-        psReadout *tmpReadout = psReadoutAlloc();
+        pmReadout *tmpReadout = pmReadoutAlloc(NULL);
         tmpReadout->image = tmpImage;
 
@@ -154 +155 @@
     psListElem *tmpInput = (psListElem *) list->head;
     while (NULL != tmpInput) {
-        psReadout *tmpReadout = (psReadout *) tmpInput->data;
+        pmReadout *tmpReadout = (pmReadout *) tmpInput->data;
         psFree(tmpReadout);
         tmpInput = tmpInput->next;
@@ -236 +237 @@
         *(int *) (& (tmpImage->col0)) = baseCols[r];
         /*
-                psReadout *tmpReadout = psReadoutAlloc(baseColsReadout[r],
+                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
                                                        baseRowsReadout[r],
                                                        tmpImage);
         */
-        psReadout *tmpReadout = psReadoutAlloc();
+        pmReadout *tmpReadout = pmReadoutAlloc(NULL);
         tmpReadout->image = tmpImage;
         minOutRow = PS_MIN(minOutRow, (baseRowsReadout[r] + baseRows[r]));
@@ -441 +442 @@
     psListElem *tmpInput = (psListElem *) list->head;
     while (NULL != tmpInput) {
-        psReadout *tmpReadout = (psReadout *) tmpInput->data;
+        pmReadout *tmpReadout = (pmReadout *) tmpInput->data;
         psFree(tmpReadout);
         tmpInput = tmpInput->next;