Changeset 35747 for branches/eam_branches/ipp-20130509/ppImage/src/ppImageDetrendReadout.c

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ppImage/src

Files:

• . (modified) (1 prop)
• ppImageDetrendReadout.c (modified) (2 diffs)

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

@@ -56 +56 @@
     }
     done_video_check:
-    
+
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
     if (options->doMaskBuild) {
@@ -74 +74 @@
       pmMaskBadPixels(input, mask, options->maskValue);
     }
+
+    if (options->doApplyBurntool)
+    {
+        // extern bool ppImageBurntoolApply(pmConfig *, ppImageOptions *, pmFPAview *, pmReadout *);
+        ppImageBurntoolApply(config, options, view, input);
+    }
+    
     if (options->doMaskBurntool) {
-      ppImageBurntoolMask(config,options,view,input);
+        if (options->doApplyBurntool) {
+            // build burntool mask from data input burntool table
+            ppImageBurntoolMaskFromTable(config,options,view,input);
+        } else {
+            // build burntool mask from data in the input image's fits extension
+            ppImageBurntoolMask(config,options,view,input);
+        }
     }