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

Timestamp:

Nov 27, 2006, 6:37:47 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up.

File:

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

trunk/ppImage/src/ppImageOptions.c

@@ -137 +137 @@
             overscanFit = PM_FIT_SPLINE;
         } else if (strcasecmp(fit, "NONE")) {
-            psLogMsg(__func__, PS_LOG_WARN, "OVERSCAN.FIT (%s) in recipe %s is not one of NONE, POLYNOMIAL, or SPLINE", fit, RECIPE_NAME);
+            psLogMsg(__func__, PS_LOG_WARN,
+                     "OVERSCAN.FIT (%s) in recipe %s is not one of NONE, POLYNOMIAL, or SPLINE",
+                     fit, RECIPE_NAME);
             exit(EXIT_FAILURE);
         }
@@ -149 +151 @@
             overscanStats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
         } else {
-            psErrorStackPrint(stderr, "OVERSCAN.STAT (%s) in recipe %s is not one of MEAN or MEDIAN", stat, RECIPE_NAME);
+            psErrorStackPrint(stderr, "OVERSCAN.STAT (%s) in recipe %s is not one of MEAN or MEDIAN",
+                              stat, RECIPE_NAME);
             exit(EXIT_FAILURE);
         }
@@ -173 +176 @@
     // binned image options
     options->xBin1 = psMetadataLookupS32(&status, recipe, "BIN1.XBIN");
-    if (!status) options->xBin1 = 16;
+    if (!status) {
+        psWarning("BIN1.XBIN not found in recipe: setting to default value.\n");
+        options->xBin1 = 16;
+    }
     options->yBin1 = psMetadataLookupS32(&status, recipe, "BIN1.YBIN");
-    if (!status) options->yBin1 = 16;
+    if (!status) {
+        psWarning("BIN1.YBIN not found in recipe: setting to default value.\n");
+        options->yBin1 = 16;
+    }
 
     options->xBin2 = psMetadataLookupS32(&status, recipe, "BIN2.XBIN");
-    if (!status) options->xBin1 = 16;
+    if (!status) {
+        psWarning("BIN2.XBIN not found in recipe: setting to default value.\n");
+       options->xBin1 = 16;
+    }
     options->yBin2 = psMetadataLookupS32(&status, recipe, "BIN2.YBIN");
-    if (!status) options->yBin1 = 16;
+    if (!status) {
+        psWarning("BIN2.YBIN not found in recipe: setting to default value.\n");
+        options->yBin1 = 16;
+    }
 
     options->BaseFITS = psMetadataLookupBool(NULL, recipe, "BASE.FITS");
@@ -196 +211 @@
     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");
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid PPIMAGE options: cannot do ASTROMetry without PHOTOMetry");
         exit(EXIT_FAILURE);
     }
@@ -202 +217 @@
     options->doAddstar = psMetadataLookupBool(NULL, recipe, "ADDSTAR");
     if (options->doAddstar && !(options->doAstromChip || options->doAstromMosaic)) {
-        psLogMsg(__func__, PS_LOG_ERROR, "Invalid Phase2 Options: cannot Addstar without Astrometry");
+        psLogMsg(__func__, PS_LOG_ERROR, "Invalid PPIMAGE options: cannot Addstar without Astrometry");
         exit(EXIT_FAILURE);
     }