Changeset 26693 for branches/eam_branches/20091201/ppImage/src/ppImageLoop.c

Timestamp:

Jan 27, 2010, 11:23:32 AM (16 years ago)

Author:

Paul Price

Message:

Pulling in pattern subtraction enhancements from trunk (rr26682,26692) into Gene's branch. Small conflicts in ippconfig/gpc1/ppImage.config easily resolved.

Location:

branches/eam_branches/20091201

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageLoop.c (modified) (4 diffs)

branches/eam_branches/20091201/ppImage/src/ppImageLoop.c

@@ -100 +100 @@
 
                 // flip the image to match the native detector orientation (to match bias, flat, etc)
-                if (!ppImageParityFlip(config, options, view, true)) {
+                if (!ppImageParityFlip(config, options, view, true)) {
                     ESCAPE("Unable to detrend readout");
                 }
@@ -131 +131 @@
 
             // process each of the readouts
-            // XXX reset the view to the first readout?
+            // XXX reset the view to the first readout?
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
                 if (!readout->data_exists) {
@@ -140 +140 @@
                     ESCAPE("Unable to detrend readout");
                 }
-            }
+            }
 
             // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
@@ -163 +163 @@
         }
 
-        // Apply the pattern noise correction
-        if (options->doPattern) {
-          if (!ppImageDetrendPatternApply(config,chip,view,options)) {
-            ESCAPE("Unable to apply pattern corrections");
-          }
-        }
-        
+        // Apply the pattern noise correction
+        if (options->doPattern) {
+          if (!ppImageDetrendPatternApply(config,chip,view,options)) {
+            ESCAPE("Unable to apply pattern corrections");
+          }
+        }
+
         // measure various pixel-based statistics for this image
         if (!ppImagePixelStats(config, stats, options, view)) {