Changeset 18724

Timestamp:

Jul 24, 2008, 3:58:31 PM (18 years ago)

Author:

eugene

Message:

set masked pixels in binned images to maskedValue if requested (needs modified version of API)

Location:

trunk/ppImage/src

Files:

• ppImage.h (modified) (1 diff)
• ppImageLoop.c (modified) (2 diffs)
• ppImageRebinReadout.c (modified) (4 diffs)

trunk/ppImage/src/ppImage.h

@@ -123 +123 @@
 pmReadout* ppImageDetrendSelectFirst(pmCell *cell, char *name, bool doThis);
 
-bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName);
-bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile);
+bool ppImageRebinChip (pmConfig *config, pmFPAview *view, ppImageOptions *options, char *outName);
+bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile, ppImageOptions *options);
 
 bool ppImagePhotom (pmConfig *config, pmFPAview *view);

trunk/ppImage/src/ppImageLoop.c

@@ -87 +87 @@
             ESCAPE ("Unable to mosaic chip");
 
-        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1"))
-            ESCAPE ("Unable to bin chip (level 1).");
-
-        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2"))
-            ESCAPE ("Unable to bin chip (level 2).");
-
         // we perform photometry on the readouts of this chip in the output
         if (options->doPhotom) {
@@ -103 +97 @@
                 ESCAPE ("Unable to replace masked pixels with background level");
         }
+
+        // binning (used for display) must take place after the background is replaced, if desired
+        if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN1"))
+            ESCAPE ("Unable to bin chip (level 1).");
+
+        if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN2"))
+            ESCAPE ("Unable to bin chip (level 2).");
 
         // Close cells (XXX shouldn't pmFPAfileClose iterate down as needed?)

trunk/ppImage/src/ppImageRebinReadout.c

@@ -5 +5 @@
 #include "ppImage.h"
 
-bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName) {
+bool ppImageRebinChip (pmConfig *config, pmFPAview *view, ppImageOptions *options, char *outName) {
 
     pmCell *cell;
@@ -33 +33 @@
 
             // run the rebin code
-            ppImageRebinReadout (outReadout, inReadout, outFile);
+            ppImageRebinReadout (outReadout, inReadout, outFile, options);
         }
 
@@ -61 +61 @@
 
 // XXX this should be made consistent with psImageBinning
-bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile)
+bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile, ppImageOptions *options)
 {
     PS_ASSERT_PTR_NON_NULL(output, false);
@@ -80 +80 @@
     int nY = input->image->numRows;
 
+    // we should *either* skip masked pixels or replace masked pixels with the specified value 
+    
+
     // do the rebinning by hand, mean only for test
     for (int yOut = 0; yOut < output->image->numRows; yOut++) {
         for (int xOut = 0; xOut < output->image->numCols; xOut++) {
+            float maskedValue = 0.0;
             float value = 0;
             int nPix = 0;
             for (int yIn = yOut * dY; (yIn < yOut * dY + dY) && (yIn < nY); yIn ++) {
                 for (int xIn = xOut * dX; (xIn < xOut * dX + dX) && (xIn < nX); xIn ++) {
-                    if (input->mask && input->mask->data.U8[yIn][xIn]) continue;
+                    if (input->mask && input->mask->data.U8[yIn][xIn]) {
+                      maskedValue = input->image->data.F32[yIn][xIn];
+                      continue;
+                    }
                     value += input->image->data.F32[yIn][xIn];
                     nPix ++;
                 }
             }
-            output->image->data.F32[yOut][xOut] = value / nPix;
+            if (nPix > 0) {
+              output->image->data.F32[yOut][xOut] = value / nPix;
+            } else {
+              if (options->replaceMasked) {
+                output->image->data.F32[yOut][xOut] = maskedValue;
+              } else {
+                output->image->data.F32[yOut][xOut] = 0.0;
+              }
+            }
         }
     }