Changeset 42215 for branches/eam_branches/ipp-20220316/psModules

Timestamp:

May 19, 2022, 8:45:29 AM (4 years ago)

Author:

eugene

Message:

some attempts to speed up rebinning; too much effort spent on an unused binned mask

File:

• branches/eam_branches/ipp-20220316/psModules/src/camera/pmFPABin.c (modified) (3 diffs)

branches/eam_branches/ipp-20220316/psModules/src/camera/pmFPABin.c

@@ -67 +67 @@
             for (int y = yStart; y < yStop; y++) {
                 for (int x = xStart; x < xStop; x++) {
-                  if (inMask && (inMask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] != 0)) {
+                  if (false && inMask && (inMask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] != 0)) {
                       for (int j = 0; j < Nbits; j++) {
                         psImageMaskType M = (psImageMaskType) pow(2,j);
@@ -89 +89 @@
             }
             
-            
             // Values to set
             float imageValue;
@@ -101 +100 @@
             }
             outImage->data.F32[yOut][xOut] = imageValue;
-            if (0) {
+            if (true) {
               outMask->data.PS_TYPE_IMAGE_MASK_DATA[yOut][xOut] = maskValue;
             } else {
               outMask->data.PS_TYPE_IMAGE_MASK_DATA[yOut][xOut] = 0;
             }
-            for (int j = 0; j < Nbits; j++) {
-              if (bitcounter[j] > 0.5 * pxlcount) {
-                outMask->data.PS_TYPE_IMAGE_MASK_DATA[yOut][xOut] |= (int) pow(2,j);
+            // this loop is pointless if pxlcount == 0 (all masked)
+            if (false) {
+              if (pxlcount) {
+                for (int j = 0; j < Nbits; j++) {
+                  if (bitcounter[j] > 0.5 * pxlcount) {
+                    outMask->data.PS_TYPE_IMAGE_MASK_DATA[yOut][xOut] |= (1 << j);
+                  }
+                }
+              } else {
+                outMask->data.PS_TYPE_IMAGE_MASK_DATA[yOut][xOut] = maskValue;
               }
             }
-            xStart = xStop;
+            xStart = xStop;
         }
         yStart = yStop;