Changeset 7621 for trunk/ppImage/src/ppImageOptions.c

Timestamp:

Jun 21, 2006, 12:51:48 PM (20 years ago)

Author:

eugene

Message:

various fixes

File:

• trunk/ppImage/src/ppImageOptions.c (modified) (2 diffs)

trunk/ppImage/src/ppImageOptions.c

@@ -29 +29 @@
     options->doFringe   = false;        // Fringe subtraction
     options->doPhotom   = false;        // Source identification and photometry
-    options->doAstrom   = false;        // Astrometry
+    options->doAstromChip = false;      // Astrometry
+    options->doAstromMosaic = false;    // Astrometry
 
-    options->doBin1     = false;        // create binned image (scale 1)
-    options->doBin2     = false;        // create binned image (scale 2)
-    options->doBin1JPG  = false;        // create jpg of binned image (scale 1)
-    options->doBin2JPG  = false;        // create jpg of binned image (scale 2)
+    options->BaseFITS   = false;        // create binned image (scale 1)
+    options->ChipFITS   = false;        // create binned image (scale 1)
+    options->FPA1FITS   = false;        // create binned image (scale 1)
+    options->FPA2FITS   = false;        // create binned image (scale 1)
+
+    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)
 
     // Overscan defaults
@@ -164 +170 @@
     if (!status) options->yBin1 = 16;
 
-    options->doBin1 = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
-    options->doBin1JPG = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
-    if (options->doBin1JPG && !options->doBin1) {
-        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot make JPG of Bin1 image without Bin1 image");
-        exit(EXIT_FAILURE);
-    }
+    options->BaseFITS = psMetadataLookupBool(NULL, recipe, "BASE.FITS");
+    options->ChipFITS = psMetadataLookupBool(NULL, recipe, "CHIP.FITS");
+    options->FPA1FITS = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
+    options->FPA2FITS = psMetadataLookupBool(NULL, recipe, "FPA2.FITS");
 
-    options->doBin2 = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
-    options->doBin2JPG = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
-    if (options->doBin2JPG && !options->doBin2) {
-        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot make JPG of Bin2 image without Bin2 image");
-        exit(EXIT_FAILURE);
-    }
+    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->doAstrom = psMetadataLookupBool(NULL, recipe, "ASTROM");
-    if (options->doAstrom && !options->doPhotom) {
+    options->doAstromChip = psMetadataLookupBool(NULL, recipe, "ASTROM.CHIP");
+    options->doAstromMosaic = psMetadataLookupBool(NULL, recipe, "ASTROM.MOSAIC");
+    if ((options->doAstromChip || options->doAstromMosaic) && !options->doPhotom) {
         psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot do ASTROMetry without PHOTOMetry");
         exit(EXIT_FAILURE);