Changeset 6618 for branches/rel10_ifa/psModules/src/astrom/pmFPARead.c

Timestamp:

Mar 16, 2006, 3:47:44 PM (20 years ago)

Author:

Paul Price

Message:

PHU=NONE (i.e., megacam split) now working, with concept ingest; changed definition of pmFPAAddSource to return a pmFPAview

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPARead.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPARead.c

@@ -137 +137 @@
 #endif
 
+static bool badRegion(const psRegion *region)
+{
+    return isnan(region->x0) || isnan(region->x1) || isnan(region->y0) || isnan(region->y1);
+}
 
 // Carve a readout from the image pixels
@@ -148 +152 @@
 
     // The image corresponding to the trim region
+    if (badRegion(trimsec)) {
+        psString regionString = psRegionToString(*trimsec);
+        psError(PS_ERR_IO, true, "Invalid trim section: %s\n", regionString);
+        psFree(regionString);
+        psFree(readout);
+        return NULL;
+    }
     readout->image = psMemIncrRefCounter(psImageSubset(image, *trimsec));
 
@@ -154 +165 @@
     psRegion *biassec = NULL;       // A BIASSEC region from the list
     while ((biassec = psListGetAndIncrement(iter))) {
+        if (badRegion(trimsec)) {
+            psString regionString = psRegionToString(*biassec);
+            psError(PS_ERR_IO, true, "Invalid bias section: %s\n", regionString);
+            psFree(regionString);
+            psFree(readout);
+            return NULL;
+        }
         psImage *overscan = psMemIncrRefCounter(psImageSubset(image, *biassec));
         psListAdd(readout->bias, PS_LIST_TAIL, overscan);
@@ -192 +210 @@
     }
 
-    pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, NULL);
+    pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
 
     // Having read the cell, we now have to cut it up
@@ -216 +234 @@
                )
 {
+    bool success = false;               // Were we able to read at least one HDU?
     psArray *cells = chip->cells;       // Array of cells
     for (int i = 0; i < cells->n; i++) {
         pmCell *cell = cells->data[i];  // The cell of interest
-        if (!pmCellRead(cell, fits, db)) {
-            psError(PS_ERR_IO, false, "Unable to read cell %d.\n", i);
-            return false;
-        }
-        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, NULL);
-    }
-
-    return true;
+        success |= pmCellRead(cell, fits, db);
+    }
+    if (success) {
+        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, false, NULL);
+    }
+
+    return success;
 }
 
@@ -235 +253 @@
               )
 {
-    psArray *chips = fpa->chips;       // Array of chips
+    bool success = false;               // Were we able to read at least one HDU?
+    psArray *chips = fpa->chips;        // Array of chips
     for (int i = 0; i < chips->n; i++) {
         pmChip *chip = chips->data[i];  // The cell of interest
-        if (!pmChipRead(chip, fits, db)) {
-            psError(PS_ERR_IO, false, "Unable to read chip %d.\n", i);
-            return false;
-        }
+        success |= pmChipRead(chip, fits, db);
+    }
+    if (success) {
         pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
-    }
-
-    return true;
+    } else {
+        psLogMsg(__func__, PS_LOG_WARN, "Unable to read any chips in FPA.\n");
+    }
+
+    return success;
 }