Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStack.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStack.c (modified) (5 diffs)

branches/eam_branches/20100225/ppStack/src/ppStack.c

@@ -19 +19 @@
     psTimerStart("PPSTACK_STEPS");
 
+    pmErrorRegister();
+    ppStackErrorRegister();
+    psphotErrorRegister();
+
     pmConfig *config = pmConfigRead(&argc, argv, PPSTACK_RECIPE); // Configuration
+    ppStackOptions *options = NULL;                               // Options for stacking
     if (!config) {
         goto die;
@@ -50 +55 @@
     }
 
-    if (!ppStackLoop(config)) {
+    options = ppStackOptionsAlloc();
+    if (!ppStackLoop(config, options)) {
         goto die;
     }
@@ -58 +64 @@
     // Common code for the death.
     {
-        psExit exitValue = PS_EXIT_SUCCESS;        // Exit value for program
-        psErrorCode errorCode = psErrorCodeLast(); // Error code
-        if (errorCode != PS_ERR_NONE) {
-            psErrorStackPrint(stderr, "Unable to perform stack.");
-            switch (errorCode) {
-              case PPSTACK_ERR_UNKNOWN:
-              case PS_ERR_UNKNOWN:
-                exitValue = PS_EXIT_UNKNOWN_ERROR;
-                break;
-              case PS_ERR_IO:
-              case PS_ERR_DB_CLIENT:
-              case PS_ERR_DB_SERVER:
-              case PS_ERR_BAD_FITS:
-              case PS_ERR_OS_CALL_FAILED:
-              case PPSTACK_ERR_IO:
-                exitValue = PS_EXIT_SYS_ERROR;
-                break;
-              case PS_ERR_BAD_PARAMETER_VALUE:
-              case PS_ERR_BAD_PARAMETER_TYPE:
-              case PS_ERR_BAD_PARAMETER_NULL:
-              case PS_ERR_BAD_PARAMETER_SIZE:
-              case PPSTACK_ERR_ARGUMENTS:
-              case PPSTACK_ERR_CONFIG:
-                exitValue = PS_EXIT_CONFIG_ERROR;
-                break;
-              case PPSTACK_ERR_PSF:
-              case PPSTACK_ERR_REJECTED:
-              case PPSTACK_ERR_DATA:
-                exitValue = PS_EXIT_DATA_ERROR;
-                break;
-              case PS_ERR_UNEXPECTED_NULL:
-              case PS_ERR_PROGRAMMING:
-              case PPSTACK_ERR_NOT_IMPLEMENTED:
-              case PPSTACK_ERR_PROG:
-              default:
-                // It's a programming error if we're not dealing with the error correctly
-                exitValue = PS_EXIT_PROG_ERROR;
-                break;
-            }
-        }
+        psExit exitValue = ppStackExitCode(PS_EXIT_SUCCESS); // Exit code
 
         // Ensure everything closes
@@ -103 +70 @@
             ppStackFileActivation(config, PPSTACK_FILES_PREPARE, true);
             ppStackFileActivation(config, PPSTACK_FILES_CONVOLVE, true);
-            ppStackFileActivation(config, PPSTACK_FILES_COMBINE, true);
+            ppStackFileActivation(config, PPSTACK_FILES_STACK, true);
+            ppStackFileActivation(config, PPSTACK_FILES_UNCONV, true);
             ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
             if (!ppStackFilesIterateUp(config)) {
-                psErrorStackPrint(stderr, "Unable to close files.");
+                psError(psErrorCodeLast(), false, "Unable to close files.");
+                exitValue = ppStackExitCode(exitValue);
+                pmFPAfileFreeSetStrict(false);
             }
+        }
+
+        // Write out summary statistics
+        if (options && options->stats) {
+
+            psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                             "Bad data quality flag", options->quality);
+            psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_STACK", 0,
+                             "Total time", psTimerClear("PPSTACK_TOTAL"));
+
+            const char *statsMDC = psMetadataConfigFormat(options->stats);
+            if (!statsMDC || strlen(statsMDC) == 0) {
+                psError(PS_ERR_IO, false, "Unable to get statistics MDC file.");
+                return false;
+            }
+            if (fprintf(options->statsFile, "%s", statsMDC) != strlen(statsMDC)) {
+                psError(PS_ERR_IO, false, "Unable to write statistics MDC file.");
+                return false;
+            }
+            psFree(statsMDC);
+            if (fclose(options->statsFile) == EOF) {
+                psError(PS_ERR_IO, false, "Unable to close statistics MDC file.");
+                return false;
+            }
+            options->statsFile = NULL;
+            pmConfigRunFilenameAddWrite(config, "STATS",
+                                        psMetadataLookupStr(NULL, config->arguments, "STATS"));
+        }
+        psFree(options);
+
+        // Dump configuration
+        bool mdok;                                                                    // Status of MD lookup
+        psString dump = psMetadataLookupStr(&mdok, config->arguments, "DUMP_CONFIG"); // File for config
+        if (dump && !pmConfigDump(config, dump)) {
+            psError(psErrorCodeLast(), false, "Unable to dump configuration.");
+            exitValue = ppStackExitCode(exitValue);
         }
 
@@ -119 +125 @@
         pmVisualClose();
 
+        exitValue = ppStackExitCode(exitValue);
         exit(exitValue);
     }