Changeset 14299

Timestamp:

Jul 18, 2007, 12:42:01 PM (19 years ago)

Author:

Paul Price

Message:

Fixing command-line parsing of integer arguments that may be zero.

File:

• trunk/ppSub/src/ppSubArguments.c (modified) (2 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -181 +181 @@
 
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-size", 0, "Kernel half-size (pixels)", 0);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-order", 0, "Spatial polynomial order", 0);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-order", 0, "Spatial polynomial order", -1);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-type", 0, "Kernel type (ISIS|POIS|SPAM|FRIES)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-widths", 0, "ISIS Gaussian widths (comma-separated)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-orders", 0, "ISIS polynomial orders (comma-separated)", NULL);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-inner", 0, "SPAM and FRIES inner radius", 0);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-inner", 0, "SPAM and FRIES inner radius", -1);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-spam-binning", 0, "SPAM kernel binning", 2);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-spacing", 0, "Typical stamp spacing (pixels)", NAN);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-footprint", 0, "Stamp footprint half-size (pixels)", 0);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-footprint", 0, "Stamp footprint half-size (pixels)", -1);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-threshold", 0, "Minimum threshold for stamps (ADU)", NAN);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-iter", 0, "Number of rejection iterations", 0);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-iter", 0, "Number of rejection iterations", -1);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-rej", 0, "Rejection thresold (sigma)", NAN);
     psMetadataAddU8(arguments,  PS_LIST_TAIL, "-mask-bad", 0, "Mask value for bad pixels", 0);
@@ -232 +232 @@
 
     VALUE_ARG_RECIPE_INT("-size",         "KERNEL.SIZE",     S32, 0);
-    VALUE_ARG_RECIPE_INT("-order",        "SPATIAL.ORDER",   S32, 0);
+    VALUE_ARG_RECIPE_INT("-order",        "SPATIAL.ORDER",   S32, -1);
     VALUE_ARG_RECIPE_FLOAT("-spacing",    "STAMP.SPACING",   F32);
-    VALUE_ARG_RECIPE_INT("-inner",        "INNER",           S32, 0);
+    VALUE_ARG_RECIPE_INT("-inner",        "INNER",           S32, -1);
     VALUE_ARG_RECIPE_INT("-spam-binning", "SPAM.BINNING",    S32, 0);
-    VALUE_ARG_RECIPE_INT("-footprint",    "STAMP.FOOTPRINT", S32, 0);
+    VALUE_ARG_RECIPE_INT("-footprint",    "STAMP.FOOTPRINT", S32, -1);
     VALUE_ARG_RECIPE_FLOAT("-threshold",  "STAMP.THRESHOLD", F32);
-    VALUE_ARG_RECIPE_INT("-iter",         "ITER",            S32, 0);
+    VALUE_ARG_RECIPE_INT("-iter",         "ITER",            S32, -1);
     VALUE_ARG_RECIPE_FLOAT("-rej",        "REJ",             F32);