Changeset 25847

Timestamp:

Oct 14, 2009, 5:36:51 PM (17 years ago)

Author:

Paul Price

Message:

Generate an error if the configuration dumping doesn't work.

Location:

trunk

Files:

• ppImage/src/ppImageLoop.c (modified) (3 diffs)
• ppStack/src/ppStackFinish.c (modified) (1 diff)
• ppSub/src/ppSub.c (modified) (1 diff)
• ppSub/src/ppSubData.c (modified) (1 diff)
• pswarp/src/pswarpLoop.c (modified) (1 diff)

trunk/ppImage/src/ppImageLoop.c

@@ -51 +51 @@
         }
 
-        // crosstalk measurement needs to be done on the entire chip at once, and before
-        // signal levels are modified by the detrending.  If crosstalk measurement is
-        // requested, the read-level for the images is set to CHIP.
-        if (!ppImageMeasureCrosstalk(config, options, view)) {
-          ESCAPE("Unable to perform crosstalk correction");
-        }
-
-        // crosstalk correction needs to be done on the entire chip at once, and before
-        // signal levels are modified by the detrending.  If crosstalk correction is
-        // requested, the read-level for the images is set to CHIP.
-        if (!ppImageCorrectCrosstalk(config, options, view)) {
-          ESCAPE("Unable to perform crosstalk correction");
-        }
+        // crosstalk measurement needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk measurement is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageMeasureCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
+
+        // crosstalk correction needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk correction is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageCorrectCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
 
         psTimerStart(TIMER_DETREND);
@@ -104 +104 @@
                 }
 
-                // XXX TEST:
-                // psphotSaveImage (NULL, readout->image, "test.image.fits");
+                // XXX TEST:
+                // psphotSaveImage (NULL, readout->image, "test.image.fits");
 
                 // XXX set the options->*Mask values here (after the mask images have been loaded
@@ -250 +250 @@
     psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
     if (dump_file) {
-        pmConfigDump(config, dump_file);
+        if (!pmConfigDump(config, dump_file)) {
+            ESCAPE("Unable to dump configuration.");
+        }
     }
 

trunk/ppStack/src/ppStackFinish.c

@@ -66 +66 @@
     psString dump = psMetadataLookupStr(&mdok, config->arguments, "DUMP_CONFIG"); // File for config
     if (dump) {
-        pmConfigDump(config, dump);
+        if (!pmConfigDump(config, dump)) {
+            psError(PS_ERR_IO, false, "Unable to dump configuration.");
+            return false;
+        }
     }
 

trunk/ppSub/src/ppSub.c

@@ -76 +76 @@
     psTimerStop();
 
+    psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
+    if (dump_file) {
+        if (!pmConfigDump(data->config, dump_file)) {
+            psErrorStackPrint(stderr, "Unable to dump configuration.\n");
+            exitValue = PS_EXIT_SYS_ERROR;
+        }
+    }
     psFree(data);
 

trunk/ppSub/src/ppSubData.c

@@ -29 +29 @@
     psFree(data->stats);
 
-    psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
-    if (dump_file) {
-        pmConfigDump(data->config, dump_file);
-    }
     psFree(data->config);
 

trunk/pswarp/src/pswarpLoop.c

@@ -488 +488 @@
     psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
     if (dump_file) {
-        pmConfigDump(config, dump_file);
+        if (!pmConfigDump(config, dump_file)) {
+            psError(PS_ERR_IO, false, "Unable to dump configuration");
+            return false;
+        }
     }