Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageDetrendReadout.c

@@ -65 +65 @@
         psImageMaskType satMask = options->doMaskSat ? options->satMask : 0;
         psImageMaskType lowMask = options->doMaskLow ? options->lowMask : 0;
-        pmReadoutGenerateMask(input, satMask, lowMask);
+        if (!pmReadoutGenerateMask(input, satMask, lowMask)) {
+          psError(PS_ERR_UNKNOWN, false, "Unable to generate a mask.");
+          psFree(detview);
+          return false;
+        }
         // psLogMsg ("ppImage", 6, "generate mask: %f sec\n", psTimerMark ("detrend.readout"));
     }
@@ -219 +223 @@
         }
 
-        pmReadoutGenerateVariance(input, noiseImage, true);
+        if (!pmReadoutGenerateVariance(input, noiseImage, true)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate a variance image.");
+            psFree(detview);
+            return false;
+        }
         psFree (noiseImage);
         // psLogMsg ("ppImage", 6, "generate variance: %f sec\n", psTimerMark ("detrend.readout"));