Index: trunk/ppImage/src/ppImageOptions.c
===================================================================
--- trunk/ppImage/src/ppImageOptions.c	(revision 14223)
+++ trunk/ppImage/src/ppImageOptions.c	(revision 14491)
@@ -18,41 +18,41 @@
 
     // 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
-    options->doOverscan      = false;	// Overscan subtraction
-    options->doBias          = false;	// Bias subtraction
-    options->doDark          = false;	// Dark subtraction
-    options->doShutter       = false;	// Shutter correction
-    options->doFlat          = false;	// Flat-field normalisation
-    options->doFringe        = false;	// Fringe subtraction
-    options->doPhotom        = false;	// Source identification and photometry
-    options->doAstromChip    = false;	// Astrometry (per-chip)
-    options->doAstromMosaic  = false;	// Astrometry (full-mosaic)
-    options->doStats         = false;	// Measure and save image statistics
+    options->doMaskBuild     = false;   // Build internal mask
+    options->doWeightBuild   = false;   // Build internal weight
+    options->doMask          = false;   // Mask bad pixels
+    options->doNonLin        = false;   // Non-linearity correction
+    options->doOverscan      = false;   // Overscan subtraction
+    options->doBias          = false;   // Bias subtraction
+    options->doDark          = false;   // Dark subtraction
+    options->doShutter       = false;   // Shutter correction
+    options->doFlat          = false;   // Flat-field normalisation
+    options->doFringe        = false;   // Fringe subtraction
+    options->doPhotom        = false;   // Source identification and photometry
+    options->doAstromChip    = false;   // Astrometry (per-chip)
+    options->doAstromMosaic  = false;   // Astrometry (full-mosaic)
+    options->doStats         = false;   // Measure and save image statistics
 
     // output files requested
-    options->BaseFITS        = false;	// create output image
-    options->BaseMaskFITS    = false;	// create output mask image
-    options->BaseWeightFITS  = false;	// create output weight image
-
-    options->ChipFITS        = false;	// create output chip-mosaic image
-    options->ChipMaskFITS    = false;	// create output chip-mosaic mask image
-    options->ChipWeightFITS  = false;	// create output chip-mosaic weight image
-
-    options->FPA1FITS        = false;	// create fpa-mosaic binned image (scale 1)
-    options->FPA2FITS        = false;	// create fpa-mosaic binned image (scale 2)
-    options->Bin1FITS        = false;	// create binned image (scale 1)
-    options->Bin2FITS        = false;	// create binned image (scale 2)
-    options->Bin1JPEG        = false;	// create jpeg of binned image (scale 1)
-    options->Bin2JPEG        = false;	// create jpeg of binned image (scale 2)
+    options->BaseFITS        = false;   // create output image
+    options->BaseMaskFITS    = false;   // create output mask image
+    options->BaseWeightFITS  = false;   // create output weight image
+
+    options->ChipFITS        = false;   // create output chip-mosaic image
+    options->ChipMaskFITS    = false;   // create output chip-mosaic mask image
+    options->ChipWeightFITS  = false;   // create output chip-mosaic weight image
+
+    options->FPA1FITS        = false;   // create fpa-mosaic binned image (scale 1)
+    options->FPA2FITS        = false;   // create fpa-mosaic binned image (scale 2)
+    options->Bin1FITS        = false;   // create binned image (scale 1)
+    options->Bin2FITS        = false;   // create binned image (scale 2)
+    options->Bin1JPEG        = false;   // create jpeg of binned image (scale 1)
+    options->Bin2JPEG        = false;   // create jpeg of binned image (scale 2)
 
     // default flags for various activities
-    options->maskValue       = 0x00;	// Default mask value
-    options->satMask         = 0x00;	// Saturated pixels
-    options->badMask         = 0x00;	// Bad pixels
-    options->flatMask        = 0x00;	// Bad flat pixels
-    options->blankMask       = 0x00;	// Blank (no data, cell gap) pixels
+    options->maskValue       = 0x00;    // Default mask value
+    options->satMask         = 0x00;    // Saturated pixels
+    options->badMask         = 0x00;    // Bad pixels
+    options->flatMask        = 0x00;    // Bad flat pixels
+    options->blankMask       = 0x00;    // Blank (no data, cell gap) pixels
 
     // Non-linearity default options
@@ -62,16 +62,16 @@
 
     // Overscan defaults
-    options->overscan        = NULL;	// Overscan options
+    options->overscan        = NULL;    // Overscan options
 
     // binning parameters
-    options->xBin1 	     = 16;	// x-binning, scale 1
-    options->yBin1 	     = 16;	// y-binning, scale 1
-    options->xBin2 	     = 16;	// x-binning, scale 2
-    options->yBin2 	     = 16;	// y-binning, scale 2
+    options->xBin1           = 16;      // x-binning, scale 1
+    options->yBin1           = 16;      // y-binning, scale 1
+    options->xBin2           = 16;      // x-binning, scale 2
+    options->yBin2           = 16;      // y-binning, scale 2
 
     // Fringe defaults
-    options->fringeRej       = NAN;	// Fringe rejection limit
-    options->fringeIter      = 0;	// Fringe iterations
-    options->fringeKeep      = 1.0;	// Fringe keep fraction
+    options->fringeRej       = NAN;     // Fringe rejection limit
+    options->fringeIter      = 0;       // Fringe iterations
+    options->fringeKeep      = 1.0;     // Fringe keep fraction
 
     return options;
@@ -207,5 +207,5 @@
     char *statsName = psMetadataLookupStr(&status, config->arguments, "STATS"); // Filename for statistics
     if (statsName) {
-	options->doStats = true;
+        options->doStats = true;
     }
 
@@ -230,10 +230,4 @@
         psWarning("BIN2.YBIN not found in recipe: setting to default value.\n");
         options->yBin1 = 16;
-    }
-
-    // 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;
     }
 
@@ -246,15 +240,21 @@
     options->ChipWeightFITS = psMetadataLookupBool(NULL, recipe, "CHIP.WEIGHT.FITS");
 
-    options->FPA1FITS 	    = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
-    options->FPA2FITS 	    = psMetadataLookupBool(NULL, recipe, "FPA2.FITS");
-
-    options->Bin1FITS 	    = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
-    options->Bin1JPEG 	    = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
-    options->Bin2FITS 	    = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
-    options->Bin2JPEG 	    = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
+    options->FPA1FITS       = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
+    options->FPA2FITS       = psMetadataLookupBool(NULL, recipe, "FPA2.FITS");
+
+    options->Bin1FITS       = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
+    options->Bin1JPEG       = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
+    options->Bin2FITS       = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
+    options->Bin2JPEG       = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
 
     options->doPhotom       = psMetadataLookupBool(NULL, recipe, "PHOTOM");
     options->doAstromChip   = psMetadataLookupBool(NULL, recipe, "ASTROM.CHIP");
     options->doAstromMosaic = psMetadataLookupBool(NULL, recipe, "ASTROM.MOSAIC");
+
+    // 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;
+    }
 
     if ((options->doAstromChip || options->doAstromMosaic) && !options->doPhotom) {