Changeset 34041 for branches/meh_branches/ppstack_test/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/ppImage/src/ppImageDetrendReadout.c

@@ -35 +35 @@
       }
     }
-
+    // Check to see if we're in a chip that contains video
+    bool hasVideo = false;
+    {
+      if (psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE")) {
+        psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+        char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
+        if (Vptr) {
+          hasVideo = true;
+          psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+        }
+      }
+    }
+
+    
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
     if (options->doMaskBuild) {
@@ -44 +57 @@
     // apply the externally supplied mask to the input->mask pixels
     if (options->doMask) {
-        pmReadout *mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
-        pmMaskBadPixels(input, mask, options->maskValue);
+      pmReadout *mask;
+      if ((options->useVideoMask)&&(hasVideo)) {
+        mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.VIDEOMASK");
+      }
+      else {
+        mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
+      }
+      pmMaskBadPixels(input, mask, options->maskValue);
     }
     if (options->doMaskBurntool) {
@@ -80 +99 @@
         psMetadata *recipe = psMetadataLookupPtr (&mdok, config->recipes, RECIPE_NAME);
         assert(mdok && recipe);
-        if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+
+        if ((options->useVideoDark)&&(hasVideo)) {
+          if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+            oldDark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.VIDEODARK");
+          } else {
+            dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.VIDEODARK");
+          }
+        }
+        else {
+          if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
             oldDark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.DARK");
-        } else {
+          } else {
             dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.DARK");
-        }
+          }
+        }
     }
 
@@ -110 +139 @@
             // offset information, we are not really getting exactly the right mapping from the
             // original file.
+            // CZW 2012-03-21: I do not believe this is true anymore.  In any case, this seems to be what
+            //                 ppImageReplaceBackground does to do sky subtraction.
             psImageBinning *binning = psImageBinningAlloc();
             binning->nXruff = noiseMap->image->numCols;
@@ -119 +150 @@
             psImageUnbin (noiseImage, noiseMap->image, binning);
             psFree (binning);
+            // Stolen from pmSkySubtract.c
+            // CZW: Unneeded, as psImageUnbin does the bilinear interpolation?  It still looks blocky. 
+/*          psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, RECIPE_NAME); // Recipe */
+/*          psAssert(recipe, "Should be there!"); */
+
+/*          psS32 xBinFactor = psMetadataLookupS32(NULL,recipe,"NOISE.XBIN"); */
+/*          psS32 yBinFactor = psMetadataLookupS32(NULL,recipe,"NOISE.YBIN"); */
+/*          psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, */
+/*                                                                             noiseMap->image, */
+/*                                                                             NULL, NULL, */
+/*                                                                             0, 0.0, 0.0, 0, 0, 0.0); */
+/*          for (psS32 row = 0; row < input->image->numRows; row++) { */
+/*            for (psS32 col = 0; col < input->image->numCols; col++) { */
+/*              // We calculate the F32 value of the pixel coordinates in the */
+/*              // binned image and then use a pixel interpolation routine to */
+/*              // determine the value of the pixel at that location. */
+/*              psF32 binRowF64 = ((psF32) row) / ((psF32) yBinFactor); */
+/*              psF32 binColF64 = ((psF32) col) / ((psF32) xBinFactor); */
+/*              // We add 0.5 to the pixel locations since the pixel */
+/*              // interpolation routine defines the location of pixel */
+/*              // (i, j) as (i+0.5, j+0.5). */
+/*              binRowF64+= 0.5; */
+/*              binColF64+= 0.5; */
+
+/*              double binPixel; */
+/*              if (!psImagePixelInterpolate(&binPixel, NULL, NULL, binColF64, binRowF64, interp)) { */
+/*                psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image."); */
+/*                psFree(interp); */
+/*                psFree(noiseImage); */
+/*                return NULL; */
+/*              } */
+/*              noiseImage->data.F32[row][col] = binPixel; */
+/*            } */
+/*          } */
+/*          psFree(interp); */
         }