Changeset 35685 for trunk/ppImage

Timestamp:

Jun 19, 2013, 10:21:44 AM (13 years ago)

Author:

bills

Message:

Add ppImage recipe value APPLY.BURNTOOL defaults to TRUE.
If USE.DEBURNED.IMAGE is set burntool will be applied in ppImage
if APPLY.BURNTOOL is true. If APPLY.BURNTOOL is false burntool will
be applied using the burntool program by chip_imfile.pl. If USE.DEBURNED.IMAGE
is false (default for other cameras) burntool will not be applied at all.
Also added recipe CHIP_PRESERVE_BG_AUXMASK which will be used for M31
processing. CHIP_PRESERVE_BG changed to set MASK.AUXMASK false
Added M31_BG_PRESERVE reduction

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• burnparams.h (added)
• burntool.h (added)
• ppImage.h (modified) (2 diffs)
• ppImageArguments.c (modified) (1 diff)
• ppImageBurntoolApply.c (added)
• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageOptions.c (modified) (2 diffs)
• ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -66 +66 @@
         ppImageAddNoise.c \
         ppImageRandomGaussian.c \
-        ppImageAuxiliaryMask.c
+        ppImageAuxiliaryMask.c \
+        ppImageBurntoolApply.c
 
 CLEANFILES = *~

trunk/ppImage/src/ppImage.h

@@ -26 +26 @@
     bool doMaskBuild;                   // Build internal mask
     bool doVarianceBuild;               // Build internal variance map
+    bool doApplyBurntool;               // apply burntool correction
     bool doMaskBurntool;                // mask potential burntool trails
     bool doMaskSat;                     // mask saturated pixels
@@ -182 +183 @@
 bool ppImageCheckNoise(pmConfig *config, ppImageOptions *options, pmFPAview *view);
 
-bool ppImageBurntoolMask(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *mask);
+bool ppImageBurntoolMask(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *readout);
+bool ppImageBurntoolMaskFromTable(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *readout);
+
+bool ppImageBurntoolApply(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *readout);
 
 bool ppImageDetrendPatternApply(pmConfig *config, pmChip *chip, const pmFPAview *inputView, const ppImageOptions *options);

trunk/ppImage/src/ppImageArguments.c

@@ -117 +117 @@
     pmConfigFileSetsMD (config->arguments, &argc, argv, "LINEARITY", "-linearity", "-linearlist");
 
+    if ((argnum = psArgumentGet(argc, argv, "-burntool"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "BURNTOOL.TABLE", PS_META_REPLACE, "", argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    }
+
     // chip selection is used to limit chips to be processed
     if ((argnum = psArgumentGet (argc, argv, "-chip"))) {

trunk/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);
+        }
     }
 

trunk/ppImage/src/ppImageOptions.c

@@ -23 +23 @@
     options->doMaskLow       = false;   // mask low pixels
     options->doMaskBurntool  = false;   // mask potential burntool trails
+    options->doApplyBurntool = false;   // apply burntool correction
     options->doVarianceBuild = false;   // Build internal variance
     options->doMask          = false;   // Mask bad pixels
@@ -231 +232 @@
     options->doMaskLow       = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
     options->doMaskBurntool  = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
+    options->doApplyBurntool = psMetadataLookupBool(NULL, recipe, "APPLY.BURNTOOL");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
     options->doAuxMask       = psMetadataLookupBool(NULL, recipe, "MASK.AUXMASK");

trunk/ppImage/src/ppImageParseCamera.c

@@ -184 +184 @@
         }
         outCTE->save = true;
+    }
+    if (options->doApplyBurntool) {
+        // If no burntool file was supplied do not fail. (camera_exp.pl does not supply it
+        // for example.
+        if (!psMetadataLookupStr(NULL, config->arguments, "BURNTOOL.TABLE")) {
+            psWarning("BURNTOOL.TABLE not supplied setting doApplyBurntool to false");
+            options->doApplyBurntool = false;
+        }
     }