Changeset 27838 for branches/tap_branches/ppImage/src/ppImageLoop.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

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

branches/tap_branches/ppImage/src/ppImageLoop.c

@@ -8 +8 @@
   psError(PS_ERR_UNKNOWN, false, MESSAGE); \
   psFree(view); \
+  pmFPAfileFreeSetStrict(false); \
   return false; \
 }
@@ -100 +101 @@
 
                 // 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 +132 @@
 
             // 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 +141 @@
                     ESCAPE("Unable to detrend readout");
                 }
-            }
+            }
 
             // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
@@ -161 +162 @@
         if (!ppImageFringeFree (config, view)) {
             ESCAPE("Unable to free fringe images");
+        }
+
+        // Apply the pattern correction
+        if (options->doPatternRow || options->doPatternCell) {
+          if (!ppImageDetrendPatternApply(config,chip,view,options)) {
+            ESCAPE("Unable to apply pattern corrections");
+          }
         }