Changeset 25022 for branches/eam_branches/20090715/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

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

branches/eam_branches/20090715/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);
     }
 
@@ -119 +119 @@
         pmReadout *flat = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat, options->flatMask)) {
+            psFree(detview);
+            return false;
+        }
+    }
+
+    // Pattern noise correction
+    if (options->doPattern) {
+        if (!pmPatternRow(input, options->patternOrder, options->patternIter, options->patternRej,
+                          options->patternThresh, options->patternMean, options->patternStdev,
+                          options->maskValue, options->darkMask)) {
             psFree(detview);
             return false;