Changeset 35747 for branches/eam_branches/ipp-20130509/ppImage/src

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)
• Makefile.am (modified) (1 diff)
• burnparams.h (copied) (copied from trunk/ppImage/src/burnparams.h )
• burntool.h (copied) (copied from trunk/ppImage/src/burntool.h )
• ppImage.h (modified) (2 diffs)
• ppImageArguments.c (modified) (1 diff)
• ppImageAuxiliaryMask.c (modified) (1 diff)
• ppImageBurntoolApply.c (copied) (copied from trunk/ppImage/src/ppImageBurntoolApply.c )
• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageDetrendRecord.c (modified) (1 diff)
• ppImageOptions.c (modified) (2 diffs)
• ppImageParseCamera.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/ppImage/src/Makefile.am

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

branches/eam_branches/ipp-20130509/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);

branches/eam_branches/ipp-20130509/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"))) {

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

@@ -60 +60 @@
 
     if (!options->doAuxMask) {
-        psLogMsg ("ppImage", PS_LOG_INFO, "Auxiliary mask not enabled.");
+        psLogMsg ("ppImage", PS_LOG_DETAIL, "Auxiliary mask not enabled.");
         return true;
     }

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

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

@@ -76 +76 @@
 
     detrendRecord(options->doNonLin,   detrend, config, view, "PPIMAGE.LINEARITY","DETREND.NONLIN",   "Non-linearity table filename");
+
+    detrendRecord(options->doDark & options->useVideoDark, detrend, config, view, "PPIMAGE.VIDEODARK", "DETREND.VIDEODARK", "VideoDark filename");
+    detrendRecord(options->doMask & options->useVideoMask, detrend, config, view, "PPIMAGE.VIDEOMASK", "DETREND.VIDEOMASK", "VideoMASK filename");
     psFree (detrend);
     return true;

branches/eam_branches/ipp-20130509/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");

branches/eam_branches/ipp-20130509/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;
+        }
     }