Changeset 14223

Timestamp:

Jul 16, 2007, 10:20:28 AM (19 years ago)

Author:

eugene

Message:

added explicit option to request internal mask and weight image

Location:

trunk

Files:

• ippconfig/recipes/ppImage.config (modified) (1 diff)
• ppImage/src/ppImage.h (modified) (1 diff)
• ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)
• ppImage/src/ppImageOptions.c (modified) (4 diffs)
• ppImage/src/ppImageParseCamera.c (modified) (1 diff)

trunk/ippconfig/recipes/ppImage.config

@@ -12 +12 @@
 MASK             BOOL    FALSE           # Mask bad pixels
 MASK.VALUE       STR     SAT,BAD         # Mask pixels with these attributes
+MASK.BUILD       BOOL    FALSE           # Build internal mask image
+WEIGHT.BUILD     BOOL    FALSE           # Build internal weight image
 FRINGE           BOOL    FALSE           # Fringe subtraction
 PHOTOM           BOOL    FALSE           # Source identification and photometry

trunk/ppImage/src/ppImage.h

@@ -22 +22 @@
 typedef struct {
     // actions which ppImage should perform
+    bool doMaskBuild;                   // Build internal mask
+    bool doWeightBuild;                   // Build internal mask
     bool doMask;                        // Mask bad pixels
     bool doNonLin;                      // Non-linearity correction

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -16 +16 @@
 
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
-    if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
+    if (options->doMaskBuild) {
         pmReadoutGenerateMask(input, options->satMask, options->badMask);
     }
@@ -51 +51 @@
 
     // Weight on the basis of pixel value needs to be done after the overscan has been subtracted
-    if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
+    if (options->doWeightBuild) {
         // create the target mask and weight images
         pmReadoutGenerateWeight(input, true);

trunk/ppImage/src/ppImageOptions.c

@@ -18 +18 @@
 
     // actions which ppImage should perform
+    options->doMaskBuild     = false;   // Build internal mask
+    options->doWeightBuild   = false;   // Build internal weight
     options->doMask          = false;   // Mask bad pixels
     options->doNonLin        = false;   // Non-linearity correction
@@ -180 +182 @@
     }
 
+    // for these images, even if not required otherwise
+    options->doMaskBuild = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
+    options->doWeightBuild = psMetadataLookupBool(NULL, recipe, "WEIGHT.BUILD");
+
     // Mask recipe options
     options->doMask = psMetadataLookupBool(NULL, recipe, "MASK");
@@ -190 +196 @@
     options->flatMask = pmConfigMask("FLAT", config);
     options->blankMask = pmConfigMask("BLANK", config);
+    // XXX should it be an error for these to not exist?
 
     options->doBias = psMetadataLookupBool(NULL, recipe, "BIAS");
@@ -225 +232 @@
     }
 
+    // even if not requested explicitly, if any of these are set, build an internal mask and weight:
+    if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
+        options->doMaskBuild = true;
+        options->doWeightBuild = true;
+    }
+
     options->BaseFITS       = psMetadataLookupBool(NULL, recipe, "BASE.FITS");
     options->BaseMaskFITS   = psMetadataLookupBool(NULL, recipe, "BASE.MASK.FITS");

trunk/ppImage/src/ppImageParseCamera.c

@@ -385 +385 @@
 
     // Turn off mask and weight output if we're not doing anything interesting
-    bool noMask = (!options->doMask && !options->doShutter && !options->doFlat && !options->doPhotom);
-    if (noMask && outMask->save) {
+    if (!options->doMaskBuild && outMask->save) {
         psWarning("output mask image (BASE.MASK.FITS) requested, but not generated: skipping.\n");
         outMask->save = false;
     }
-    if (noMask && outWeight->save) {
+    if (!options->doWeightBuild && outWeight->save) {
         psWarning("output weight image (BASE.WEIGHT.FITS) requested, but not generated: skipping.\n");
         outWeight->save = false;
     }
-    if (noMask && chipMask->save) {
+    if (!options->doMaskBuild && chipMask->save) {
         psWarning("output mask image (CHIP.MASK.FITS) requested, but not generated: skipping.\n");
         chipMask->save = false;
     }
-    if (noMask && chipWeight->save) {
+    if (!options->doWeightBuild && chipWeight->save) {
         psWarning("output weight image (CHIP.WEIGHT.FITS) requested, but not generated: skipping.\n");
         chipWeight->save = false;