Changeset 13772 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Jun 12, 2007, 5:23:00 PM (19 years ago)

Author:

Paul Price

Message:

Fixing typo.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (8 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -144 +144 @@
 
     psRegion toRead = *fullImage;  // full image region
-    
+
     int dX = 0;
     int dY = 0;
@@ -153 +153 @@
         toRead.y0 = PS_MAX (toRead.y0, min);
         toRead.y1 = PS_MIN (toRead.y1, max);
-        nRead = toRead.y1 - toRead.y0;
-        if (min < fullImage->y0) {
-            dY = toRead.y0;
-        }
-        nX = toRead.x1 - toRead.x0;
-        nY = nScans;
+        nRead = toRead.y1 - toRead.y0;
+        if (min < fullImage->y0) {
+            dY = toRead.y0;
+        }
+        nX = toRead.x1 - toRead.x0;
+        nY = nScans;
     } else {
         toRead.x0 = PS_MAX (toRead.x0, min);
         toRead.x1 = PS_MIN (toRead.x1, max);
-        nRead = toRead.x1 - toRead.x0;
-        if (min < fullImage->x0) {
-            dX = toRead.x0;
-        }
-        nX = nScans;
-        nY = toRead.y1 - toRead.y0;
+        nRead = toRead.x1 - toRead.x0;
+        if (min < fullImage->x0) {
+            dX = toRead.x0;
+        }
+        nX = nScans;
+        nY = toRead.y1 - toRead.y0;
     }
 
@@ -339 +339 @@
     if (success) {
         if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
-            psError(PS_ERR_IO, false, "Failed to read concepts for FPA.\n");
+            psError(PS_ERR_IO, false, "Failed to read concepts for chip.\n");
             return false;
         }
@@ -405 +405 @@
     pmHDU *hdu = pmHDUFromCell(cell);   // The HDU
     if (!hdu || hdu->blankPHU) {
-        // XXX is this an error condition?
-        *status = true;
+        // XXX is this an error condition?
+        *status = true;
         return false;
     }
@@ -453 +453 @@
     if (naxis == 0) {
         // No pixels to read, as for a PHU.
-        *status = true;
+        *status = true;
         return false;
     }
@@ -471 +471 @@
     if (z >= naxis3) {
         // Nothing to see here.  Move along.
-        *status = true;
+        *status = true;
         return false;
     }
@@ -503 +503 @@
     }
 
-    int offset;                         // start of the segment
-    int upper;                          // end of the segment
-    int lastScan;                       // last possible scan
+    int offset;                         // start of the segment
+    int upper;                          // end of the segment
+    int lastScan;                       // last possible scan
 
     // Calculate the segment offset and upper limit, adjust readout->row0,col0
     if (readdir == 1) {
-        // Reading rows
-        offset = (readout->image) ? readout->row0 + numScans : 0; // extend to next section or start at beginning?
-        offset = (numScans == 0) ? trimsec->x0 : offset; // full array ? read full trimsec : read section
-        readout->row0 = offset;
-        readout->col0 = trimsec->x0;
-        lastScan = trimsec->y1;
+        // Reading rows
+        offset = (readout->image) ? readout->row0 + numScans : 0; // extend to next section or start at beginning?
+        offset = (numScans == 0) ? trimsec->x0 : offset; // full array ? read full trimsec : read section
+        readout->row0 = offset;
+        readout->col0 = trimsec->x0;
+        lastScan = trimsec->y1;
     } else {
-        // Reading cols
-        offset = (readout->image) ? readout->col0 + numScans : 0;
-        offset = (numScans == 0) ? trimsec->y0 : offset; // full array ? read full trimsec : read section
-        readout->col0 = offset;
-        readout->row0 = trimsec->y0;
-        lastScan = trimsec->x1;
+        // Reading cols
+        offset = (readout->image) ? readout->col0 + numScans : 0;
+        offset = (numScans == 0) ? trimsec->y0 : offset; // full array ? read full trimsec : read section
+        readout->col0 = offset;
+        readout->row0 = trimsec->y0;
+        lastScan = trimsec->x1;
     }
     upper = offset + numScans;
@@ -537 +537 @@
         // We've read everything there is
         psTrace("psModules.camera", 7, "Read everything.\n");
-        *status = true;
+        *status = true;
         return false;
     }