Changeset 9945 for trunk/psModules/src/camera/pmFPAMosaic.c

Timestamp:

Nov 9, 2006, 4:17:37 PM (20 years ago)

Author:

Paul Price

Message:

Bug in output binning --- if the binning wasn't set, it would come
back as zero, which is less than any proper value.

File:

• trunk/psModules/src/camera/pmFPAMosaic.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -211 +211 @@
     int xBinCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XBIN"); // Binning in x
     if (!mdok || xBin <= 0) {
-        psError(PS_ERR_UNKNOWN, true, "CELL.XPARITY hasn't been set for cell.\n");
+        psError(PS_ERR_UNKNOWN, true, "CELL.XBIN hasn't been set for cell.\n");
         return false;
     }
     int yBinCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YBIN"); // Binning in y
     if (!mdok || yBin <= 0) {
-        psError(PS_ERR_UNKNOWN, true, "CELL.YPARITY hasn't been set for cell.\n");
+        psError(PS_ERR_UNKNOWN, true, "CELL.YBIN hasn't been set for cell.\n");
         return false;
     }
@@ -623 +623 @@
         psError(PS_ERR_UNKNOWN, true, "CELL.XBIN for cell is not set.\n");
         good = false;
-    }
-    if (xBin->data.S32[index] < *xBinMin) {
+    } else if (xBin->data.S32[index] < *xBinMin) {
         *xBinMin = xBin->data.S32[index];
     }
@@ -631 +630 @@
         psError(PS_ERR_UNKNOWN, true, "CELL.YBIN for cell is not set.\n");
         good = false;
-    }
-    if (yBin->data.S32[index] < *yBinMin) {
+    } else if (yBin->data.S32[index] < *yBinMin) {
         *yBinMin = yBin->data.S32[index];
     }