Changeset 19846

Timestamp:

Oct 2, 2008, 10:50:19 AM (18 years ago)

Author:

eugene

Message:

CELL.READDIR must be 1 (rows) or 2 (cols)

File:

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

trunk/psModules/src/detrend/pmOverscan.c

@@ -293 +293 @@
     } 
 
+    bool mdok = false;
+
     // We are performing a row-by-row overscan subtraction
-    bool readRows = psMetadataLookupBool(NULL, input->parent->concepts, "CELL.READDIR"); // Read direction
+    int cellreaddir = psMetadataLookupS32(&mdok, input->parent->concepts, "CELL.READDIR"); // Read direction
+    if ((cellreaddir != 1) && (cellreaddir != 2)) {
+        psError(PS_ERR_UNKNOWN, true, "CELL.READDIR must be 1 (rows) or 2 (cols)\n");
+        return false;
+    }
+
     float chi2 = NAN;           // chi^2 from fit
 
     // adjust operation depending on the read direction : need to re-org pixels for columns
-    if (readRows) {
+    if (cellreaddir == 1) {
         // The read direction is rows
         psArray *pixels = psArrayAlloc(image->numRows); // Array of vectors containing pixels
@@ -344 +351 @@
         }
         psFree(reduced);
-    } else {
+    } 
+    if (cellreaddir == 2) {
         // The read direction is columns
         psArray *pixels = psArrayAlloc(image->numCols); // Array of vectors containing pixels