Changeset 25847 for trunk/ppImage/src/ppImageLoop.c

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.

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (3 diffs)

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.");
+        }
     }