Changeset 24891

Timestamp:

Jul 22, 2009, 9:28:22 AM (17 years ago)

Author:

Paul Price

Message:

Adding code to fit and subtraction pattern noise; intended to replace tiltystreaks.

Location:

trunk

Files:

• ippconfig/recipes/ppImage.config (modified) (1 diff)
• ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)
• psModules/src/detrend/Makefile.am (modified) (2 diffs)
• psModules/src/detrend/pmPattern.c (added)
• psModules/src/detrend/pmPattern.h (added)
• psModules/src/psmodules.h (modified) (1 diff)

trunk/ippconfig/recipes/ppImage.config

@@ -25 +25 @@
 USE.DEBURNED.IMAGE BOOL    FALSE           # use burntool-repaired image?
 TILTYSTREAK.APPLY  BOOL    FALSE           # apply the 'tiltystreak' tool
+
+PATTERN            BOOL    FALSE           # Fit and remove pattern noise?
+PATTERN.ORDER      S32     1               # Polynomial order
+PATTERN.ITER       S32     3               # Rejection iterations
+PATTERN.REJ        F32     2.0             # Rejection threshold
+PATTERN.MEAN       STR     ROBUST_MEDIAN   # Statistic for mean
+PATTERN.STDEV      STR     ROBUST_STDEV    # Statistic for standard deviation
+
 
 TILTYSTREAK.BY.CLASS METADATA              # apply the 'tiltystreak' tool

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -64 +64 @@
     if (options->doVarianceBuild) {
         // create the target mask and variance images
-        psImage *noiseImage = NULL;
-        if (options->doNoiseMap) {
-            // XXX convert the noiseMap image to a binned image
-            pmReadout *noiseMap = NULL;
-            noiseMap = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.NOISEMAP");
-            noiseImage = psImageCopy (NULL, input->image, PS_TYPE_F32);
-            psImageInit (noiseImage, 0.0);
-
-            // XXX this works, but is not really quite right: the model shoud include the
-            // offset information, we are not really getting exactly the right mapping from the
-            // original file.
-            psImageBinning *binning = psImageBinningAlloc();
-            binning->nXruff = noiseMap->image->numCols;
-            binning->nYruff = noiseMap->image->numRows;
-            binning->nXfine = input->image->numCols;
-            binning->nYfine = input->image->numRows;
-            psImageBinningSetScale(binning, PS_IMAGE_BINNING_LEFT);
-
-            psImageUnbin (noiseImage, noiseMap->image, binning);
-            psFree (binning);
-        }
+        psImage *noiseImage = NULL;
+        if (options->doNoiseMap) {
+            // XXX convert the noiseMap image to a binned image
+            pmReadout *noiseMap = NULL;
+            noiseMap = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.NOISEMAP");
+            noiseImage = psImageCopy (NULL, input->image, PS_TYPE_F32);
+            psImageInit (noiseImage, 0.0);
+
+            // XXX this works, but is not really quite right: the model shoud include the
+            // offset information, we are not really getting exactly the right mapping from the
+            // original file.
+            psImageBinning *binning = psImageBinningAlloc();
+            binning->nXruff = noiseMap->image->numCols;
+            binning->nYruff = noiseMap->image->numRows;
+            binning->nXfine = input->image->numCols;
+            binning->nYfine = input->image->numRows;
+            psImageBinningSetScale(binning, PS_IMAGE_BINNING_LEFT);
+
+            psImageUnbin (noiseImage, noiseMap->image, binning);
+            psFree (binning);
+        }
         pmReadoutGenerateVariance(input, noiseImage, true);
-        psFree (noiseImage);
+        psFree (noiseImage);
     }
 
@@ -123 +123 @@
         }
     }
+
+    // Pattern noise correction
+    if (options->doPattern) {
+        if (!pmPatternRow(input, options->patternOrder, 
+options->patternIter, options->patternRej, options->patternMean, 
+options->patternStdev)) {
+                psFree(detview);
+                return false;
+            }
+        }
+
 
     // Normalization by a single (known) constant

trunk/psModules/src/detrend/Makefile.am

@@ -16 +16 @@
         pmShifts.c \
         pmDark.c \
-        pmRemnance.c
+        pmRemnance.c \
+        pmPattern.c
 
 #       pmSkySubtract.c
@@ -33 +34 @@
         pmShifts.h \
         pmDark.h \
-        pmRemnance.h
+        pmRemnance.h \
+        pmPattern.h
 
 #       pmSkySubtract.h

trunk/psModules/src/psmodules.h

@@ -77 +77 @@
 #include <pmDark.h>
 #include <pmRemnance.h>
+#include <pmPattern.h>
 
 // the following headers are from psModule:astrom