Changeset 2819 for trunk/psModules/src/pmReadoutCombine.c

Timestamp:

Dec 23, 2004, 4:39:17 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psModules/src/pmReadoutCombine.c (modified) (2 diffs)

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-24 02:05:57 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-24 02:39:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 
             // XXX: Is this correct?
+            // We scale the pixels by the scale vector, if not-NULL.
+            if (scale != NULL) {
+                for (int r = 0; r < numInputs ; r++) {
+                    tmpPixels->data.F32[r]*= scale->data.F32[r];
+                }
+            }
+
+            // XXX: Is this correct?
             // We add the zero vector, if non-NULL.
             if (zero != NULL) {
                 for (int r = 0; r < numInputs ; r++) {
                     tmpPixels->data.F32[r]+= zero->data.F32[r];
-                }
-            }
-
-            // XXX: Is this correct?
-            // We scale the pixels by the scale vector, if not-NULL.
-            if (scale != NULL) {
-                for (int r = 0; r < numInputs ; r++) {
-                    tmpPixels->data.F32[r]*= scale->data.F32[r];
                 }
             }