Changeset 29851 for branches/eam_branches/ipp-20101103/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Nov 26, 2010, 10:47:07 AM (16 years ago)

Author:

eugene

Message:

updates from trunk (non-linearity correction)

File:

• branches/eam_branches/ipp-20101103/ppImage/src/ppImageDetrendReadout.c (modified) (3 diffs)

branches/eam_branches/ipp-20101103/ppImage/src/ppImageDetrendReadout.c

@@ -51 +51 @@
     }
 
-
-# if 0
+    // Subtract the overscan
+    if (options->doOverscan) {
+      if (!pmOverscanSubtract (input, options->overscan)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to subtract overscan.");
+        psFree(detview);
+        return false;
+      }
+    }
+
     // Non-linearity correction
     if (options->doNonLin) {
-        ppImageDetrendNonLinear(detrend->input, input, options);
-    }
-# endif
+      if (!ppImageDetrendNonLinear(input,detview,config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to correct NonLinearity");
+        psFree(detview);
+        return(false);
+      }
+    }
 
     // set up the dark and bias
@@ -77 +87 @@
     }
 
-    // Bias, dark and overscan subtraction are all merged.
-    if (options->doBias || options->doOverscan) {
-        if (!pmBiasSubtract(input, options->overscan, bias, oldDark, view)) {
+    // Bias and temperature-independent-dark subtraction are merged.
+    if (options->doBias) {
+        if (!pmBiasSubtract(input, bias, oldDark, view)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.");
             psFree(detview);
@@ -85 +95 @@
         }
     }
-
+    
     // Weight on the basis of pixel value needs to be done after the overscan has been subtracted
     if (options->doVarianceBuild) {