Changeset 29833 for trunk/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Nov 25, 2010, 9:45:07 PM (15 years ago)

Author:

watersc1

Message:

Merge of czw_branch/20100817 into trunk. This includes the non-linearity correction application code.

Location:

trunk

Files:

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

trunk/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
+      //      linearity = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.LINEARITY");
+      if (!ppImageDetrendNonLinear(input,detview,config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to correct NonLinearity");
+        psFree(detview);
+        return(false);
+      }
+      /*       ppImageDetrendNonLinear(detrend->input, input, options); */
+    }
 
     // set up the dark and bias
@@ -77 +89 @@
     }
 
-    // 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 +97 @@
         }
     }
-
+    
     // Weight on the basis of pixel value needs to be done after the overscan has been subtracted
     if (options->doVarianceBuild) {