Changeset 30105

Timestamp:

Dec 17, 2010, 10:07:11 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20101205/ppImage/src/ppImageOptions.c (modified) (3 diffs)

branches/eam_branches/ipp-20101205/ppImage/src/ppImageOptions.c

@@ -216 +216 @@
 
     // for these images, even if not required otherwise
-    options->doMaskBuild = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
-    options->doMaskSat   = psMetadataLookupBool(NULL, recipe, "MASK.SATURATED");
-    options->doMaskLow   = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
-    options->doMaskBurntool = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
+    options->doMaskBuild     = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
+    options->doMaskSat       = psMetadataLookupBool(NULL, recipe, "MASK.SATURATED");
+    options->doMaskLow       = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
+    options->doMaskBurntool  = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
 
@@ -313 +313 @@
      */
 
-    // even if not requested explicitly, if any of these are set, build an internal mask and variance:
-    // XXX we used to automatically generate a mask in all of these cases.
-    // if (options->doNoiseMap || options->doBias || options->doOverscan || options->doDark || options->doShutter || options->doFlat || options->doPhotom) {
-    //     options->doMaskBuild = true;
-    //     options->doVarianceBuild = true;
-    // }
-
+    // if the variance image is requested, build it (if not supplied)
+    if (options->BaseVarianceFITS || options->ChipVarianceFITS) {
+        options->doVarianceBuild = true;
+    } 
     // photometry and noisemap both require a variance image
     if (options->doNoiseMap || options->doPhotom) {
@@ -325 +322 @@
     } 
 
+    // we need a mask if we are going to apply these things:
+    if (options->doMaskSat || options->doMaskLow || options->doMaskBurntool || options->doMaskStats) {
+        options->doMaskBuild = true;
+    }
     // photometry, mask, and background all require a mask image
     if (options->doMask || options->doBG || options->doPhotom) {