Changeset 26982 for trunk/ppSub/src/ppSubReadoutPhotometry.c

Timestamp:

Feb 17, 2010, 5:36:13 PM (16 years ago)

Author:

Paul Price

Message:

Being better about errors and their mapping to exit codes.

File:

• trunk/ppSub/src/ppSubReadoutPhotometry.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadoutPhotometry.c

@@ -53 +53 @@
     pmFPAfile *inFile = psMetadataLookupPtr(&mdok, config->files, name); // Input file
     if (!pmFPACopy(photFile->fpa, inFile->fpa)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to copy FPA for photometry");
+        psError(PPSUB_ERR_CONFIG, false, "Unable to copy FPA for photometry");
         psFree(view);
         return false;
@@ -111 +111 @@
     if (!data->quality) {
         if (!psMetadataCopySingle(inRO->analysis, photRO->analysis, "PSPHOT.DETECTIONS")) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to copy PSPHOT.DETECTIONS");
+            psError(PPSUB_ERR_PROG, false, "Unable to copy PSPHOT.DETECTIONS");
             return false;
         }
         if (!psMetadataCopySingle(inRO->analysis, photRO->analysis, "PSPHOT.HEADER")) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to copy PSPHOT.HEADER");
+            psError(PPSUB_ERR_PROG, false, "Unable to copy PSPHOT.HEADER");
             return false;
         }
         if (!psMetadataCopySingle(inRO->analysis, photRO->analysis, PM_DETEFF_ANALYSIS)) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to copy Detection Efficiency");
+            psError(PPSUB_ERR_PROG, false, "Unable to copy Detection Efficiency");
             return false;
         }