Index: trunk/ppImage/src/ppImageParseCamera.c
===================================================================
--- trunk/ppImage/src/ppImageParseCamera.c	(revision 14211)
+++ trunk/ppImage/src/ppImageParseCamera.c	(revision 14223)
@@ -385,18 +385,17 @@
 
     // 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;