Changeset 6493 for branches/rel10_ifa/psModules/src/objects/pmObjects.c

Timestamp:

Feb 24, 2006, 6:23:34 PM (20 years ago)

Author:

magnier

Message:

added profile enabling, some attempts at optimization

File:

• branches/rel10_ifa/psModules/src/objects/pmObjects.c (modified) (3 diffs)

branches/rel10_ifa/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.9.4.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-24 04:03:45 $
+ *  @version $Revision: 1.9.4.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-25 04:23:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -909 +909 @@
     // XXX EAM : mask == 0 is valid
 
-    psF32 **vPix = source->pixels->data.F32;
-    psF32 **vWgt = source->weight->data.F32;
-    psU8  **vMsk = source->mask->data.U8;
-
     for (psS32 row = 0; row < source->pixels->numRows ; row++) {
-        for (psS32 col = 0; col < source->pixels->numCols ; col++) {
-            if ((source->mask != NULL) && (vMsk[row][col])) {
+
+        psF32 *vPix = source->pixels->data.F32[row];
+        psF32 *vWgt = source->weight->data.F32[row];
+        psU8  *vMsk = (source->mask == NULL) ? NULL : source->mask->data.U8[row];
+
+        for (psS32 col = 0; col < source->pixels->numCols ; col++, vPix++, vWgt++) {
+            if ((vMsk != NULL) && *vMsk) {
+                vMsk++;
                 continue;
             }
-
-            // psF32 xDiff = col + source->pixels->col0 - xPeak;
-            // psF32 yDiff = row + source->pixels->row0 - yPeak;
 
             psF32 xDiff = col + xOff;
             psF32 yDiff = row + yOff;
 
-            // XXX EAM : calculate xDiff, yDiff up front;
-            //           radius is just a function of (xDiff, yDiff)
+            // radius is just a function of (xDiff, yDiff)
             if (!VALID_RADIUS(xDiff, yDiff, R2)) {
+                if (vMsk != NULL)
+                    vMsk++;
                 continue;
             }
 
-            psF32 pDiff = vPix[row][col] - sky;
-            psF32 wDiff = vWgt[row][col];
+            psF32 pDiff = *vPix - sky;
+            psF32 wDiff = *vWgt;
 
             // XXX EAM : check for valid S/N in pixel
             // XXX EAM : should this limit be user-defined?
             if (PS_SQR(pDiff) < wDiff) {
+                if (vMsk != NULL)
+                    vMsk++;
                 continue;
             }
@@ -948 +950 @@
             X1  += xWght;
             Y1  += yWght;
+
             XY  += xDiff * yWght;
-
             X2  += xDiff * xWght;
             Y2  += yDiff * yWght;
 
-            peakPixel = PS_MAX (vPix[row][col], peakPixel);
+            peakPixel = PS_MAX (*vPix, peakPixel);
             numPixels++;
+            if (vMsk != NULL)
+                vMsk++;
         }
     }