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

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

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

trunk/psModules/src/camera/pmFPARead.c

@@ -35 +35 @@
     if (psRegionIsBad(*trimsec)) {
         psString regionString = psRegionToString(*trimsec);
-        psError(PS_ERR_IO, true, "Invalid trim section: %s\n", regionString);
+        psError(PS_ERR_UNKNOWN, true, "Invalid trim section: %s\n", regionString);
         psFree(regionString);
         psFree(readout);
@@ -319 +319 @@
     }
     if (!hdu->images && !pmHDURead(hdu, fits)) {
-        psError(PS_ERR_IO, false, "Unable to read HDU for cell.\n");
-        return false;
-    }
-
-    pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
+        psError(PS_ERR_UNKNOWN, false, "Unable to read HDU for cell.\n");
+        return false;
+    }
+
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
+        return false;
+    }
 
     // Having read the cell, we now have to cut it up
@@ -397 +400 @@
         pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
     } else {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to read any chips in FPA.\n");
+        psError(PS_ERR_UNKNOWN, false, "Unable to read any chips in FPA");
     }