Changeset 4770 for trunk/psModules/src/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/src/pmReadoutCombine.c (modified) (5 diffs)

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-29 01:39:10 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
     psS32 minInputRows = PS_MAX_S32;
     psListElem *tmpInput = NULL;
-    psReadout *tmpReadout = NULL;
+    pmReadout *tmpReadout = NULL;
     psS32 numInputs = 0;
     psS32 tmpI;
@@ -98 +98 @@
     tmpInput = (psListElem *) inputs->head;
     while (NULL != tmpInput) {
-        tmpReadout = (psReadout *) tmpInput->data;
+        tmpReadout = (pmReadout *) tmpInput->data;
         PS_ASSERT_READOUT_NON_NULL(tmpReadout, output);
         PS_ASSERT_READOUT_NON_EMPTY(tmpReadout, output);
@@ -182 +182 @@
     psVector *outColLower = psVectorAlloc(numInputs, PS_TYPE_U32);
     psVector *outColUpper = psVectorAlloc(numInputs, PS_TYPE_U32);
-    psReadout **tmpReadouts = (psReadout **) psAlloc(numInputs * sizeof(psReadout *));
+    pmReadout **tmpReadouts = (pmReadout **) psAlloc(numInputs * sizeof(pmReadout *));
 
     // For each input readout, we create a pointer to that readout in
@@ -191 +191 @@
     tmpInput = (psListElem *) inputs->head;
     while (NULL != tmpInput) {
-        tmpReadouts[i] = (psReadout *) tmpInput->data;
+        tmpReadouts[i] = (pmReadout *) tmpInput->data;
         outRowLower->data.U32[i] = tmpReadouts[i]->row0 + tmpReadouts[i]->image->row0;
         outColLower->data.U32[i] = tmpReadouts[i]->col0 + tmpReadouts[i]->image->col0;