Changeset 42214

Timestamp:

May 19, 2022, 8:44:23 AM (4 years ago)

Author:

eugene

Message:

do not raise an error if the background cannot be modeled due to lack of pixels (quality error); add comment on Rebin Readout inefficiency; need to have a return value

Location:

branches/eam_branches/ipp-20220316/ppImage/src

Files:

• ppImageDetrendPattern.c (modified) (1 diff)
• ppImageRebinReadout.c (modified) (1 diff)
• ppImageReplaceBackground.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/ppImage/src/ppImageDetrendPattern.c

@@ -311 +311 @@
         }
     }
-
+    return true;
 }
 

branches/eam_branches/ipp-20220316/ppImage/src/ppImageRebinReadout.c

@@ -35 +35 @@
 
             // run the rebin code
+            // XXX EAM 2022.04.21 : this function rebins the signal image and makes an attempt to
+            // generate a mask only with bits raised in masked pixels that have > 50% of input pixels masked.
+            // this step is very expensive because it must count the input mask bits for each pixel.
+            // What is particularly silly is that the mask is not even used in the jpeg image.
             if (!pmReadoutRebin(outReadout, inReadout, options->maskValue, outFile->xBin, outFile->yBin)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to rebin readout.");

branches/eam_branches/ipp-20220316/ppImage/src/ppImageReplaceBackground.c

@@ -81 +81 @@
     if (!modelFile || !modelRO) {
         if (!psphotModelBackgroundReadoutFileIndex(config, &roView, "PPIMAGE.CHIP", 0)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to model background");
-            return false;
+            int lastError = psErrorCodeLast();
+            if (lastError == PSPHOT_ERR_DATA) {
+              // a data error in psphotModelBackground* means an empty or bad image: skip background subtraction
+              psErrorStackPrint(stderr, "Unable to model background");
+              psErrorClear();
+              return true;
+            } else {
+              psError(PS_ERR_UNKNOWN, false, "Unable to model background");
+              return false;
+            }
         }
         // the model file should now at least be defined