Changeset 33590 for trunk/ppImage/src

Timestamp:

Mar 21, 2012, 5:02:21 PM (14 years ago)

Author:

watersc1

Message:

Tell ppImage how to construct a noise map, and add appropriate recipes for this.

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (2 diffs)
• ppImageCheckNoise.c (added)
• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageLoop.c (modified) (1 diff)
• ppImageOptions.c (modified) (2 diffs)

trunk/ppImage/src/Makefile.am

@@ -59 +59 @@
         ppImageParityFlip.c \
         ppImageCheckCTE.c \
+        ppImageCheckNoise.c \
         ppImageFileCheck.c \
         ppImageVersion.c \

trunk/ppImage/src/ppImage.h

@@ -48 +48 @@
     bool doStats;                       // call ppStats on the image
     bool checkCTE;                      // measure pixel-based variance
+    bool checkNoise;                    // measure cell-level variance
     bool applyParity;                   // Apply Cell parities
 
@@ -172 +173 @@
 bool ppImageCheckCTE(pmConfig *config, ppImageOptions *options, pmFPAview *view);
 
+bool ppImageCheckNoise(pmConfig *config, ppImageOptions *options, pmFPAview *view);
+
 bool ppImageBurntoolMask(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *mask);
 

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -110 +110 @@
             // 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 +121 @@
             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); */
         }
 

trunk/ppImage/src/ppImageLoop.c

@@ -126 +126 @@
                 }
 
+                if (!ppImageCheckNoise (config, options, view)) {
+                    ESCAPE("Unable to generate noisemap");
+                }
+                
                 // optionally degrade a MD image to 3pi exposure times
                 if (!ppImageAddNoise(config, options, view, input->fpa)){

trunk/ppImage/src/ppImageOptions.c

@@ -41 +41 @@
     options->doStats         = false;   // Measure and save image statistics
     options->checkCTE        = false;   // Measure pixel-based variance
+    options->checkNoise      = false;   // Measure cell-level variances.
     options->applyParity     = false;   // Apply Cell parities
     options->doMaskStats     = false;   // Calculate mask fractions
@@ -319 +320 @@
 
     options->checkCTE       = psMetadataLookupBool(NULL, recipe, "CHECK.CTE");
+    options->checkNoise     = psMetadataLookupBool(NULL, recipe, "CHECK.NOISE");
 
     /* doMaskBuild : there are some cases where we require a mask, so we force doMaskBuild to be set even if the user specified 'FALSE'